From 09390603c4e6d133269238ff726252c58da09a8a Mon Sep 17 00:00:00 2001
From: M.Dinslage
Date: Sun, 24 Jul 2011 17:18:23 -0400
Subject: libraries/opencv: Updated for version 2.3.0.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 libraries/opencv/opencv.SlackBuild | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

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

diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 27a795be87..fdb800d220 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -1,22 +1,19 @@
 #!/bin/sh
 
-# Slackware build script for cwp (customizable weather plasmoid)
+# Slackware build script for opencv (Open Source Computer Vision)
 
 # Written by M.Dinslage  contact: daedra1980@gmail.com
-# Big thanks to ponce for the patches.
 
 PRGNAM=opencv
 SRCNAM=OpenCV
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -29,19 +26,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-  SLKLDFLAGS="-L/usr/lib -L/lib"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  SLKLDFLAGS="-L/usr/lib -L/lib"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SLKLDFLAGS="-L/usr/lib64 -L/lib64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  SLKLDFLAGS="-L/usr/lib -L/lib"
 fi
 
 set -e
@@ -59,16 +52,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patch for libpng-1.4
-patch -p1 < $CWD/libpng-1.4.patch
-
-# Honor LIB_SUFFIX http://sourceforge.net/tracker/index.php?func=detail&aid=2876292&group_id=22870&atid=376679
-# rewritten by ponce for 2.1.0
-patch -p1 < $CWD/libopencv-2.1.0-libdir.patch
+# Honor LIB_SUFFIX
+# rewritten for slackware
+patch -p1 < $CWD/libopencv-2.3.0-libdir.patch
 
 mkdir -p build
 cd build
-  LDFLAGS=$SLKLDFLAGS cmake \
+  cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE="Release" \
@@ -89,7 +79,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir $PKG/usr/doc
 mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README doc/opencv.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3