- updated to 1.0.0

- readded x264 patch to check for x264 >= 0.120 (which is satisfied by literal 0.120.x) instead of >= 0.120.0 (which is not)

diff --git a/gstreamer-plugins-ugly-x264.patch b/gstreamer-plugins-ugly-x264.patch
index be0e5f2e16e21bc24771e0d8c71c1cbb292cc826..ea863d70bf0ffc6d3812da1e4f67f428f3192f31 100644 (file)
--- a/gstreamer-plugins-ugly-x264.patch
+++ b/gstreamer-plugins-ugly-x264.patch
@@ -1,11 +1,11 @@
---- gst-plugins-ugly-0.10.13/ext/x264/gstx264enc.c~    2009-10-12 12:25:41.000000000 +0200
-+++ gst-plugins-ugly-0.10.13/ext/x264/gstx264enc.c     2009-11-20 12:22:49.281444816 +0100
-@@ -582,7 +582,7 @@
-   encoder->x264param.analyse.i_noise_reduction = encoder->noise_reduction;
-   encoder->x264param.i_frame_reference = encoder->ref;
-   encoder->x264param.i_bframe = encoder->bframes;
--  encoder->x264param.b_bframe_pyramid = encoder->b_pyramid;
-+  encoder->x264param.i_bframe_pyramid = encoder->b_pyramid;
- #if X264_BUILD < 63
-   encoder->x264param.b_bframe_adaptive = encoder->b_adapt;
- #else
+--- gst-plugins-ugly-1.0.0/configure.ac.orig   2012-09-23 18:52:42.000000000 +0200
++++ gst-plugins-ugly-1.0.0/configure.ac        2012-10-05 17:48:00.575430221 +0200
+@@ -351,7 +351,7 @@
+ dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
+ AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
+-  AG_GST_PKG_CHECK_MODULES(X264, x264 >= 0.120.0)
++  AG_GST_PKG_CHECK_MODULES(X264, x264 >= 0.120)
+ ])
+ 
+ else

diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index 27ac34675585a960c81b7ac14e0c2c021df5e4dd..ff158f1de4a427e7902e9ce38637aa8f07e3f7a9 100644 (file)
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -5,20 +5,21 @@
 %bcond_without amr             # AMR-NB/AMR-WB plugins
 
 %define                gstname         gst-plugins-ugly
-%define                gst_major_ver   0.10
-%define                gst_req_ver     0.10.36
-%define                gstpb_req_ver   0.10.36
+%define                gst_major_ver   1.0
+%define                gst_req_ver     1.0.0
+%define                gstpb_req_ver   1.0.0
 
 %include       /usr/lib/rpm/macros.gstreamer
 Summary:       Ugly GStreamer Streaming-media framework plugins
 Summary(pl.UTF-8):     Brzydkie wtyczki do środowiska obróbki strumieni GStreamer
 Name:          gstreamer-plugins-ugly
-Version:       0.10.19
-Release:       2
+Version:       1.0.0
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://gstreamer.freedesktop.org/src/gst-plugins-ugly/%{gstname}-%{version}.tar.xz
-# Source0-md5: ba26045c8c8c91f0d48d327ccf53ac0c
+# Source0-md5: 7f20303caf4305278573fb7ef73a07b7
+Patch0:                %{name}-x264.patch
 URL:           http://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.10
@@ -212,6 +213,7 @@ Wtyczka do GStreamera kodująca przy użyciu biblioteki x264.
 
 %prep
 %setup -q -n %{gstname}-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -238,7 +240,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # We don't need plugins' *.la files
-rm -f $RPM_BUILD_ROOT%{gstlibdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{gstlibdir}/*.la
 
 %find_lang %{gstname}-%{gst_major_ver}
 
@@ -251,11 +253,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{gstlibdir}/libgstasf.so
 %attr(755,root,root) %{gstlibdir}/libgstdvdlpcmdec.so
 %attr(755,root,root) %{gstlibdir}/libgstdvdsub.so
-%attr(755,root,root) %{gstlibdir}/libgstiec958.so
 %attr(755,root,root) %{gstlibdir}/libgstrmdemux.so
-%attr(755,root,root) %{gstlibdir}/libgstsynaesthesia.so
+%attr(755,root,root) %{gstlibdir}/libgstxingmux.so
 %{_datadir}/gstreamer-%{gst_major_ver}/presets
-%{_gtkdocdir}/gst-plugins-ugly-plugins-0.10
+%{_gtkdocdir}/gst-plugins-ugly-plugins-1.0
 
 ##
 ## Plugins
@@ -297,8 +298,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n gstreamer-mpeg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gstlibdir}/libgstmpeg2dec.so
-%attr(755,root,root) %{gstlibdir}/libgstmpegaudioparse.so
-%attr(755,root,root) %{gstlibdir}/libgstmpegstream.so
 
 %if %{with sid}
 %files -n gstreamer-sid