[arch-commits] Commit in opencv/trunk (PKGBUILD pkgconfig.patch)
Ray Rashif
schiv at archlinux.org
Sun Nov 4 17:25:03 UTC 2012
Date: Sunday, November 4, 2012 @ 12:25:03
Author: schiv
Revision: 170194
upgpkg: opencv 2.4.3-1
upstream release
fixed pkgconfig; closes FS#32430
removed SSE stuff from cmake config; they only change flags
outstanding bug FS#32342 remains unsolved
Added:
opencv/trunk/pkgconfig.patch
Modified:
opencv/trunk/PKGBUILD
-----------------+
PKGBUILD | 27 +++++++++++----------------
pkgconfig.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-11-04 17:20:28 UTC (rev 170193)
+++ PKGBUILD 2012-11-04 17:25:03 UTC (rev 170194)
@@ -5,33 +5,28 @@
pkgbase=opencv
pkgname=('opencv' 'opencv-docs' 'opencv-samples')
_realname=OpenCV
-pkgver=2.4.2
-pkgrel=5
+pkgver=2.4.3
+pkgrel=1
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
license=('BSD')
url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
- 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3')
+depends=('jasper' 'gstreamer0.10-base' 'gtk2'
+ 'xine-lib' 'libdc1394' 'openexr')
makedepends=('cmake' 'python2-numpy' 'eigen2')
optdepends=('opencv-docs'
'opencv-samples'
'eigen2'
'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2")
-md5sums=('059ef86fc1724d69b75832a0d2929ff5')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
+ 'pkgconfig.patch')
+md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
+ 'cb916260b5ec594fe7a0cc2e54fc569f')
_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
'-D CMAKE_INSTALL_PREFIX=/usr'
'-D CMAKE_SKIP_RPATH=ON'
'-D BUILD_TESTS=OFF'
- '-D ENABLE_SSE=ON'
- '-D ENABLE_SSE2=ON'
- '-D ENABLE_SSE3=OFF'
- '-D ENABLE_SSSE3=OFF'
- '-D ENABLE_SSE41=OFF'
- '-D ENABLE_SSE42=OFF'
'-D BUILD_EXAMPLES=ON'
'-D INSTALL_C_EXAMPLES=ON'
'-D INSTALL_PYTHON_EXAMPLES=ON'
@@ -49,9 +44,9 @@
build() {
cd "$srcdir/$_realname-$pkgver"
- # x64, i.e "Athlon64" and upwards, can use SSE3
- [ $CARCH = x86_64 ] && \
- _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
+ # fix pkg-config mess
+ # see https://bugs.archlinux.org/task/32430
+ patch -Np1 -i "$srcdir/pkgconfig.patch"
cmake ${_cmakeopts[@]} .
Added: pkgconfig.patch
===================================================================
--- pkgconfig.patch (rev 0)
+++ pkgconfig.patch 2012-11-04 17:25:03 UTC (rev 170194)
@@ -0,0 +1,35 @@
+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
+@@ -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}")
+ set(VERSION ${OPENCV_VERSION})
+
+@@ -36,10 +36,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}")
+@@ -52,7 +53,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
More information about the arch-commits
mailing list