- started work on 1.6.0 (WIP, NFY, just saving work)

- removed obsolete nas,doc patches
- bluez plugin has been adapted to bluez 5

diff --git a/gstreamer-plugins-bad-doc.patch b/gstreamer-plugins-bad-doc.patch
deleted file mode 100644 (file)
index 753641e..0000000
--- a/gstreamer-plugins-bad-doc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst-plugins-bad-1.0.2/docs/plugins/gst-plugins-bad-plugins-docs.sgml.orig  2012-10-24 14:43:23.000000000 +0200
-+++ gst-plugins-bad-1.0.2/docs/plugins/gst-plugins-bad-plugins-docs.sgml       2012-10-28 12:53:08.981375217 +0100
-@@ -116,7 +116,6 @@
-     <xi:include href="xml/plugin-dtsdec.xml" />
-     <xi:include href="xml/plugin-dvb.xml" />
-     <xi:include href="xml/plugin-dvdspu.xml" />
--    <xi:include href="xml/plugin-eglglessink.xml" />
-     <xi:include href="xml/plugin-faac.xml" />
-     <xi:include href="xml/plugin-faad.xml" />
-     <xi:include href="xml/plugin-festival.xml" />

diff --git a/gstreamer-plugins-bad-nas.patch b/gstreamer-plugins-bad-nas.patch
deleted file mode 100644 (file)
index 67a1187..0000000
--- a/gstreamer-plugins-bad-nas.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gst-plugins-bad-0.10.7/configure.ac~       2008-05-07 22:58:40.000000000 +0200
-+++ gst-plugins-bad-0.10.7/configure.ac        2008-05-07 23:02:25.105184893 +0200
-@@ -827,14 +827,14 @@
- translit(dnm, m, l) AM_CONDITIONAL(USE_NAS, true)
- AG_GST_CHECK_FEATURE(NAS, [nas plug-in], nassink, [
-   HAVE_NAS="no"
--  AG_GST_CHECK_X
--  if test "x$HAVE_X" = "xyes"; then
-+#  AG_GST_CHECK_X
-+#  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.spec b/gstreamer-plugins-bad.spec
index a95504dd4142ad039a03402db0b6858ca15dfe4a..e0b01a472e66c21a49b6d4fecbc2c402454d2ba6 100644 (file)
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -3,7 +3,7 @@
 #
 # Conditional build:
 %bcond_without amr             # amrwbenc output plugin
-%bcond_with    bluez           # Bluez plugin (not ready for bluez 5)
+%bcond_without bluez           # Bluez plugin
 %bcond_without chromaprint     # chromaprint fingerprint plugin
 %bcond_without daala           # Daala video encoder/decoder plugin
 %bcond_with    dc1394          # dc1394 input plugin [not ported to 1.0]
@@ -53,22 +53,20 @@
 
 %define                gstname         gst-plugins-bad
 %define                gst_major_ver   1.0
-%define                gst_req_ver     1.4.0
-%define                gstpb_req_ver   1.4.0
+%define                gst_req_ver     1.6.0
+%define                gstpb_req_ver   1.6.0
 %include       /usr/lib/rpm/macros.gstreamer
 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:       1.4.5
-Release:       3
+Version:       1.6.0
+Release:       0.1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.xz
-# Source0-md5: e0bb39412cf4a48fe0397bcf3a7cd451
+# Source0-md5: 111632f8d1d1ba39bbf3665aaafcb28c
 Patch0:                %{name}-libdts.patch
 Patch1:                %{name}-timidity.patch
-Patch2:                %{name}-nas.patch
-Patch3:                %{name}-doc.patch
 URL:           http://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.68
 BuildRequires: automake >= 1:1.11
@@ -107,7 +105,7 @@ BuildRequires:      xorg-lib-libXcomposite-devel
 %{?with_gles:BuildRequires:    Mesa-libGLES-devel}
 %{?with_sdl:BuildRequires:     SDL-devel}
 BuildRequires: alsa-lib-devel >= 0.9.1
-%{?with_bluez:BuildRequires:   bluez-libs-devel < 5.0}
+%{?with_bluez:BuildRequires:   bluez-libs-devel >= 5.0}
 BuildRequires: bzip2-devel
 %{?with_rsvg:BuildRequires:    cairo-devel}
 BuildRequires: curl-devel >= 7.21.0
@@ -309,6 +307,7 @@ Wtyczka wyjścia dźwięku NAS dla GStreamera.
 Summary:       GStreamer plugin for Bluez-based bluetooth support
 Summary(pl.UTF-8):     Wtyczka GStreamera do obsługi bluetooth w oparciu o Bluez
 Group:         Libraries
+Requires:      bluez-libs >= 5.0
 Requires:      gstreamer-plugins-base >= %{gstpb_req_ver}
 Obsoletes:     gstreamer-bluetooth
 
@@ -1012,8 +1011,6 @@ Wtyczka do GStreamera skanująca kody kreskowe.
 %setup -q -n %{gstname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -1080,6 +1077,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{gstname}-%{gst_major_ver}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README RELEASE
+%attr(755,root,root) %{_libdir}/libgstadaptivedemux-%{gst_major_ver}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgstadaptivedemux-%{gst_major_ver}.so.0
 %attr(755,root,root) %{_libdir}/libgstbadbase-%{gst_major_ver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgstbadbase-%{gst_major_ver}.so.0
 %attr(755,root,root) %{_libdir}/libgstbadvideo-%{gst_major_ver}.so.*.*.*
@@ -1100,6 +1099,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgsturidownloader-%{gst_major_ver}.so.0
 %attr(755,root,root) %{_libdir}/libgstwayland-%{gst_major_ver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgstwayland-%{gst_major_ver}.so.0
+%{_libdir}/girepository-1.0/GstGL-1.0.typelib
 %{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib
 %{_libdir}/girepository-1.0/GstMpegts-1.0.typelib
 %attr(755,root,root) %{gstlibdir}/libgstaccurip.so
@@ -1160,6 +1160,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{gstlibdir}/libgstsmoothstreaming.so
 %attr(755,root,root) %{gstlibdir}/libgststereo.so
 %attr(755,root,root) %{gstlibdir}/libgstsubenc.so
+%attr(755,root,root) %{gstlibdir}/libgstvcdsrc.so
 %attr(755,root,root) %{gstlibdir}/libgstvideofiltersbad.so
 %attr(755,root,root) %{gstlibdir}/libgstvideoparsersbad.so
 %attr(755,root,root) %{gstlibdir}/libgstvideosignal.so
@@ -1183,12 +1184,16 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 #%attr(755,root,root) %{gstlibdir}/libgstsdi.so
 #%attr(755,root,root) %{gstlibdir}/libgsttta.so
-#%attr(755,root,root) %{gstlibdir}/libgstvcdsrc.so
 #%attr(755,root,root) %{gstlibdir}/libgstvideomeasure.so
+# dirs should belong to gstreamer or gstreamer-pb?
+%dir %{gstdatadir}
+%dir %{gstdatadir}/presets
+%{gstdatadir}/presets/GstFreeverb.prs
 %{_gtkdocdir}/gst-plugins-bad-plugins-%{gst_major_ver}
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgstadaptivedemux-%{gst_major_ver}.so
 %attr(755,root,root) %{_libdir}/libgstbadbase-%{gst_major_ver}.so
 %attr(755,root,root) %{_libdir}/libgstbadvideo-%{gst_major_ver}.so
 %attr(755,root,root) %{_libdir}/libgstbasecamerabinsrc-%{gst_major_ver}.so
@@ -1206,6 +1211,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gstreamer-%{gst_major_ver}/gst/interfaces
 %{_includedir}/gstreamer-%{gst_major_ver}/gst/mpegts
 %{_includedir}/gstreamer-%{gst_major_ver}/gst/uridownloader
+%{_libdir}/gstreamer-1.0/include/gst/gl
+%{_datadir}/gir-1.0/GstGL-1.0.gir
 %{_datadir}/gir-1.0/GstInsertBin-1.0.gir
 %{_datadir}/gir-1.0/GstMpegts-1.0.gir
 %{_pkgconfigdir}/gstreamer-codecparsers-%{gst_major_ver}.pc
@@ -1230,9 +1237,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n gstreamer-amrwbenc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gstlibdir}/libgstvoamrwbenc.so
-# dirs should belong to gstreamer or gstreamer-pb?
-%dir %{gstdatadir}
-%dir %{gstdatadir}/presets
 %{gstdatadir}/presets/GstVoAmrwbEnc.prs
 %endif