ooo-build r14966 - in trunk: . patches/dev300 patches/gstreamer

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 30 01:08:18 2008
New Revision: 14966
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14966&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/gstreamer/gstreamer-config-office-m36.diff:
	* patches/gstreamer/gstreamer-config-office.diff:
	* patches/dev300/apply: re-adjusted for dev300-m37 and newer.



Added:
   trunk/patches/gstreamer/gstreamer-config-office-m36.diff   (props changed)
      - copied unchanged from r14946, /trunk/patches/gstreamer/gstreamer-config-office.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/gstreamer/gstreamer-config-office.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec 30 01:08:18 2008
@@ -2209,10 +2209,10 @@
 gstreamer-scp2.diff
 
 [ GStreamer <= dev300-m36 ]
-gstreamer-config-office.diff
+gstreamer-config-office-m36.diff
 
 [ GStreamer > dev300-m36 ]
-#FIXME_m37 gstreamer-config-office.diff
+gstreamer-config-office.diff
 
 [ GStreamer ]
 gstreamer-slideshow.diff

Modified: trunk/patches/gstreamer/gstreamer-config-office.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-config-office.diff	(original)
+++ trunk/patches/gstreamer/gstreamer-config-office.diff	Tue Dec 30 01:08:18 2008
@@ -1,46 +1,48 @@
---- config_office-orig/configure.in	2006-08-17 10:43:11.000000000 +0200
-+++ config_office/configure.in	2006-08-17 10:48:43.000000000 +0200
-@@ -718,6 +718,7 @@ case "$build_os" in
+diff --git config_office/configure.in config_office/configure.in
+index 4ff07ea..bfe9198 100644
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -908,6 +908,7 @@ case "$build_os" in
  	solaris*)
  		test_gtk=yes
- 		build_cairo=yes
+ 		test_cairo=yes
 +		build_gstreamer=yes
  		test_kde=yes
  		test_cups=yes
          test_randr=yes
-@@ -745,6 +746,7 @@ case "$build_os" in
+@@ -936,6 +937,7 @@ case "$build_os" in
  	linux-gnu*)
  		test_gtk=yes
- 		build_cairo=yes
+ 		test_cairo=yes
 +		build_gstreamer=yes
  		test_kde=yes
  		test_cups=yes
          test_randr=yes
-@@ -767,6 +769,7 @@ case "$build_os" in
+@@ -959,6 +961,7 @@ case "$build_os" in
  		test_cups=yes
  		test_gtk=yes
- 		build_cairo=yes
-+		build_gstreamer=no
+ 		test_cairo=yes
++		build_gstreamer=yes
          test_randr=no
+ 		test_freetype=no
  		_os=Darwin
-       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-@@ -773,6 +776,7 @@ case "$build_os" in
+@@ -979,6 +982,7 @@ case "$build_os" in
  	freebsd*)
  		test_gtk=yes
- 		build_cairo=yes
+ 		test_cairo=yes
 +		build_gstreamer=yes
  		test_kde=yes
  		test_cups=yes
          test_randr=yes
-@@ -805,6 +809,7 @@ case "$build_os" in
+@@ -1012,6 +1016,7 @@ case "$build_os" in
  	netbsd)
  		test_gtk=yes
- 		build_cairo=yes
+ 		test_cairo=yes
 +		build_gstreamer=yes
  		test_kde=yes
  		test_cups=no
          test_randr=yes
-@@ -4602,6 +4607,26 @@ AC_SUBST(CAIRO_CFLAGS)
+@@ -5565,6 +5570,26 @@ AC_SUBST(CAIRO_CFLAGS)
  AC_SUBST(CAIRO_LIBS)
  
  dnl ===================================================================
@@ -64,12 +66,14 @@
 +AC_SUBST(ENABLE_GSTREAMER)
 +
 +dnl ===================================================================
- dnl Check whether the Qt and KDE libraries are available.
+ dnl Check whether the OpenGL libraries are available
  dnl ===================================================================
  
---- config_office-orig/set_soenv.in	2006-08-17 10:43:11.000000000 +0200
-+++ config_office/set_soenv.in	2006-08-17 11:05:37.000000000 +0200
-@@ -1495,6 +1495,7 @@
+diff --git config_office/set_soenv.in config_office/set_soenv.in
+index 7f49931..7320345 100644
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1756,6 +1756,7 @@ ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
  ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
  ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
  ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@",  "e" );