GNOME.org
 

[gnome-subtitles/gstreamer-sharp-bindings] Updating the build files for GLibSharp/GtkSharp and gstreamer-sharp

commit 252f89f3a08389e8ca029eb73c0af98b9e3eecd5
Author: Pedro Castro <pedro gnomesubtitles org>
Date:   Thu Feb 3 23:46:03 2022 +0000

    Updating the build files for GLibSharp/GtkSharp and gstreamer-sharp
    
    They will be bundled with GS and built into the build/ dir

 INSTALL                                       |   6 +-
 Makefile.am                                   |  16 -
 configure.ac                                  |   4 +-
 gnome-subtitles.csproj                        |  34 +--
 src/External/GstBackend/.vscode/settings.json |   4 -
 src/External/GstBackend/GstBackendOld.cs      | 217 -------------
 src/External/GstBackend/GstMediaInfoOld.cs    |  76 -----
 src/External/GstBackend/gst-backend.c         | 421 --------------------------
 src/Makefile.am                               |  22 +-
 9 files changed, 33 insertions(+), 767 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index 8865734..e82fd21 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX 'make' updates targets which have the same time stamps as their
+   HP-UX 'make' updates targets which have the same timestamps as their
 prerequisites, which makes it generally unusable when shipped generated
 files such as 'configure' are involved.  Use GNU 'make' instead.
 
diff --git a/Makefile.am b/Makefile.am
index 6c36925..9c4b40b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,22 +2,6 @@ SUBDIRS = src data po help
 
 ACLOCAL_AMFLAGS = -I m4
 
-gstpbdir = $(pkglibdir)
-
-#dist-hook:
-#      @if test -d "$(srcdir)/.git"; \
-#      then \
-#              echo Creating ChangeLog && \
-#              ( cd "$(top_srcdir)" && \
-#                      echo '# Generated by Makefile. Do not edit.'; echo; \
-#                      $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
-#              && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-#              || ( rm -f ChangeLog.tmp ; \
-#                      echo Failed to generate ChangeLog >&2 ); \
-#      else \
-#              echo A git clone is required to generate a ChangeLog >&2; \
-#      fi
-
 EXTRA_DIST =                   \
        autogen.sh                      \
        gnome-subtitles.csproj \
diff --git a/configure.ac b/configure.ac
index 5ebc5a4..480e718 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,12 +67,12 @@ fi
 
 #Dependencies
 MONO_REQUIRED_VERSION=4.0
-GTKSHARP_REQUIRED_VERSION=2.99.3
+#GTKSHARP_REQUIRED_VERSION=2.99.3
 GTK_REQUIRED_VERSION=3.12
 GSTREAMER_REQUIRED_VERSION=1.0
 
 PKG_CHECK_MODULES(MONO, [mono >= $MONO_REQUIRED_VERSION])
-PKG_CHECK_MODULES(GTKSHARP, [gtk-sharp-3.0 >= $GTKSHARP_REQUIRED_VERSION])
+#PKG_CHECK_MODULES(GTKSHARP, [gtk-sharp-3.0 >= $GTKSHARP_REQUIRED_VERSION])
 PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED_VERSION])
 PKG_CHECK_MODULES(gstreamer, [
        gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION
diff --git a/gnome-subtitles.csproj b/gnome-subtitles.csproj
index 4164631..a609c83 100644
--- a/gnome-subtitles.csproj
+++ b/gnome-subtitles.csproj
@@ -33,29 +33,29 @@
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
     <Reference Include="System.Web" />
-    <Reference Include="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-3.0</Package>
+    <Reference Include="atk-sharp">
+      <HintPath>build\atk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-3.0</Package>
+    <Reference Include="gdk-sharp">
+      <HintPath>build\gdk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-3.0</Package>
+    <Reference Include="gio-sharp">
+      <HintPath>build\gio-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gdk-sharp-3.0</Package>
+    <Reference Include="glib-sharp">
+      <HintPath>build\glib-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="cairo-sharp, Version=1.10.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>gtk-sharp-3.0</Package>
+    <Reference Include="gstreamer-sharp">
+      <HintPath>build\gstreamer-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gio-sharp-3.0</Package>
+    <Reference Include="gtk-sharp">
+      <HintPath>build\gtk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-3.0</Package>
+    <Reference Include="pango-sharp">
+      <HintPath>build\pango-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gstreamer-sharp">
-      <HintPath>..\gstreamer-sharp\build\sources\gstreamer-sharp.dll</HintPath>
+    <Reference Include="cairo-sharp">
+      <HintPath>build\cairo-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -278,8 +278,6 @@
     <Compile Include="src\GnomeSubtitles\Ui\WindowState.cs" />
     <Compile Include="src\External\Enchant\Enchant.cs" />
     <Compile Include="src\External\Interop\Interop.cs" />
-    <Compile Include="src\External\GstBackend\GstBackendOld.cs" />
-    <Compile Include="src\External\GstBackend\GstMediaInfoOld.cs" />
     <Compile Include="src\GnomeSubtitles\Ui\VideoPreview\MediaBackend.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\Message\DialogUtil.cs" />
     <Compile Include="src\External\GStreamer\GstBackend.cs" />
diff --git a/src/Makefile.am b/src/Makefile.am
index 77e37e7..5c3fac2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,17 +11,10 @@ ASSEMBLY = $(GS_BUILDDIR)/gnome-subtitles.exe
 ASSEMBLY_CONFIG = $(ASSEMBLY).config
 ASSEMBLY_CONFIG_SRC = $(srcdir)/GnomeSubtitles/Execution/gnome-subtitles.exe.config
 
-AM_CFLAGS = $(gstreamer_CFLAGS) -Wall -g -fPIC
-gnomesubtitles_LTLIBRARIES = libgst_backend.la
-libgst_backend_la_SOURCES = External/GstBackend/gst-backend.c
-libgst_backend_la_LIBADD = $(gstreamer_LIBS)
-libgst_backend_la_LDFLAGS = -module -avoid-version
-libgst_backend_la_LIBTOOLFLAGS = --tag=disable-static 
-
 GSSOURCES = \
        $(srcdir)/External/Enchant/*.cs \
        $(srcdir)/External/GtkSpell/*.cs \
-       $(srcdir)/External/GstBackend/*.cs \
+       $(srcdir)/External/GStreamer/*.cs \
        $(srcdir)/External/Interop/*.cs \
        $(srcdir)/External/NCharDet/*.cs \
        $(srcdir)/GnomeSubtitles/Core/*.cs \
@@ -54,12 +47,21 @@ GS_SYSTEM_REFERENCES = \
        Mono.Posix.dll \
        System.Web.dll
 
+GS_LOCAL_REFERENCES = \
+       $(GS_BUILDDIR)/atk-sharp.dll \
+       $(GS_BUILDDIR)/cairo-sharp.dll \
+       $(GS_BUILDDIR)/gdk-sharp.dll \
+       $(GS_BUILDDIR)/gio-sharp.dll \
+       $(GS_BUILDDIR)/glib-sharp.dll \
+       $(GS_BUILDDIR)/gtk-sharp.dll \
+       $(GS_BUILDDIR)/pango-sharp.dll \
+       $(GS_BUILDDIR)/gstreamer-sharp.dll
+
 $(ASSEMBLY): $(GSSOURCES) $(GS_RESOURCES)
-       $(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) 
$(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GSSOURCES)
+       $(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) 
$(GS_LOCAL_REFERENCES:%=-r:%) $(GS_RESOURCES:%=-resource:%) $(GSSOURCES)
 
 $(ASSEMBLY_CONFIG): $(gnomesubtitles_LTLIBRARIES)
        cp -f $(ASSEMBLY_CONFIG_SRC) $(GS_BUILDDIR)
-       cp -f $(srcdir)/.libs/libgst_backend.so $(GS_BUILDDIR)
 
 bin_SCRIPTS = $(srcdir)/GnomeSubtitles/Execution/gnome-subtitles
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]