From fca081d062b457421853f495d9042465ce7d60f3 Mon Sep 17 00:00:00 2001
From: ponce <matteo.bernardini@gmail.com>
Date: Sat, 31 Mar 2012 18:50:25 +0200
Subject: multimedia/mjpegtools: Updated for version 2.0.0.

This fixes build with kernel headers > 2.6.37 and gcc-4.7.x.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 multimedia/mjpegtools/mjpegtools.SlackBuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'multimedia/mjpegtools/mjpegtools.SlackBuild')

diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index e2566c373a..fce2888da8 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mjpegtools
-VERSION=1.9.0
-BUILD=${BUILD:-3}
+VERSION=2.0.0
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -69,8 +69,9 @@ chmod -R a-s,u+w,go+r-w .
 
 # Fix for x86_64
 sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-patch -p1 < $CWD/mjpegtools-1.9.0-glibc-2.10.patch
-patch -p0 < $CWD/mjpegtools-1.9.0-jpeg-7.patch
+
+# Fix for gcc-4.7.x
+sed -i 's/\tDeleteRegion/\tthis->DeleteRegion/' y4mdenoise/MotionSearcher.hh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -91,10 +92,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
-- 
cgit v1.2.3