rpms/gstreamer-plugins-bad/devel gstreamer-plugins-bad-mjpegtools-2.0.0.patch, NONE, 1.1 gstreamer-plugins-bad.spec, 1.43, 1.44

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29401

Modified Files:
	gstreamer-plugins-bad.spec 
Added Files:
	gstreamer-plugins-bad-mjpegtools-2.0.0.patch 
Log Message:
* Tue Aug  2 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.22-2
- Rebuild for new mjpegtools-2.0.0 (rf#1841)


gstreamer-plugins-bad-mjpegtools-2.0.0.patch:
 gstmpeg2encoder.cc |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gstreamer-plugins-bad-mjpegtools-2.0.0.patch ---
>From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001
From: Götz Waschk <waschk at mandriva.org>
Date: Tue, 24 May 2011 13:42:44 +0000
Subject: mpeg2enc: support mjpegtools 2.0

This adds conditional includes for the renamed headers in mjpegtools 2.0.
Fixes: #650970.
---
diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc
index acfda50..31f1a30 100644
--- a/ext/mpeg2enc/gstmpeg2encoder.cc
+++ b/ext/mpeg2enc/gstmpeg2encoder.cc
@@ -26,7 +26,10 @@
 
 #include <mpegconsts.h>
 #include <quantize.hh>
-#if GST_MJPEGTOOLS_API >= 10900
+#if GST_MJPEGTOOLS_API >= 10903
+#include <ontheflyratectlpass1.hh>
+#include <ontheflyratectlpass2.hh>
+#elif GST_MJPEGTOOLS_API >= 10900
 #include <ontheflyratectl.hh>
 #include <pass1ratectl.hh>
 #include <pass2ratectl.hh>
--
cgit v0.8.3-6-g21f6


Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gstreamer-plugins-bad.spec	17 May 2011 09:12:17 -0000	1.43
+++ gstreamer-plugins-bad.spec	2 Aug 2011 22:04:05 -0000	1.44
@@ -15,12 +15,12 @@
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad
 Version: 0.10.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
 Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: gstreamer-plugins-bad-mjpegtools-2.0.0.patch
 Requires: %{gstreamer} >= %{gst_minver}
 # Drag in the free plugins which are in Fedora now, for upgrade path
 Requires: gstreamer-plugins-bad-free >= %{version}
@@ -37,7 +37,7 @@
 BuildRequires: faad2-devel
 BuildRequires: xvidcore-devel
 BuildRequires: libmms-devel
-BuildRequires: mjpegtools-devel
+BuildRequires: mjpegtools-devel >= 2.0.0
 BuildRequires: twolame-devel
 BuildRequires: libmimic-devel
 BuildRequires: librtmp-devel
@@ -52,6 +52,7 @@
 
 %prep
 %setup -q -n gst-plugins-bad-%{version}
+%patch0 -p1
 
 
 %build
@@ -72,7 +73,6 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 for i in %{gstdirs} %{extdirs}; do
     pushd $i
     make install V=2 DESTDIR=$RPM_BUILD_ROOT
@@ -83,10 +83,6 @@
 rm %{buildroot}%{_libdir}/gstreamer-%{majorminor}/*.la
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README REQUIREMENTS
@@ -110,6 +106,9 @@
 
 
 %changelog
+* Tue Aug  2 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.22-2
+- Rebuild for new mjpegtools-2.0.0 (rf#1841)
+
 * Tue May 17 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.22-1
 - New upstream release 0.10.22