SOURCES (AC-branch): totem-configure.patch (NEW), totem-mozilla_in...

[baggins]

Author: baggins                      Date: Wed May 17 12:57:25 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- from HEAD

---- Files affected:
SOURCES:
   totem-configure.patch (NONE -> 1.1.2.1)  (NEW), totem-mozilla_includes.patch (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: SOURCES/totem-configure.patch
diff -u /dev/null SOURCES/totem-configure.patch:1.1.2.1
--- /dev/null	Wed May 17 14:57:25 2006
+++ SOURCES/totem-configure.patch	Wed May 17 14:57:20 2006
@@ -0,0 +1,53 @@
+diff -aurN totem-1.4.0.orig/configure.in totem-1.4.0/configure.in
+--- totem-1.4.0.orig/configure.in	2006-03-13 10:33:13.000000000 +0100
++++ totem-1.4.0/configure.in	2006-04-02 16:06:36.000000000 +0200
+@@ -143,41 +143,6 @@
+ 
+ 	AC_MSG_RESULT(GStreamer-$GST_MAJORMINOR)
+ 
+-	dnl Check for required plugins
+-	if test x$GST_MAJORMINOR = x0.10; then
+-		gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
+-		gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"
+-
+-		dnl Check for elements from gst-plugins-base
+-		for base_element in playbin ffmpegcolorspace videoscale
+-		do
+-			AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin])
+-			if $gst010_inspect $base_element >/dev/null 2>/dev/null; then
+-				AC_MSG_RESULT([yes])
+-			else
+-				AC_MSG_RESULT([no])
+-				AC_MSG_ERROR([
+-					Cannot find required GStreamer-0.10 plugin '$base_element'.
+-					It should be part of gst-plugins-base. Please install it.
+-				])
+-			fi
+-		done
+-
+-		dnl Check for elements from gst-plugins-good
+-		for good_element in gconfaudiosink gconfvideosink
+-		do
+-			AC_MSG_CHECKING([GStreamer 0.10 $good_element plugin])
+-			if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
+-				AC_MSG_RESULT([yes])
+-			else
+-				AC_MSG_RESULT([no])
+-				AC_MSG_ERROR([
+-					Cannot find required GStreamer-0.10 plugin '$good_element'.
+-					It should be part of gst-plugins-good. Please install it.
+-				])
+-			fi
+-		done
+-
+ 		dnl We want at least GLib-2.8 for the GStreamer-0.10 backend
+ 		AC_MSG_CHECKING([whether GLib has atomic refcounting for objects])
+ 		PKG_CHECK_MODULES(GLIB_WITH_ATOMIC_REFCOUNTING, glib-2.0 >= 2.8.0, [
+@@ -191,7 +156,6 @@
+ 			])
+ 		])
+ 			
+-	fi
+ fi
+ 
+ AM_CONDITIONAL(TOTEM_GST, test "x$HAVE_GSTREAMER" = "xyes")

================================================================
Index: SOURCES/totem-mozilla_includes.patch
diff -u SOURCES/totem-mozilla_includes.patch:1.2 SOURCES/totem-mozilla_includes.patch:1.2.2.1
--- SOURCES/totem-mozilla_includes.patch:1.2	Sun Dec 11 22:57:43 2005
+++ SOURCES/totem-mozilla_includes.patch	Wed May 17 14:57:20 2006
@@ -1,11 +1,10 @@
-diff -aurN totem-1.2.1.orig/src/Makefile.am totem-1.2.1/src/Makefile.am
---- totem-1.2.1.orig/src/Makefile.am	2005-11-26 14:05:38.000000000 +0100
-+++ totem-1.2.1/src/Makefile.am	2005-12-11 22:52:51.000000000 +0100
-@@ -201,6 +201,7 @@
+--- totem-1.3.0/src/Makefile.am	2005-12-21 22:06:19.449513750 +0100
++++ totem-1.3.0-mozilla/src/Makefile.am	2005-12-21 22:13:32.672588500 +0100
+@@ -202,6 +202,7 @@
  	$(DBUS_CFLAGS)					\
  	$(MOZILLA_CFLAGS)				\
  	$(MOZILLA_XPCOM_CFLAGS)				\
-+	-I$(includedir)/mozilla/necko			\
- 	$(MUSICBRAINZ_CFLAGS)				\
++	-I$(includedir)/mozilla/necko                   \
  	$(NVTV_CFLAGS)					\
  	$(NAUTILUS_CFLAGS)				\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/totem-mozilla_includes.patch?r1=1.2&r2=1.2.2.1&f=u