From b167d04a09d436e132489aaff8a35ddd1b2daa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 2 May 2012 12:45:49 +0000 Subject: [PATCH] =?UTF-8?q?*=20Wed=20May=2002=202012=20S=C3=A9rgio=20Basto?= =?UTF-8?q?=20=20-=202.0.0-4=20-=20Add=20patch=20for=20?= =?UTF-8?q?gcc=204.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 7 ++++++- mjpegtools_gcc470.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 mjpegtools_gcc470.patch diff --git a/mjpegtools.spec b/mjpegtools.spec index c845e40..238eaf9 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -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 @@ for building applications that use mjpegtools lavpipe libraries. %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 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Wed May 02 2012 Sérgio Basto - 2.0.0-4 +- Add patch for gcc 4.7 + * Fri Mar 02 2012 Nicolas Chauvet - 2.0.0-3 - Rebuilt for c++ ABI breakage diff --git a/mjpegtools_gcc470.patch b/mjpegtools_gcc470.patch new file mode 100644 index 0000000..050b33f --- /dev/null +++ b/mjpegtools_gcc470.patch @@ -0,0 +1,11 @@ +--- 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 + {