[ooo-build-commit] .: 3 commits - configure.in scp2/source set_soenv.in solenv/inc

[Radek Doulík]

 configure.in                          |   27 +++++++++++++++++++++++++++
 scp2/source/ooo/file_library_ooo.scp  |    4 ++++
 scp2/source/ooo/module_hidden_ooo.scp |    1 +
 set_soenv.in                          |    1 +
 solenv/inc/settings.mk                |    4 ++++
 5 files changed, 37 insertions(+)

New commits:
commit 7f3b22ab1e99f3a05b4078af77a3897d58737e95
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Sep 16 15:28:20 2010 +0200

    patches/gstreamer/gstreamer-solenv.diff: gstreamer
    
    - enable/disable at build time, part 2

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 68bbc79..dbf2ad5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1167,6 +1167,10 @@ CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1
 CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0
 .ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
 
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+CDEFS+=-DGSTREAMER
+.ENDIF
+
 # compose flags and defines for GUI
 .IF "$(TARGETTYPE)"=="GUI"
 CDEFS+= $(CDEFSGUI)
commit e777a5e9cfcd283af7d8c5a667b1d9f8dbc6569f
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Sep 16 15:27:23 2010 +0200

    patches/gstreamer/gstreamer-config-office.diff: gstreamer
    
    - enable/disable at build time

diff --git a/configure.in b/configure.in
index 8cef295..c3a35c5 100644
--- a/configure.in
+++ b/configure.in
@@ -297,6 +297,9 @@ AC_ARG_ENABLE(randr-link,
 [  --disable-randr-link    disable linking with libXrandr, instead dynamically 
                            open it at runtime
 ],,enable_randr_link=yes)
+AC_ARG_ENABLE(gstreamer,
+[  --disable-gstreamer     disable building the gstreamer avmedia backend
+],,enable_gstreamer=yes)
 AC_ARG_WITH(myspell-dicts,
 [  --without-myspell-dicts Removes myspell dictionaries from openoffice.org
                           installation set, for people building for specific
@@ -1004,6 +1007,7 @@ case "$build_os" in
 	solaris*)
 		test_gtk=yes
 		test_cairo=yes
+        build_gstreamer=yes
 		test_kde=yes
 		test_cups=yes
         test_randr=yes
@@ -1037,6 +1041,7 @@ case "$build_os" in
 	linux-gnu*|k*bsd*-gnu*)
 		test_gtk=yes
 		test_cairo=yes
+        build_gstreamer=yes
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
@@ -1078,6 +1083,7 @@ case "$build_os" in
 	freebsd*)
 		test_gtk=yes
 		test_cairo=yes
+        build_gstreamer=yes
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
@@ -1112,6 +1118,7 @@ case "$build_os" in
 	netbsd)
 		test_gtk=yes
 		test_cairo=yes
+        build_gstreamer=yes
 		test_kde=yes
 		test_kde4=yes
 		test_cups=no
@@ -5946,6 +5953,26 @@ AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
 dnl ===================================================================
+dnl Check whether the GStreamer libraries are available.
+dnl ===================================================================
+
+ENABLE_GSTREAMER=""
+
+if test  "$build_gstreamer" = "yes"; then
+
+    AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
+    if test "x$enable_gstreamer" != "xno" ; then
+        ENABLE_GSTREAMER="TRUE"
+    AC_MSG_RESULT([yes])
+    PKG_CHECK_MODULES( GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10 )
+    else
+         AC_MSG_RESULT([no])
+    fi
+fi
+
+AC_SUBST(ENABLE_GSTREAMER)
+
+dnl ===================================================================
 dnl Check whether the OpenGL libraries are available
 dnl ===================================================================
 
diff --git a/set_soenv.in b/set_soenv.in
index dea0948..502ab5e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1650,6 +1650,7 @@ ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
 ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
 ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
 ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
+ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
 ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
 ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
commit e533bf67babbe30711d72a70ea9641665291f853
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Sep 16 15:19:46 2010 +0200

    patches/gstreamer/gstreamer-scp2.diff: gstreamer, component installation

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0a57ae5..dfc3fd4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1626,6 +1626,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 // AVMedia
 STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
+#ifdef GSTREAMER
+SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
+#else
 #if defined UNX
 #ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
@@ -1635,6 +1638,7 @@ UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
+#endif
 
 #ifndef WITHOUT_MOZILLA
 File gid_File_Lib_XSec_Framework
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index d23786a..a2ca40c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/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_AVMediaGStreamer,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,