rpms/mjpegtools/EL-6 mjpegtools_gcc470.patch, NONE, 1.1 mjpegtools.spec, 1.9, 1.10

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/mjpegtools/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2958

Modified Files:
	mjpegtools.spec 
Added Files:
	mjpegtools_gcc470.patch 
Log Message:
Sync EL-6 with F-17.

mjpegtools_gcc470.patch:
 MotionSearcher.hh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mjpegtools_gcc470.patch ---
--- a/y4mdenoise/MotionSearcher.hh
+++ b/y4mdenoise/MotionSearcher.hh
@@ -2196,7 +2196,7 @@
 	{
 		// This region is too small to be bothered with.
 		// Just get rid of it.
-		DeleteRegion (a_pRegion);
+		this->DeleteRegion (a_pRegion);
 	}
 	else
 	{


Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/EL-6/mjpegtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mjpegtools.spec	1 May 2012 21:25:43 -0000	1.9
+++ mjpegtools.spec	2 May 2012 14:48:45 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           mjpegtools
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to manipulate MPEG data
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://mjpeg.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
 Patch0:         mjpegtools-2.0.0-no-config-in-public-header.h
+Patch1:         mjpegtools_gcc470.patch
 BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
 BuildRequires:  libdv-devel
@@ -96,6 +97,7 @@
 %prep 
 %setup -q
 %patch0 -p1
+%patch1 -p1
 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
 sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
 for f in docs/yuvfps.1 ; do
@@ -181,6 +183,9 @@
 
 
 %changelog
+* Wed May 02 2012 Sérgio Basto <sergio at serjux.com> - 2.0.0-4
+- Add patch for gcc 4.7
+
 * Fri Mar 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.0-3
 - Rebuilt for c++ ABI breakage