From 08c4542d91caa8ebb2cdc5f2117af85d1be170ab Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 1 Aug 2015 12:12:45 +0000
Subject: [PATCH] extra/opencv to 2.4.11-1

---
 extra/opencv/PKGBUILD        |  31 ++------
 extra/opencv/fsh.patch       | 136 -----------------------------------
 extra/opencv/pkgconfig.patch |  35 ---------
 3 files changed, 4 insertions(+), 198 deletions(-)
 delete mode 100644 extra/opencv/fsh.patch
 delete mode 100644 extra/opencv/pkgconfig.patch

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index f2a5f6678..da0dd6fbd 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -11,8 +11,8 @@
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.10
-pkgrel=3
+pkgver=2.4.11
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -23,12 +23,8 @@ makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
 optdepends=('opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
-source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
-        'pkgconfig.patch'
-        'fsh.patch')
-md5sums=('ec63952d3a3dff965d5fdde765926821'
-         'c7cea48ed7d4f729ebdb9673bac41bd3'
-         'c597598d142dd34d0eb4af7d6e9779d8')
+source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip")
+md5sums=('32f498451bff1817a60e1aabc2939575')
 
 _cmakeopts=('-D WITH_OPENCL=OFF'
             '-D WITH_OPENGL=ON'
@@ -56,25 +52,6 @@ _cmakeopts=('-D WITH_OPENCL=OFF'
 # ARMv7 supports Intel TBB
 [[ "$CARCH" = 'armv7h' ]] && _cmakeopts+=('-D WITH_TBB=ON')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  msg2 "Fixing broken pkg-config (downstream)"
-  # see https://bugs.archlinux.org/task/32430
-  # and http://code.opencv.org/issues/1925
-  patch -Np1 -i "$srcdir/pkgconfig.patch"
-
-  # TODO: this is mostly upstream frei0r; they hardcode the path
-  #msg2 "Hack-fixing folder naming inconsistency (downstream)"
-  # see http://code.opencv.org/issues/2512
-  # and https://bugs.archlinux.org/task/32342
-  #patch -Np1 -i "$srcdir/fsh.patch"
-
-  # no longer including docs, see https://bugs.archlinux.org/task/34185
-  # python2 compatibility for generating (html) docs
-  #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
diff --git a/extra/opencv/fsh.patch b/extra/opencv/fsh.patch
deleted file mode 100644
index 650d46a70..000000000
--- a/extra/opencv/fsh.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -baur 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-12 20:31:27.253763202 +0000
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:54.923577113 +0000
-@@ -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 -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake opencv-2.4.7/cmake/OpenCVModule.cmake
---- opencv-2.4.7.orig/cmake/OpenCVModule.cmake	2013-11-12 20:31:27.253763202 +0000
-+++ opencv-2.4.7/cmake/OpenCVModule.cmake	2013-11-12 20:35:37.805415871 +0000
-@@ -807,7 +807,7 @@
-   if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}")
-     file(GLOB sample_files "${samples_path}/*")
-     install(FILES ${sample_files}
--            DESTINATION share/OpenCV/samples/${module_id}
-+            DESTINATION share/opencv/samples/${module_id}
-             PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-   endif()
- endfunction()
-diff -baur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
---- opencv-2.4.7.orig/CMakeLists.txt	2013-11-12 20:31:27.437095684 +0000
-+++ opencv-2.4.7/CMakeLists.txt	2013-11-12 20:40:21.160171499 +0000
-@@ -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 -baur 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-12 20:31:27.280430213 +0000
-+++ opencv-2.4.7/data/CMakeLists.txt	2013-11-12 20:31:54.923577113 +0000
-@@ -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 -baur opencv-2.4.7.orig/modules/java/CMakeLists.txt opencv-2.4.7/modules/java/CMakeLists.txt
---- opencv-2.4.7.orig/modules/java/CMakeLists.txt	2013-11-12 20:31:27.360429532 +0000
-+++ opencv-2.4.7/modules/java/CMakeLists.txt	2013-11-12 20:36:41.984985273 +0000
-@@ -279,7 +279,7 @@
-   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 main)
- endif(ANDROID)
-diff -baur 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-12 20:31:27.433762373 +0000
-+++ opencv-2.4.7/samples/c/CMakeLists.txt	2013-11-12 20:31:54.923577113 +0000
-@@ -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 -baur 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-12 20:31:27.417095818 +0000
-+++ opencv-2.4.7/samples/cpp/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
-@@ -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 -baur 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-12 20:31:27.407095885 +0000
-+++ opencv-2.4.7/samples/gpu/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
-@@ -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 -baur 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-12 20:31:27.407095885 +0000
-+++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
-@@ -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 -baur opencv-2.4.7.orig/samples/ocl/CMakeLists.txt opencv-2.4.7/samples/ocl/CMakeLists.txt
---- opencv-2.4.7.orig/samples/ocl/CMakeLists.txt	2013-11-12 20:31:27.397095952 +0000
-+++ opencv-2.4.7/samples/ocl/CMakeLists.txt	2013-11-12 20:39:29.227200043 +0000
-@@ -54,6 +54,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 --git a/extra/opencv/pkgconfig.patch b/extra/opencv/pkgconfig.patch
deleted file mode 100644
index 5626eb6e0..000000000
--- a/extra/opencv/pkgconfig.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -baur 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-12 20:31:27.253763202 +0000
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:41:48.936262732 +0000
-@@ -10,7 +10,7 @@
- # -------------------------------------------------------------------------------------------
- set(prefix      "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
-+set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
- set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
- 
- if(CMAKE_BUILD_TYPE MATCHES "Release")
-@@ -35,10 +35,11 @@
- ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
- 
- #build the list of components
--set(OpenCV_LIB_COMPONENTS_ "")
-+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
- foreach(CVLib ${OpenCV_LIB_COMPONENTS})
-   get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
-   get_filename_component(libname "${libpath}" NAME)
-+  get_filename_component(lname "${libpath}" NAME_WE)
- 
-   if(INSTALL_TO_MANGLED_PATHS)
-     set(libname "${libname}.${OPENCV_VERSION}")
-@@ -51,7 +52,8 @@
-     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
-   endif()
- 
--  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
-+  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
-+  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
- endforeach()
- 
- # add extra dependencies required for OpenCV