- 0.10.6

Changed files:
    gstreamer-plugins-bad-libdts.patch -> 1.4
    gstreamer-plugins-bad-nas.patch -> 1.1
    gstreamer-plugins-bad-neon27.patch -> 1.3
    gstreamer-plugins-bad-timidity.patch -> 1.1
    gstreamer-plugins-bad.spec -> 1.35

diff --git a/gstreamer-plugins-bad-libdts.patch b/gstreamer-plugins-bad-libdts.patch
index a76cd852e1f9cbc91312241b8121600f94a2dffc..85a56664cff489d03e4b695cbf73bf4d6366234f 100644 (file)
--- a/gstreamer-plugins-bad-libdts.patch
+++ b/gstreamer-plugins-bad-libdts.patch
@@ -1,14 +1,13 @@
 --- gst-plugins-bad-0.10.3/configure.ac.orig   2006-05-04 17:18:42.000000000 +0200
 +++ gst-plugins-bad-0.10.3/configure.ac        2006-05-21 20:21:48.752716750 +0200
 @@ -388,8 +388,8 @@
- dnl *** DTS ***
  translit(dnm, m, l) AM_CONDITIONAL(USE_DTS, true)
  AG_GST_CHECK_FEATURE(DTS, [dts library], dtsdec, [
+   HAVE_DTS="yes"
 -  AG_GST_CHECK_LIBHEADER(DTS, dts_pic, dts_init, -lm, dts.h,
--    DTS_LIBS="-ldts_pic -lm")
+-    DTS_LIBS="-ldts_pic -lm", HAVE_DTS="no")
 +  AG_GST_CHECK_LIBHEADER(DTS, dts, dts_init, -lm, dts.h,
-+    DTS_LIBS="-ldts -lm")
-   AC_SUBST(DTS_LIBS)
- ])
- 
-
++    DTS_LIBS="-ldts -lm", HAVE_DTS="no")
+   if test $HAVE_DTS = "no"; then
+     AG_GST_CHECK_LIBHEADER(DTS, dca, dca_init, -lm, dts.h,
+       DTS_LIBS="-ldca -lm")

diff --git a/gstreamer-plugins-bad-nas.patch b/gstreamer-plugins-bad-nas.patch
new file mode 100644 (file)
index 0000000..c6678ce
--- /dev/null
+++ b/gstreamer-plugins-bad-nas.patch
@@ -0,0 +1,18 @@
+--- gst-plugins-bad-0.10.6/configure.ac~       2008-02-21 16:58:30.000000000 +0100
++++ gst-plugins-bad-0.10.6/configure.ac        2008-02-21 17:09:37.048926286 +0100
+@@ -733,13 +733,13 @@
+ translit(dnm, m, l) AM_CONDITIONAL(USE_NAS, true)
+ AG_GST_CHECK_FEATURE(NAS, [nas plug-in], nassink, [
+   HAVE_NAS="no"
+-  if test "x$HAVE_X" = "xyes"; then
++#  if test "x$HAVE_X" = "xyes"; then
+     save_cppflags=$CFLAGS
+     CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+     AG_GST_CHECK_LIBHEADER(NAS, audio, AuOpenServer, $X_LIBS, audio/audiolib.h,
+       NAS_LIBS="$X_LIBS -laudio" NAS_CFLAGS="$X_CFLAGS")
+     CPPFLAGS="$save_cppflags"
+-  fi
++#  fi
+   AC_SUBST(NAS_CFLAGS)
+   AC_SUBST(NAS_LIBS)
+ ])

diff --git a/gstreamer-plugins-bad-neon27.patch b/gstreamer-plugins-bad-neon27.patch
index 50fa77d5cb084c4fdde2d111cc47898ffeb40c95..b1b9e2332265fd7c96adb3c73e37ab89f1a590de 100644 (file)
--- a/gstreamer-plugins-bad-neon27.patch
+++ b/gstreamer-plugins-bad-neon27.patch
@@ -1,11 +1,11 @@
---- gst-plugins-bad-0.10.5/configure.ac~       2007-09-07 02:52:19.000000000 +0200
-+++ gst-plugins-bad-0.10.5/configure.ac        2007-09-07 02:55:15.000000000 +0200
-@@ -705,7 +705,7 @@
+--- gst-plugins-bad-0.10.6/configure.ac~       2008-02-21 14:35:22.000000000 +0100
++++ gst-plugins-bad-0.10.6/configure.ac        2008-02-21 14:39:45.307942141 +0100
+@@ -747,7 +747,7 @@
  dnl *** neon ***
  translit(dnm, m, l) AM_CONDITIONAL(USE_NEON, true)
  AG_GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [
--  PKG_CHECK_MODULES(NEON, neon >= 0.25.5  neon <= 0.26.99, HAVE_NEON="yes", [
-+  PKG_CHECK_MODULES(NEON, neon >= 0.25.5, HAVE_NEON="yes", [
+-  PKG_CHECK_MODULES(NEON, neon >= 0.26.0  neon <= 0.27.99, HAVE_NEON="yes", [
++  PKG_CHECK_MODULES(NEON, neon >= 0.26.0  neon <= 0.28.99, HAVE_NEON="yes", [
      HAVE_NEON="no"
      AC_MSG_RESULT(no)
    ])

diff --git a/gstreamer-plugins-bad-timidity.patch b/gstreamer-plugins-bad-timidity.patch
new file mode 100644 (file)
index 0000000..dbbfc41
--- /dev/null
+++ b/gstreamer-plugins-bad-timidity.patch
@@ -0,0 +1,20 @@
+--- gst-plugins-bad-0.10.6/configure.ac~       2008-02-21 15:24:00.000000000 +0100
++++ gst-plugins-bad-0.10.6/configure.ac        2008-02-21 15:55:33.786497575 +0100
+@@ -772,16 +772,7 @@
+   PKG_CHECK_MODULES(TIMIDITY, libtimidity, [
+     HAVE_TIMIDITY="yes",
+       AC_MSG_CHECKING([for timidity.cfg])
+-      timidity_cfg=""
+-      if test -r /etc/timidity.cfg; then
+-        timidity_cfg=/etc/timidity.cfg
+-      elif test -r /etc/timidity/timidity.cfg; then
+-        timidity_cfg=/etc/timidity/timidity.cfg
+-      elif test -r /usr/share/timidity/timidity.cfg; then
+-        timidity_cfg=/usr/share/timidity/timidity.cfg
+-      elif test -r /usr/local/share/timidity/timidity.cfg; then
+-        timidity_cfg=/usr/local/share/timidity/timidity.cfg
+-      fi
++      timidity_cfg="/etc/timidity.cfg"
+       if test "x$timidity_cfg" != "x"; then
+         AC_MSG_RESULT($timidity_cfg)
+       AC_DEFINE_UNQUOTED(TIMIDITY_CFG, "$timidity_cfg", [Define location of timidity.cfg])

diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index d1753673f620281ddb5776c18044cb42128e7d09..1516eb6d341de5d9cdad5528ad955e03a0ffb053 100644 (file)
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -17,6 +17,7 @@
 %bcond_without musepack        # don't build musepack plugin
 %bcond_without neon            # don't build neonhttpsrc plugin
 %bcond_without sdl             # don't build sdl plugin
+%bcond_with    soup            # libsoup 2.4 http source
 %bcond_with    swfdec          # swfdec plugin
 %bcond_without spc             # don't build spc plugin
 %bcond_without wavpack         # don't build wavpack plugin
@@ -26,25 +27,23 @@
 #
 %define                gstname         gst-plugins-bad
 %define                gst_major_ver   0.10
-%define                gst_req_ver     0.10.13
+%define                gst_req_ver     0.10.14
 #
 Summary:       Bad GStreamer Streaming-media framework plugins
 Summary(pl.UTF-8):     Złe wtyczki do środowiska obróbki strumieni GStreamer
 Name:          gstreamer-plugins-bad
-Version:       0.10.5
-Release:       5
+Version:       0.10.6
+Release:       1
 License:       LPL
 Group:         Libraries
 Source0:       http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.bz2
-# Source0-md5: 395f3ed705928e77e5620cccf11a8cff
+# Source0-md5: fb47838aa0ccef52683cea5d89364053
 Patch0:                %{name}-bashish.patch
 Patch1:                %{name}-libdts.patch
 Patch2:                %{name}-divx4linux.patch
-Patch3:                %{name}-soundtouch.patch
-Patch4:                %{name}-link.patch
-Patch5:                %{name}-vcd.patch
-Patch6:                %{name}-gmyth.patch
-Patch7:                %{name}-neon27.patch
+Patch3:                %{name}-neon27.patch
+Patch4:                %{name}-timidity.patch
+Patch5:                %{name}-nas.patch
 URL:           http://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake >= 1.6
@@ -69,7 +68,7 @@ BuildRequires:        bzip2-devel
 %{?with_divx4linux:BuildRequires:      divx4linux-devel >= 1:5.05.20030428}
 BuildRequires: faac-devel
 %{?with_faad:BuildRequires:    faad2-devel >= 2.0-2}
-BuildRequires: gmyth-devel >= 0.3
+BuildRequires: gmyth-devel >= 0.7
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel >= 0.99.10}
 %{?with_ladspa:BuildRequires:  ladspa-devel >= 1.12}
 %{?with_cdaudio:BuildRequires: libcdaudio-devel}
@@ -79,6 +78,7 @@ BuildRequires:        gmyth-devel >= 0.3
 %{?with_musepack:BuildRequires:        libmpcdec-devel >= 1.2}
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 %{?with_spc:BuildRequires:     libopenspc-devel >= 0.3.99}
+%{?with_soup:BuildRequires:    libsoup-devel >= 2.3.0.1}
 # for modplug and libSoundTouch
 BuildRequires: libstdc++-devel
 BuildRequires: libtimidity-devel
@@ -494,8 +494,6 @@ Wtyczka do GStreamera dekodująca przy użyciu biblioteki x264.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -519,8 +517,10 @@ Wtyczka do GStreamera dekodująca przy użyciu biblioteki x264.
        %{!?with_sdl:--disable-sdl} \
        %{!?with_sdl:--disable-sdltest} \
        %{!?with_spc:--disable-spc} \
+       %{!?with_soup:--disable-soup} \
        %{!?with_swfdec:--disable-swfdec} \
        %{!?with_xvid:--disable-xvid} \
+       --disable-dc1394 \
        --disable-static \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}
@@ -556,32 +556,39 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{gstlibdir}/libgstcdxaparse.so
 %attr(755,root,root) %{gstlibdir}/libgstdeinterlace.so
 # R: gst-plugins-bad locales
-%attr(755,root,root) %{gstlibdir}/libgstdvbsrc.so
-%attr(755,root,root) %{gstlibdir}/libgstequalizer.so
+%attr(755,root,root) %{gstlibdir}/libgstdvb.so
+%attr(755,root,root) %{gstlibdir}/libgstdvdspu.so
+%attr(755,root,root) %{gstlibdir}/libgstfbdevsink.so
+%attr(755,root,root) %{gstlibdir}/libgstfestival.so
 %attr(755,root,root) %{gstlibdir}/libgstfilter.so
+%attr(755,root,root) %{gstlibdir}/libgstflvdemux.so
 %attr(755,root,root) %{gstlibdir}/libgstfreeze.so
 %attr(755,root,root) %{gstlibdir}/libgsth264parse.so
 %attr(755,root,root) %{gstlibdir}/libgstinterleave.so
+%attr(755,root,root) %{gstlibdir}/libgstmetadata.so
 %attr(755,root,root) %{gstlibdir}/libgstmodplug.so
+%attr(755,root,root) %{gstlibdir}/libgstmpeg4videoparse.so
+%attr(755,root,root) %{gstlibdir}/libgstmpegtsparse.so
 %attr(755,root,root) %{gstlibdir}/libgstmpegvideoparse.so
 %attr(755,root,root) %{gstlibdir}/libgstmve.so
-%attr(755,root,root) %{gstlibdir}/libgstmultifile.so
 %attr(755,root,root) %{gstlibdir}/libgstnsf.so
 %attr(755,root,root) %{gstlibdir}/libgstnuvdemux.so
+%attr(755,root,root) %{gstlibdir}/libgstrawparse.so
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{gstlibdir}/libgstreal.so
 %endif
 %attr(755,root,root) %{gstlibdir}/libgstreplaygain.so
 %attr(755,root,root) %{gstlibdir}/libgstrfbsrc.so
 %attr(755,root,root) %{gstlibdir}/libgstrtpmanager.so
-%attr(755,root,root) %{gstlibdir}/libgstspectrum.so
-%attr(755,root,root) %{gstlibdir}/libgstswitch.so
+%attr(755,root,root) %{gstlibdir}/libgstsdpelem.so
+%attr(755,root,root) %{gstlibdir}/libgstselector.so
+%{?with_soup:%attr(755,root,root) %{gstlibdir}/libgstsouphttpsrc.so}
+%attr(755,root,root) %{gstlibdir}/libgstspeexresample.so
+%attr(755,root,root) %{gstlibdir}/libgststereo.so
 %attr(755,root,root) %{gstlibdir}/libgsttta.so
 %attr(755,root,root) %{gstlibdir}/libgstvcdsrc.so
-%attr(755,root,root) %{gstlibdir}/libgstvideoparse.so
 %attr(755,root,root) %{gstlibdir}/libgstvideosignal.so
 %attr(755,root,root) %{gstlibdir}/libgstvmnc.so
-%attr(755,root,root) %{gstlibdir}/libgstxingheader.so
 %attr(755,root,root) %{gstlibdir}/libgsty4menc.so
 %{_gtkdocdir}/gst-plugins-bad-plugins-*
 
@@ -647,7 +654,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n gstreamer-imagesink-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{gstlibdir}/libgstglimagesink.so
+#%attr(755,root,root) %{gstlibdir}/libgstglimagesink.so
 
 %if %{with jack}
 %files -n gstreamer-jack
@@ -695,7 +702,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n gstreamer-soundtouch
 %defattr(644,root,root,755)
-%attr(755,root,root) %{gstlibdir}/libgstpitch.so
+%attr(755,root,root) %{gstlibdir}/libgstsoundtouch.so
 
 %files -n gstreamer-sndfile
 %defattr(644,root,root,755)