Date: Tuesday, November 12, 2013 @ 22:42:45 Author: schiv Revision: 199448
upgpkg: opencv 2.4.7-1 upstream release Modified: opencv/trunk/PKGBUILD opencv/trunk/fsh.patch opencv/trunk/pkgconfig.patch Deleted: opencv/trunk/cldetect.patch -----------------+ PKGBUILD | 25 ++++-------- cldetect.patch | 23 ----------- fsh.patch | 111 +++++++++++++++++++++++++++++++++++------------------- pkgconfig.patch | 12 ++--- 4 files changed, 87 insertions(+), 84 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-12 20:29:19 UTC (rev 199447) +++ PKGBUILD 2013-11-12 21:42:45 UTC (rev 199448) @@ -4,9 +4,8 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') -_realname=OpenCV -pkgver=2.4.6.1 -pkgrel=3 +pkgver=2.4.7 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -20,12 +19,10 @@ 'python2-numpy: Python 2.x interface') source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' - 'fsh.patch' - 'cldetect.patch') -md5sums=('d756bfa460891697571d5c90050e1cfe' - 'cb916260b5ec594fe7a0cc2e54fc569f' - '35256e3ccace373feba8131d1540a0de' - '0dd6572405adc2387ded4c95be0f189c') + 'fsh.patch') +md5sums=('33a12a8bba6e6dc32c97298c99b083b2' + 'c7cea48ed7d4f729ebdb9673bac41bd3' + 'c597598d142dd34d0eb4af7d6e9779d8') _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' @@ -53,18 +50,14 @@ prepare() { cd "$srcdir/$pkgname-$pkgver" - # fix missing opencl module - # see https://bugs.archlinux.org/task/36076 - # and http://code.opencv.org/issues/3140 - patch -Np1 -i "$srcdir/cldetect.patch" - - # fix pkg-config mess + # hack-fix pkg-config mess # see https://bugs.archlinux.org/task/32430 # and http://code.opencv.org/issues/1925 patch -Np1 -i "$srcdir/pkgconfig.patch" - # fix another upstream mess that they won't fix + # hack-fix folder naming inconsistency that they won't fix # 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 Deleted: cldetect.patch =================================================================== --- cldetect.patch 2013-11-12 20:29:19 UTC (rev 199447) +++ cldetect.patch 2013-11-12 21:42:45 UTC (rev 199448) @@ -1,23 +0,0 @@ -diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake ---- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 18:57:27.363199736 +0000 -+++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 19:04:00.577069207 +0000 -@@ -17,8 +17,7 @@ - NAMES OpenCL/cl.h CL/cl.h - HINTS ${OPENCL_ROOT_DIR} - PATH_SUFFIXES include include/nvidia-current -- DOC "OpenCL include directory" -- NO_DEFAULT_PATH) -+ DOC "OpenCL include directory") - - if (X86_64) - set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) -@@ -30,8 +29,7 @@ - NAMES OpenCL - HINTS ${OPENCL_ROOT_DIR} - PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES} -- DOC "OpenCL library" -- NO_DEFAULT_PATH) -+ DOC "OpenCL library") - - mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) - include(FindPackageHandleStandardArgs) Modified: fsh.patch =================================================================== --- fsh.patch 2013-11-12 20:29:19 UTC (rev 199447) +++ fsh.patch 2013-11-12 21:42:45 UTC (rev 199448) @@ -1,7 +1,7 @@ -diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake ---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:42:32.460958392 +0000 -+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:52:43.766689315 +0000 -@@ -47,7 +47,7 @@ +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") @@ -10,10 +10,22 @@ else() set(installDir "${OPENCV_LIB_INSTALL_PATH}") endif() -diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt ---- OpenCV-2.4.3.orig/CMakeLists.txt 2012-11-05 18:42:32.700956757 +0000 -+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-05 18:55:42.358787848 +0000 -@@ -221,9 +221,9 @@ +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) @@ -24,16 +36,17 @@ + set(OPENCV_DOC_INSTALL_PATH share/doc/opencv) endif() - if(ANDROID) -@@ -237,14 +237,14 @@ - set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") - set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") - 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}) - set(OPENCV_INCLUDE_INSTALL_PATH include) + 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") - math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") +@@ -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() @@ -42,9 +55,9 @@ endif() endif() -diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.txt ---- OpenCV-2.4.3.orig/data/CMakeLists.txt 2012-11-05 18:42:32.460958392 +0000 -+++ OpenCV-2.4.3/data/CMakeLists.txt 2012-11-05 18:52:43.816688977 +0000 +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) @@ -54,10 +67,22 @@ + install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main) + install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main) endif() -diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/c/CMakeLists.txt 2012-11-05 18:42:32.697623446 +0000 -+++ OpenCV-2.4.3/samples/c/CMakeLists.txt 2012-11-05 18:52:43.826688906 +0000 -@@ -54,7 +54,7 @@ +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} @@ -65,11 +90,10 @@ + DESTINATION share/opencv/samples/c PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif () - -diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cpp/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt 2012-11-05 18:42:32.677623583 +0000 -+++ OpenCV-2.4.3/samples/cpp/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000 -@@ -64,7 +64,7 @@ +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} @@ -77,11 +101,10 @@ + DESTINATION share/opencv/samples/cpp PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() - -diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt 2012-11-05 18:42:32.670956962 +0000 -+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-05 18:52:43.820022288 +0000 -@@ -64,7 +64,7 @@ +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} @@ -89,11 +112,10 @@ + DESTINATION share/opencv/samples/${project} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() - -diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:42:32.674290272 +0000 -+++ OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000 -@@ -21,6 +21,6 @@ +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} @@ -101,3 +123,14 @@ + 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() Modified: pkgconfig.patch =================================================================== --- pkgconfig.patch 2013-11-12 20:29:19 UTC (rev 199447) +++ pkgconfig.patch 2013-11-12 21:42:45 UTC (rev 199448) @@ -1,6 +1,6 @@ -diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake ---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:14.243505926 +0000 -+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:42.286649120 +0000 +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}") @@ -8,9 +8,9 @@ -set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS +set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}") set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") - set(VERSION ${OPENCV_VERSION}) -@@ -36,10 +36,11 @@ + if(CMAKE_BUILD_TYPE MATCHES "Release") +@@ -35,10 +35,11 @@ ocv_list_reverse(OpenCV_EXTRA_COMPONENTS) #build the list of components @@ -23,7 +23,7 @@ if(INSTALL_TO_MANGLED_PATHS) set(libname "${libname}.${OPENCV_VERSION}") -@@ -52,7 +53,8 @@ +@@ -51,7 +52,8 @@ set(installDir "${OPENCV_LIB_INSTALL_PATH}") endif()