--- a/ChangeLog	Tue Jan 20 06:27:00 2009 +0000
+++ b/ChangeLog	Tue Jan 20 20:22:13 2009 +0000
@@ -1,3 +1,12 @@
+2009-01-20  Brian Cameron  <[email protected]>
+
+	* SFEgst-plugins-bad.spec: Update to
+	* patches/gst-plugins-bad-06-ladspa.diff: Remove upstream patch.
+	* patches/gst-plugins-bad-06-dccp.diff,
+	  patches/gst-plugins-bad-07-makefile.diff,
+	  patches/gst-plugins-bad-08-deinterlace.diff:  Add patched needed
+	  to compile.
+
 2009-01-20  Halton Huo <[email protected]>
 
 	* SFEanjuta.spec: Bump to 2.25.5

--- a/SFEgst-plugins-bad.spec	Tue Jan 20 06:27:00 2009 +0000
+++ b/SFEgst-plugins-bad.spec	Tue Jan 20 20:22:13 2009 +0000
@@ -7,12 +7,14 @@
 
 Name:                    SFEgst-plugins-bad
 Summary:                 GStreamer bad plugins
-Version:                 0.10.9
+Version:                 0.10.10
 URL:                     http://gstreamer.freedesktop.org/
 Source:                  http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.bz2
 Patch1:                  gst-plugins-bad-01-gettext.diff
 Patch5:                  gst-plugins-bad-05-gstapexraop.diff
-Patch6:                  gst-plugins-bad-06-ladspa.diff
+Patch6:                  gst-plugins-bad-06-dccp.diff
+Patch8:                  gst-plugins-bad-07-makefile.diff
+Patch7:                  gst-plugins-bad-08-deinterlace.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -34,19 +36,31 @@
 %patch1 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+# There seems to be an issue with the version of libtool that GStreamer is
+# now using.  The libtool script uses the echo and RM variables but does not
+# define them, so setting them here addresses this.
+export echo="/usr/bin/echo"
+export RM="/usr/bin/rm"
+
+export CFLAGS="%optflags -I%{sfw_inc} -DANSICPP"
+# gstmodplug needs C99 __func__
+export CXXFLAGS="%cxx_optflags -features=extensions -I%{sfw_inc}"
+export HAVE_CXX=yes
 export RPM_OPT_FLAGS="$CFLAGS"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags %{sfw_lib_path}"
 
 glib-gettextize -f
 aclocal -I ./m4 -I ./common/m4 $ACLOCAL_FLAGS
 libtoolize --copy --force
 intltoolize --copy --force --automake
 autoheader
+automake -a -c -f
 autoconf
 
 # Do not build the selector plugin since it is now included in 
@@ -72,6 +86,12 @@
 fi
 
 %install
+# There seems to be an issue with the version of libtool that GStreamer is
+# now using.  The libtool script uses the echo and RM variables but does not
+# define them, so setting them here addresses this.
+export echo="/usr/bin/echo"
+export RM="/usr/bin/rm"
+
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ]
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -105,6 +125,10 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 - [email protected]
+- Bump to 0.10.10.  Add patches gst-plugins-bad-06-dccp.diff,
+  gst-plugins-bad-07-makefile.diff, and gst-plugins-bad-08-deinterlace.diff to
+  address compile issues.
 * Thu Jan 15 2009 - [email protected]
 - Disable building the selector plugin since we build this with
   SUNWgnome-media.

--- a/patches/gst-plugins-bad-01-gettext.diff	Tue Jan 20 06:27:00 2009 +0000
+++ b/patches/gst-plugins-bad-01-gettext.diff	Tue Jan 20 20:22:13 2009 +0000
@@ -1,19 +1,17 @@
---- gst-plugins-bad-0.10.7/configure.ac-orig	2006-01-09 16:23:31.996995000 -0800
-+++ gst-plugins-bad-0.10.7/configure.ac	2006-01-09 16:23:50.529191000 -0800
-@@ -59,9 +59,13 @@
+--- gst-plugins-bad-0.10.10/configure.ac-orig	2009-01-20 12:48:48.408907000 -0600
++++ gst-plugins-bad-0.10.10/configure.ac	2009-01-20 12:50:36.973073000 -0600
+@@ -58,8 +58,12 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I comm
  
  dnl set up gettext
  dnl the version check needs to stay here because autopoint greps for it
--AM_GNU_GETTEXT_VERSION([0.11.5])
+-AM_GNU_GETTEXT_VERSION([0.17])
 -AM_GNU_GETTEXT([external])
--AG_GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])
 +ALL_LINGUAS="cs de es fr hu it ja ko pl pt_BR ru sv zh_CN zh_HK zh_TW"
 +AM_GLIB_GNU_GETTEXT
 +USE_INCLUDED_LIBINTL=no
 +AC_SUBST(USE_INCLUDED_LIBINTL)
 +BUILD_INCLUDED_LIBINTL=no
 +AC_SUBST(BUILD_INCLUDED_LIBINTL)
-+AG_GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])
+ AG_GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])
  
  dnl *** check for arguments to configure ***
- 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gst-plugins-bad-06-dccp.diff	Tue Jan 20 20:22:13 2009 +0000
@@ -0,0 +1,54 @@
+--- gst-plugins-bad-0.10.10/configure.ac-orig	2009-01-20 13:03:47.115098000 -0600
++++ gst-plugins-bad-0.10.10/configure.ac	2009-01-20 13:07:52.933458000 -0600
+@@ -295,6 +295,16 @@ dnl disable experimental plug-ins
+ #if test "x$BUILD_EXPERIMENTAL" != "xyes"; then
+ #fi
+ 
++dnl check if msg_control exists in msghdr
++AC_TRY_COMPILE([#include <stdio.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/socket.h>], [int main() { struct msghdr msg; msg.msg_control = 0;}],
++  [AC_MSG_RESULT(yes)
++   AC_DEFINE(HAVE_CONTROL_IN_MSGHDR, 1, [Have control in msghdr])],
++  [AC_MSG_RESULT(no)
++  ])
++
+ dnl disable gst plugins we might not be able to build on this
+ dnl platform: librfb (ugly but minimally invasive)
+ dnl FIXME: maybe move to sys, or make work with winsock2
+--- gst-plugins-bad-0.10.10/gst/dccp/Makefile.am-orig	2009-01-20 13:03:08.022547000 -0600
++++ gst-plugins-bad-0.10.10/gst/dccp/Makefile.am	2009-01-20 13:03:40.584004000 -0600
+@@ -13,7 +13,7 @@ libgstdccp_la_SOURCES = gstdccpplugin.c 
+ # flags used to compile this plugin
+ libgstdccp_la_CFLAGS = $(GST_CFLAGS)
+ libgstdccp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
+-libgstdccp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstdccp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lsocket -lnsl
+ libgstdccp_la_LIBTOOLFLAGS = --tag=disable-static
+ 
+ # headers we need but don't want installed
+--- gst-plugins-bad-0.10.10/gst/dccp/gstdccp.c-orig	2009-01-20 12:57:58.444732000 -0600
++++ gst-plugins-bad-0.10.10/gst/dccp/gstdccp.c	2009-01-20 13:09:31.895096000 -0600
+@@ -141,8 +141,10 @@ gst_dccp_read_buffer (GstElement * this,
+   iov.iov_len = readsize;
+   mh.msg_iov = &iov;
+   mh.msg_iovlen = 1;
++#ifdef HAVE_CONTROL_IN_MSGHDR
+   mh.msg_control = NULL;
+   mh.msg_controllen = 0;
++#endif
+ 
+   bytes_read = recvmsg (socket, &mh, 0);
+ 
+@@ -324,8 +326,10 @@ gst_dccp_socket_write (GstElement * elem
+       iov.iov_len = MIN (packet_size, size - bytes_written);
+       mh.msg_iov = &iov;
+       mh.msg_iovlen = 1;
++#ifdef HAVE_CONTROL_IN_MSGHDR
+       mh.msg_control = NULL;
+       mh.msg_controllen = 0;
++#endif
+ 
+       wrote = sendmsg (socket, &mh, 0);
+     } while (wrote == -1 && errno == EAGAIN);

--- a/patches/gst-plugins-bad-06-ladspa.diff	Tue Jan 20 06:27:00 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- gst-plugins-bad-0.10.9/ext/ladspa/search.c-orig	2009-01-08 01:34:23.604052000 -0600
-+++ gst-plugins-bad-0.10.9/ext/ladspa/search.c	2009-01-08 01:35:04.515439000 -0600
-@@ -98,13 +98,15 @@ LADSPAPluginSearch (LADSPAPluginSearchCa
-   const char *pcEnd;
-   const char *pcLADSPAPath;
-   const char *pcStart;
-+  char *search_path;
- 
-   /* thomasvs: I'm sorry, but I'm going to add glib stuff here.
-    * I'm appending logical values for LADSPA_PATH here
-    */
- 
-+  search_path = getenv ("LADSPA_PATH");
-   pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa",
--      getenv ("LADSPA_PATH"));
-+      search_path ? search_path : "(null)");
- 
-   if (!pcLADSPAPath) {
- /*    fprintf(stderr, */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gst-plugins-bad-07-makefile.diff	Tue Jan 20 20:22:13 2009 +0000
@@ -0,0 +1,43 @@
+--- gst-plugins-bad-0.10.10/gst/librfb/Makefile.am-orig	2009-01-20 13:26:39.075215000 -0600
++++ gst-plugins-bad-0.10.10/gst/librfb/Makefile.am	2009-01-20 13:26:46.224924000 -0600
+@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = libgstrfbsrc.la
+ libgstrfbsrc_la_SOURCES = gstrfbsrc.c
+ libgstrfbsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) -I$(srcdir)/..
+ libgstrfbsrc_la_LIBADD = $(GST_BASE_LIBS) $(X11_LIBS) librfb.la
+-libgstrfbsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstrfbsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lsocket -lnsl
+ libgstrfbsrc_la_LIBTOOLFLAGS = --tag=disable-static
+ 
+ librfb_la_SOURCES = \
+--- gst-plugins-bad-0.10.10/gst/pcapparse/Makefile.am-orig	2009-01-20 13:28:17.240069000 -0600
++++ gst-plugins-bad-0.10.10/gst/pcapparse/Makefile.am	2009-01-20 13:28:26.305947000 -0600
+@@ -15,6 +15,6 @@ noinst_HEADERS = \
+ 
+ libgstpcapparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
+ libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WINSOCK2_LIBS)
+-libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lsocket -lnsl
+ libgstpcapparse_la_LIBTOOLFLAGS = --tag=disable-static
+ 
+--- gst-plugins-bad-0.10.10/gst/festival/Makefile.am-orig	2009-01-20 13:24:25.845910000 -0600
++++ gst-plugins-bad-0.10.10/gst/festival/Makefile.am	2009-01-20 13:25:06.945387000 -0600
+@@ -13,7 +13,7 @@ libgstfestival_la_CFLAGS = $(GST_CFLAGS)
+ # libgstfestival_la_LIBADD = $(FESTIVAL_LIBS)
+ libgstfestival_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+                            -lgstaudio-0.10 $(WINSOCK2_LIBS)
+-libgstfestival_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstfestival_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lsocket -lnsl
+ libgstfestival_la_LIBTOOLFLAGS = --tag=disable-static
+ 
+ noinst_HEADERS = gstfestival.h 
+--- gst-plugins-bad-0.10.10/gst/modplug/Makefile.am-orig	2009-01-20 14:17:00.936843000 -0600
++++ gst-plugins-bad-0.10.10/gst/modplug/Makefile.am	2009-01-20 14:17:05.559512000 -0600
+@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstmodplug.la
+ 
+ libgstmodplug_la_SOURCES = gstmodplug.cc
+ libgstmodplug_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS)
+-libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la $(GST_PLUGINS_BASE_LIBS) -lstdc++
++libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la $(GST_PLUGINS_BASE_LIBS) -lstdc++ -lm
+ libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstmodplug_la_LIBTOOLFLAGS = --tag=disable-static
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gst-plugins-bad-08-deinterlace.diff	Tue Jan 20 20:22:13 2009 +0000
@@ -0,0 +1,61 @@
+--- gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/greedy.c-orig	2009-01-20 13:19:02.097368000 -0600
++++ gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/greedy.c	2009-01-20 13:20:44.280125000 -0600
+@@ -121,6 +121,8 @@ deinterlace_greedy_packed422_scanline_c 
+   }
+ }
+ 
++#undef BUILD_X86_ASM
++
+ #ifdef BUILD_X86_ASM
+ #include "mmx.h"
+ static void
+--- gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/greedyh.c-orig	2009-01-20 13:22:33.820928000 -0600
++++ gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/greedyh.c	2009-01-20 13:22:41.370980000 -0600
+@@ -205,6 +205,7 @@ greedyDScaler_C (GstDeinterlaceMethodGre
+   }
+ }
+ 
++#undef BUILD_X86_ASM
+ #ifdef BUILD_X86_ASM
+ 
+ #define IS_MMXEXT
+--- gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/vfir.c-orig	2009-01-20 13:22:52.503546000 -0600
++++ gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/vfir.c	2009-01-20 13:22:58.965446000 -0600
+@@ -89,6 +89,7 @@ deinterlace_line_c (GstDeinterlaceMethod
+   }
+ }
+ 
++#undef BUILD_X86_ASM
+ #ifdef BUILD_X86_ASM
+ #include "mmx.h"
+ static void
+--- gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/linear.c-orig	2009-01-20 13:23:24.408896000 -0600
++++ gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/linear.c	2009-01-20 13:23:30.402309000 -0600
+@@ -52,6 +52,7 @@ deinterlace_scanline_linear_c (GstDeinte
+     out[i] = (scanlines->t0[i] + scanlines->b0[i]) / 2;
+ }
+ 
++#undef BUILD_X86_ASM
+ #ifdef BUILD_X86_ASM
+ #include "mmx.h"
+ static void
+--- gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/linearblend.c-orig	2009-01-20 13:23:39.878640000 -0600
++++ gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/linearblend.c	2009-01-20 13:23:45.877989000 -0600
+@@ -76,6 +76,7 @@ deinterlace_scanline_linear_blend2_c (Gs
+   }
+ }
+ 
++#undef BUILD_X86_ASM
+ #ifdef BUILD_X86_ASM
+ #include "mmx.h"
+ static inline void
+--- gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/tomsmocomp.c-orig	2009-01-20 13:23:53.864627000 -0600
++++ gst-plugins-bad-0.10.10/gst/deinterlace2/tvtime/tomsmocomp.c	2009-01-20 13:24:00.062670000 -0600
+@@ -79,6 +79,7 @@ Fieldcopy (void *dest, const void *src, 
+ #undef  SIMD_TYPE
+ #undef  FUNCT_NAME
+ 
++#undef BUILD_X86_ASM
+ #ifdef BUILD_X86_ASM
+ 
+ #include "tomsmocomp/tomsmocompmacros.h"