avmedia101: added GStreamer backend for Unix

configure.in

@@ -198,6 +198,10 @@ AC_ARG_ENABLE(gtk,
 [  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
                           where Gtk+ is available.
 ],,enable_gtk=yes)
+AC_ARG_ENABLE(gstreamer,
+[  --disable-gstreamer     Determines whether to use the GStreamer media
+                          backend on platforms where GStreamer is available.
+],,enable_gstreamer=yes)
 AC_ARG_ENABLE(systray,
 [  --disable-systray       Determines whether to build the systray quickstarter.
 ],,enable_systray=yes)
@@ -918,6 +922,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		_os=SunOS
 		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
 		if test -z "$GNUTAR"; then
@@ -952,7 +957,8 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		_os=Linux
+        test_gstreamer=yes
+        _os=Linux	
 		;;
 	gnu)
 		test_cups=no
@@ -962,6 +968,7 @@ case "$build_os" in
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
+        test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
@@ -970,6 +977,7 @@ case "$build_os" in
 		test_cairo=yes
         test_randr=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
          AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
@@ -983,6 +991,7 @@ case "$build_os" in
         test_randr=no
 		test_gtk=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -993,6 +1002,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		AC_MSG_CHECKING([the FreeBSD operating system release])
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
@@ -1027,6 +1037,7 @@ case "$build_os" in
 		test_cups=no
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
@@ -1035,6 +1046,7 @@ case "$build_os" in
 		test_cups=no
         test_randr=no
 		test_freetype=yes
+        test_gstreamer=yes
 	   PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
@@ -5655,6 +5667,29 @@ AC_SUBST(ENABLE_SYSTRAY_GTK)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+dnl ===================================================================
+dnl Check whether the GStreamer libraries are available.
+dnl ===================================================================
+
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test "$test_gstreamer" = "yes"; then
+    AC_MSG_CHECKING([whether to build the GStreamer media backend])
+    if test "x$enable_gstreamer" != "xno" ; then
+        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
+        ENABLE_GSTREAMER="TRUE"
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+fi
+AC_SUBST(ENABLE_GSTREAMER)
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
+
+
 dnl ===================================================================
 dnl Check whether the Cairo libraries are available.
 dnl ===================================================================

scp2/source/ooo/file_library_ooo.scp

@@ -1581,15 +1581,18 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 // AVMedia
 STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
-#if defined UNX
-#ifdef SOLAR_JAVA
+if defined UNX 
+if defined ENABLE_GSTREAMER
+SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
+endif
+ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
-#endif
-#elif defined WNT
-#ifdef ENABLE_DIRECTX
+endif
+elif defined WNT
+ifdef ENABLE_DIRECTX
 SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
-#endif
-#endif
+endif
+endif
 
 #ifndef WITHOUT_MOZILLA
 File gid_File_Lib_XSec_Framework

scp2/source/ooo/makefile.mk

@@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
 SCPDEFS+=-DENABLE_SYSTRAY_GTK
 .ENDIF
 
+.IF "$(ENABLE_GSTREAMER)" != ""
+SCPDEFS+=-DENABLE_GSTREAMER
+.ENDIF
+
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF

scp2/source/ooo/module_hidden_ooo.scp

@@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svx,
 	gid_File_Lib_AVMedia,
 	gid_File_Lib_AVMediaWin,
+	gid_File_Lib_AVMediaGst,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,

set_soenv.in

@@ -1578,6 +1578,7 @@ ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
 ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
+ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
@@ -1808,6 +1809,8 @@ ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
 ToFile( "SYSTEM_POPPLER",    "@SYSTEM_POPPLER@",   "e" );
 ToFile( "POPPLER_CFLAGS",    "@POPPLER_CFLAGS@",   "e" );
 ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
+ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
+ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
 ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
 ToFile( "BUILD_PIXMAN",      "@BUILD_PIXMAN@",     "e" );
 ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );