From da0a0d88caa1bf934ebf314ef86e15928dbb027b Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 7 May 2013 00:36:35 -0700
Subject: Tue May  7 00:36:35 PDT 2013

---
 extra/mjpegtools/PKGBUILD                      | 21 ++++++++++++++-------
 extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch | 11 +++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch

(limited to 'extra/mjpegtools')

diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index e12fecfbd..5558ead11 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148854 2012-02-05 11:52:58Z ibiru $
+# $Id: PKGBUILD 184411 2013-05-06 19:38:45Z foutrelis $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Maintainer: Roberto Carvajal <roberto@archlinux.org>
 
 pkgname=mjpegtools
 pkgver=2.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
 arch=(i686 x86_64)
 license=('GPL')
@@ -15,20 +15,27 @@ optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
 install=mjpegtools.install
 source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-        mjpegtools-v4l-2.6.38.patch)
+        mjpegtools-v4l-2.6.38.patch
+        mjpegtools-2.0.0-gcc470.patch)
 md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
-         '44006d6f844017fe57aa123aa43f4508')
+         '44006d6f844017fe57aa123aa43f4508'
+         '7c9b3d4a1f3a10e3263a6a110b0f55cc')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
+  patch -Np1 -i "${srcdir}/mjpegtools-2.0.0-gcc470.patch"
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-largefile
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
 }
diff --git a/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch b/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch
new file mode 100644
index 000000000..050b33feb
--- /dev/null
+++ b/extra/mjpegtools/mjpegtools-2.0.0-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
+ 	{
-- 
cgit v1.2.3-54-g00ecf