From fbd96a400c607c185805f3db12153bb071db6d9c Mon Sep 17 00:00:00 2001
From: M.Dinslage
Date: Wed, 28 Dec 2011 23:10:09 -0600
Subject: libraries/opencv: Included patch for newer ffmpeg (0.8.x)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 libraries/opencv/opencv.SlackBuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libraries/opencv/opencv.SlackBuild')

diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index dec8489bf5..2a4730b8eb 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -7,7 +7,7 @@
 PRGNAM=opencv
 SRCNAM=OpenCV
 VERSION=${VERSION:-2.3.1a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,9 +53,11 @@ find . \
  -exec chmod 644 {} \;
 
 # Honor LIB_SUFFIX
-# rewritten for slackware
 patch -p1 < $CWD/libopencv-2.3.1a-libdir.patch
 
+# Fix building with ffmmpeg 0.6/0.8
+patch -p1 < $CWD/opencv-2.3.1a-libav-0.7.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -71,8 +73,7 @@ cd build
     ..
   make VERBOSE=1
   make install DESTDIR=$PKG
-
-cd -
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-- 
cgit v1.2.3