libraries/opencv: Updated for version 2.4.9.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 113 insertions, 115 deletions

diff --git a/libraries/opencv/opencv-2.4.7-fsh.patch b/libraries/opencv/opencv-2.4.7-fsh.patch
deleted file mode 100644
index a4ea210dd2c5f..0000000000000
--- a/libraries/opencv/opencv-2.4.7-fsh.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -Naur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
---- opencv-2.4.7.orig/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/CMakeLists.txt	2013-11-12 10:30:39.179852725 +0100
-@@ -243,9 +243,9 @@
- if(ANDROID OR WIN32)
-   set(OPENCV_DOC_INSTALL_PATH doc)
- elseif(INSTALL_TO_MANGLED_PATHS)
--  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
-+  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
- else()
--  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
-+  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
- endif()
- 
- if(WIN32)
-@@ -282,7 +282,7 @@
-     set(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
-   else()
-     set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
--    set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
-+    set(OPENCV_3P_LIB_INSTALL_PATH  share/Opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
-   endif()
-   set(OPENCV_INCLUDE_INSTALL_PATH "include")
- 
-@@ -290,7 +290,7 @@
-   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
-     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
-   else()
--    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
-+    set(OPENCV_CONFIG_INSTALL_PATH share/Opencv)
-   endif()
- endif()
- 
-diff -Naur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
---- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 10:25:51.071843495 +0100
-@@ -46,7 +46,7 @@
- 
-   #need better solution....
-   if(libpath MATCHES "3rdparty")
--    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
-+    set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
-   else()
-     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
-   endif()
-diff -Naur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt
---- opencv-2.4.7.orig/data/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/data/CMakeLists.txt	2013-11-12 10:25:51.072843495 +0100
-@@ -5,6 +5,6 @@
-   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
-   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT main)
- elseif(NOT WIN32)
--  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
--  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT main)
-+  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
-+  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT main)
- endif()
-diff -Naur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt
---- opencv-2.4.7.orig/samples/c/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/samples/c/CMakeLists.txt	2013-11-12 10:25:51.072843495 +0100
-@@ -54,6 +54,6 @@
- if (INSTALL_C_EXAMPLES AND NOT WIN32)
-   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
-   install(FILES ${C_SAMPLES}
--          DESTINATION share/OpenCV/samples/c
-+          DESTINATION share/opencv/samples/c
-           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- endif ()
-diff -Naur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt
---- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/samples/cpp/CMakeLists.txt	2013-11-12 10:25:51.072843495 +0100
-@@ -83,6 +83,6 @@
- if (INSTALL_C_EXAMPLES AND NOT WIN32)
-   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
-   install(FILES ${C_SAMPLES}
--          DESTINATION share/OpenCV/samples/cpp
-+          DESTINATION share/opencv/samples/cpp
-           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- endif()
-diff -Naur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
---- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/samples/gpu/CMakeLists.txt	2013-11-12 10:25:51.073843495 +0100
-@@ -83,6 +83,6 @@
- if (INSTALL_C_EXAMPLES AND NOT WIN32)
-   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
-   install(FILES ${install_list}
--          DESTINATION share/OpenCV/samples/${project}
-+          DESTINATION share/opencv/samples/${project}
-           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- endif()
-diff -Naur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt
---- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt	2013-11-12 10:25:51.073843495 +0100
-@@ -29,6 +29,6 @@
- if(INSTALL_C_EXAMPLES AND NOT WIN32)
-   file(GLOB GPU_FILES performance/*.cpp performance/*.h)
-   install(FILES ${GPU_FILES}
--          DESTINATION share/OpenCV/samples/gpu/performance
-+          DESTINATION share/opencv/samples/gpu/performance
-           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- endif()
diff --git a/libraries/opencv/opencv-2.4.9-fsh.patch b/libraries/opencv/opencv-2.4.9-fsh.patch
new file mode 100644
index 0000000000000..97c4ba241391d
--- /dev/null
+++ b/libraries/opencv/opencv-2.4.9-fsh.patch
@@ -0,0 +1,99 @@
+diff -Naurp opencv-2.4.9-orig/CMakeLists.txt opencv-2.4.9/CMakeLists.txt
+--- opencv-2.4.9-orig/CMakeLists.txt	2014-04-11 12:15:26.000000000 +0200
++++ opencv-2.4.9/CMakeLists.txt	2014-06-26 15:06:18.705309828 +0200
+@@ -258,9 +258,9 @@ endif()
+ if(ANDROID OR WIN32)
+   set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(INSTALL_TO_MANGLED_PATHS)
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
+ else()
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
+ endif()
+ 
+ if(WIN32)
+@@ -313,8 +313,8 @@ else()
+     set(OPENCV_SAMPLES_SRC_INSTALL_PATH    samples/native)
+   else()
+     set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-    set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+-    set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
++    set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++    set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/opencv/samples)
+   endif()
+   set(OPENCV_INCLUDE_INSTALL_PATH "include")
+ 
+@@ -322,7 +322,7 @@ else()
+   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+   else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+   endif()
+ endif()
+ 
+diff -Naurp opencv-2.4.9-orig/cmake/templates/opencv_run_all_tests_unix.sh.in opencv-2.4.9/cmake/templates/opencv_run_all_tests_unix.sh.in
+--- opencv-2.4.9-orig/cmake/templates/opencv_run_all_tests_unix.sh.in	2014-04-11 12:15:26.000000000 +0200
++++ opencv-2.4.9/cmake/templates/opencv_run_all_tests_unix.sh.in	2014-06-26 15:09:21.456025129 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
+-export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
++export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata
+ 
+ SUMMARY_STATUS=0
+ for t in "$OPENCV_TEST_PATH/"opencv_test_* "$OPENCV_TEST_PATH/"opencv_perf_*;
+@@ -22,4 +22,4 @@ else
+   echo "OpenCV tests finished with status $SUMMARY_STATUS"
+ fi
+ 
+-return $SUMMARY_STATUS
+\ Manca newline alla fine del file
++return $SUMMARY_STATUS
+diff -Naurp opencv-2.4.9-orig/cmake/templates/opencv_testing.sh.in opencv-2.4.9/cmake/templates/opencv_testing.sh.in
+--- opencv-2.4.9-orig/cmake/templates/opencv_testing.sh.in	2014-04-11 12:15:26.000000000 +0200
++++ opencv-2.4.9/cmake/templates/opencv_testing.sh.in	2014-06-26 15:09:09.472174948 +0200
+@@ -1,2 +1,2 @@
+ # Environment setup for OpenCV testing
+-export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
+\ Manca newline alla fine del file
++export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata
+diff -Naurp opencv-2.4.9-orig/data/CMakeLists.txt opencv-2.4.9/data/CMakeLists.txt
+--- opencv-2.4.9-orig/data/CMakeLists.txt	2014-04-11 12:15:26.000000000 +0200
++++ opencv-2.4.9/data/CMakeLists.txt	2014-06-26 15:07:54.202115953 +0200
+@@ -5,8 +5,8 @@ if(ANDROID)
+   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT libs)
+   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT libs)
+ elseif(NOT WIN32)
+-  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT libs)
+-  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT libs)
++  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT libs)
++  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT libs)
+ endif()
+ 
+ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
+@@ -17,6 +17,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PA
+     install(DIRECTORY ${OPENCV_TEST_DATA_PATH}
+             DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
+               GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-            DESTINATION share/OpenCV/testdata COMPONENT tests)
++            DESTINATION share/opencv/testdata COMPONENT tests)
+   endif()
+-endif()
+\ Manca newline alla fine del file
++endif()
+diff -Naurp opencv-2.4.9-orig/modules/java/CMakeLists.txt opencv-2.4.9/modules/java/CMakeLists.txt
+--- opencv-2.4.9-orig/modules/java/CMakeLists.txt	2014-04-11 12:15:26.000000000 +0200
++++ opencv-2.4.9/modules/java/CMakeLists.txt	2014-06-26 15:08:28.534686737 +0200
+@@ -280,7 +280,7 @@ else(ANDROID)
+   if(WIN32)
+     set(JAR_INSTALL_DIR java)
+   else(WIN32)
+-    set(JAR_INSTALL_DIR share/OpenCV/java)
++    set(JAR_INSTALL_DIR share/opencv/java)
+   endif(WIN32)
+   install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
+ endif(ANDROID)
+
diff --git a/libraries/opencv/opencv-2.4.7-pkgconfig.patch b/libraries/opencv/opencv-2.4.9-pkgconfig.patch
index 5626eb6e02993..5626eb6e02993 100644
--- a/libraries/opencv/opencv-2.4.7-pkgconfig.patch
+++ b/libraries/opencv/opencv-2.4.9-pkgconfig.patch
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 525dd6f62abb8..5ba0adf481f25 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for opencv
 
-# Copyright 2012 Matt Dinslage, Springfield, MO USA
+# Copyright 2012-2014 Matt Dinslage, Springfield, MO USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opencv
-VERSION=${VERSION:-2.4.8}
+VERSION=${VERSION:-2.4.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,16 +64,16 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # http://code.opencv.org/issues/2512
-patch -p1 < $CWD/opencv-2.4.7-fsh.patch
+patch -p1 < $CWD/opencv-2.4.9-fsh.patch
 
 # https://bugzilla.novell.com/show_bug.cgi?id=853036
-patch -p1 < $CWD/opencv-2.4.7-pkgconfig.patch
+patch -p1 < $CWD/opencv-2.4.9-pkgconfig.patch
 
 mkdir -p build
 cd build
@@ -94,11 +94,11 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md doc/license.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 1249a721c7c3a..8ac981e29ff72 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,8 +1,8 @@
 PRGNAM="opencv"
-VERSION="2.4.8"
+VERSION="2.4.9"
 HOMEPAGE="http://opencv.willowgarage.com/wiki/"
-DOWNLOAD="https://github.com/Itseez/opencv/archive/2.4.8.tar.gz"
-MD5SUM="9b8f1426bc01a1ae1e8b3bce11dc1e1c"
+DOWNLOAD="https://github.com/Itseez/opencv/archive/2.4.9.tar.gz"
+MD5SUM="cc0a8307403ff471f554197401ec0eb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""