[arch-commits] Commit in opencv/repos (6 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Fri Mar 11 06:55:31 UTC 2016
Date: Friday, March 11, 2016 @ 07:55:31
Author: bpiotrowski
Revision: 261318
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
opencv/repos/staging-i686/5852.patch
(from rev 261317, opencv/trunk/5852.patch)
opencv/repos/staging-i686/PKGBUILD
(from rev 261317, opencv/trunk/PKGBUILD)
opencv/repos/staging-x86_64/5852.patch
(from rev 261317, opencv/trunk/5852.patch)
opencv/repos/staging-x86_64/PKGBUILD
(from rev 261317, opencv/trunk/PKGBUILD)
Deleted:
opencv/repos/staging-i686/PKGBUILD
opencv/repos/staging-x86_64/PKGBUILD
---------------------------+
/PKGBUILD | 202 ++++++++++++++++++++++++++++++++++++++++++++
staging-i686/5852.patch | 39 ++++++++
staging-i686/PKGBUILD | 92 --------------------
staging-x86_64/5852.patch | 39 ++++++++
staging-x86_64/PKGBUILD | 92 --------------------
5 files changed, 280 insertions(+), 184 deletions(-)
Copied: opencv/repos/staging-i686/5852.patch (from rev 261317, opencv/trunk/5852.patch)
===================================================================
--- staging-i686/5852.patch (rev 0)
+++ staging-i686/5852.patch 2016-03-11 06:55:31 UTC (rev 261318)
@@ -0,0 +1,39 @@
+From 24dbb43c096691d0333cacf231e22f1369f8c826 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin at itseez.com>
+Date: Tue, 22 Dec 2015 17:10:33 +0300
+Subject: [PATCH] pkg-config: modules list contains only OpenCV modules (fixes
+ #5852)
+
+---
+ cmake/OpenCVUtils.cmake | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 3a23cd7..75412eb 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -806,7 +806,13 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
+ else()
+ set(deps "")
+ endif()
+- list(INSERT ${_modules} 0 ${deps} ${m})
++ set(_rev_deps "${deps};${m}")
++ ocv_list_reverse(_rev_deps)
++ foreach (dep ${_rev_deps})
++ if(DEFINED OPENCV_MODULE_${dep}_LOCATION)
++ list(INSERT ${_modules} 0 ${dep})
++ endif()
++ endforeach()
+ foreach (dep ${deps} ${OPENCV_LINKER_LIBS})
+ if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION)
+ if (TARGET ${dep})
+@@ -832,9 +838,6 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
+ endif()
+ endif()
+
+- # split 3rdparty libs and modules
+- list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list)
+-
+ ocv_list_filterout(${_modules} "^[\$]<")
+ ocv_list_filterout(${_3rdparty} "^[\$]<")
+ ocv_list_filterout(${_extra} "^[\$]<")
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2016-03-11 06:55:20 UTC (rev 261317)
+++ staging-i686/PKGBUILD 2016-03-11 06:55:31 UTC (rev 261318)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-samples')
-pkgver=3.1.0
-pkgrel=2
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
-optdepends=('opencv-samples'
- 'eigen'
- 'libcl: For coding with OpenCL'
- 'python-numpy: Python 3 interface'
- 'python2-numpy: Python 2 interface')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip"
- "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
-md5sums=('6082ee2124d4066581a7386972bfd52a'
- 'a822839ad3ab79ff837c16785ea9dd10')
-
-_cmakeopts=('-D WITH_OPENCL=ON'
- '-D WITH_OPENGL=ON'
- '-D WITH_TBB=ON'
- '-D WITH_XINE=ON'
- '-D WITH_GSTREAMER=OFF'
- '-D BUILD_WITH_DEBUG_INFO=OFF'
- '-D BUILD_TESTS=OFF'
- '-D BUILD_PERF_TESTS=OFF'
- '-D BUILD_EXAMPLES=ON'
- '-D INSTALL_C_EXAMPLES=ON'
- '-D INSTALL_PYTHON_EXAMPLES=ON'
- '-D CMAKE_BUILD_TYPE=Release'
- '-D CMAKE_INSTALL_PREFIX=/usr'
- '-D CMAKE_SKIP_RPATH=ON'
- '-D BUILD_NEW_PYTHON_SUPPORT=ON')
-
-# SSE only available from Pentium 3 onwards (i686 is way older)
-[[ "$CARCH" = 'i686' ]] && \
- _cmakeopts+=('-D ENABLE_SSE=OFF'
- '-D ENABLE_SSE2=OFF'
- '-D ENABLE_SSE3=OFF')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake ${_cmakeopts[@]} \
- -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
- .
-
- make
-}
-
-package_opencv() {
- options=('staticlibs')
-
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # install license file
- install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- cd "$pkgdir/usr/share"
-
- # separate samples package; also be -R friendly
- if [[ -d OpenCV/samples ]]; then
- mv OpenCV/samples "$srcdir/$pkgname-samples"
- mv OpenCV $pkgname # otherwise folder naming is inconsistent
- elif [[ ! -d OpenCV ]]; then
- warning "Directory naming issue; samples package may not be built!"
- fi
-}
-
-package_opencv-samples() {
- pkgdesc+=" (samples)"
- depends=("opencv=$pkgver") # sample codes change with lib/API
- unset optdepends
-
- mkdir -p "$pkgdir/usr/share/opencv"
- cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
-
- # install license file
- install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opencv/repos/staging-i686/PKGBUILD (from rev 261317, opencv/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-03-11 06:55:31 UTC (rev 261318)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-samples')
+pkgver=3.1.0
+pkgrel=3
+pkgdesc="Open Source Computer Vision Library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.org/"
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
+optdepends=('opencv-samples'
+ 'eigen'
+ 'libcl: For coding with OpenCL'
+ 'python-numpy: Python 3 interface'
+ 'python2-numpy: Python 2 interface')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip"
+ "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz"
+ '5852.patch')
+md5sums=('6082ee2124d4066581a7386972bfd52a'
+ 'a822839ad3ab79ff837c16785ea9dd10'
+ '5bd9cd736b171c15cedee3a32a0c47ff')
+
+_cmakeopts=('-D WITH_OPENCL=ON'
+ '-D WITH_OPENGL=ON'
+ '-D WITH_TBB=ON'
+ '-D WITH_XINE=ON'
+ '-D WITH_GSTREAMER=OFF'
+ '-D BUILD_WITH_DEBUG_INFO=OFF'
+ '-D BUILD_TESTS=OFF'
+ '-D BUILD_PERF_TESTS=OFF'
+ '-D BUILD_EXAMPLES=ON'
+ '-D INSTALL_C_EXAMPLES=ON'
+ '-D INSTALL_PYTHON_EXAMPLES=ON'
+ '-D CMAKE_BUILD_TYPE=Release'
+ '-D CMAKE_INSTALL_PREFIX=/usr'
+ '-D CMAKE_SKIP_RPATH=ON'
+ #'-D WITH_IPP=ON'
+ #'-D INSTALL_CREATE_DISTRIB=ON'
+ )
+
+# SSE only available from Pentium 3 onwards (i686 is way older)
+[[ "$CARCH" = 'i686' ]] && \
+ _cmakeopts+=('-D ENABLE_SSE=OFF'
+ '-D ENABLE_SSE2=OFF'
+ '-D ENABLE_SSE3=OFF')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/5852.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ cmake ${_cmakeopts[@]} \
+ -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+ .
+
+ make
+}
+
+package_opencv() {
+ options=('staticlibs')
+
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # install license file
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ cd "$pkgdir/usr/share"
+
+ # separate samples package; also be -R friendly
+ if [[ -d OpenCV/samples ]]; then
+ mv OpenCV/samples "$srcdir/$pkgname-samples"
+ mv OpenCV $pkgname # otherwise folder naming is inconsistent
+ elif [[ ! -d OpenCV ]]; then
+ warning "Directory naming issue; samples package may not be built!"
+ fi
+}
+
+package_opencv-samples() {
+ pkgdesc+=" (samples)"
+ depends=("opencv=$pkgver") # sample codes change with lib/API
+ unset optdepends
+
+ mkdir -p "$pkgdir/usr/share/opencv"
+ cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
+
+ # install license file
+ install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: opencv/repos/staging-x86_64/5852.patch (from rev 261317, opencv/trunk/5852.patch)
===================================================================
--- staging-x86_64/5852.patch (rev 0)
+++ staging-x86_64/5852.patch 2016-03-11 06:55:31 UTC (rev 261318)
@@ -0,0 +1,39 @@
+From 24dbb43c096691d0333cacf231e22f1369f8c826 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin at itseez.com>
+Date: Tue, 22 Dec 2015 17:10:33 +0300
+Subject: [PATCH] pkg-config: modules list contains only OpenCV modules (fixes
+ #5852)
+
+---
+ cmake/OpenCVUtils.cmake | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 3a23cd7..75412eb 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -806,7 +806,13 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
+ else()
+ set(deps "")
+ endif()
+- list(INSERT ${_modules} 0 ${deps} ${m})
++ set(_rev_deps "${deps};${m}")
++ ocv_list_reverse(_rev_deps)
++ foreach (dep ${_rev_deps})
++ if(DEFINED OPENCV_MODULE_${dep}_LOCATION)
++ list(INSERT ${_modules} 0 ${dep})
++ endif()
++ endforeach()
+ foreach (dep ${deps} ${OPENCV_LINKER_LIBS})
+ if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION)
+ if (TARGET ${dep})
+@@ -832,9 +838,6 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
+ endif()
+ endif()
+
+- # split 3rdparty libs and modules
+- list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list)
+-
+ ocv_list_filterout(${_modules} "^[\$]<")
+ ocv_list_filterout(${_3rdparty} "^[\$]<")
+ ocv_list_filterout(${_extra} "^[\$]<")
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2016-03-11 06:55:20 UTC (rev 261317)
+++ staging-x86_64/PKGBUILD 2016-03-11 06:55:31 UTC (rev 261318)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-samples')
-pkgver=3.1.0
-pkgrel=2
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
-optdepends=('opencv-samples'
- 'eigen'
- 'libcl: For coding with OpenCL'
- 'python-numpy: Python 3 interface'
- 'python2-numpy: Python 2 interface')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip"
- "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz")
-md5sums=('6082ee2124d4066581a7386972bfd52a'
- 'a822839ad3ab79ff837c16785ea9dd10')
-
-_cmakeopts=('-D WITH_OPENCL=ON'
- '-D WITH_OPENGL=ON'
- '-D WITH_TBB=ON'
- '-D WITH_XINE=ON'
- '-D WITH_GSTREAMER=OFF'
- '-D BUILD_WITH_DEBUG_INFO=OFF'
- '-D BUILD_TESTS=OFF'
- '-D BUILD_PERF_TESTS=OFF'
- '-D BUILD_EXAMPLES=ON'
- '-D INSTALL_C_EXAMPLES=ON'
- '-D INSTALL_PYTHON_EXAMPLES=ON'
- '-D CMAKE_BUILD_TYPE=Release'
- '-D CMAKE_INSTALL_PREFIX=/usr'
- '-D CMAKE_SKIP_RPATH=ON'
- '-D BUILD_NEW_PYTHON_SUPPORT=ON')
-
-# SSE only available from Pentium 3 onwards (i686 is way older)
-[[ "$CARCH" = 'i686' ]] && \
- _cmakeopts+=('-D ENABLE_SSE=OFF'
- '-D ENABLE_SSE2=OFF'
- '-D ENABLE_SSE3=OFF')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake ${_cmakeopts[@]} \
- -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
- .
-
- make
-}
-
-package_opencv() {
- options=('staticlibs')
-
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # install license file
- install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- cd "$pkgdir/usr/share"
-
- # separate samples package; also be -R friendly
- if [[ -d OpenCV/samples ]]; then
- mv OpenCV/samples "$srcdir/$pkgname-samples"
- mv OpenCV $pkgname # otherwise folder naming is inconsistent
- elif [[ ! -d OpenCV ]]; then
- warning "Directory naming issue; samples package may not be built!"
- fi
-}
-
-package_opencv-samples() {
- pkgdesc+=" (samples)"
- depends=("opencv=$pkgver") # sample codes change with lib/API
- unset optdepends
-
- mkdir -p "$pkgdir/usr/share/opencv"
- cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
-
- # install license file
- install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opencv/repos/staging-x86_64/PKGBUILD (from rev 261317, opencv/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-03-11 06:55:31 UTC (rev 261318)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-samples')
+pkgver=3.1.0
+pkgrel=3
+pkgdesc="Open Source Computer Vision Library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.org/"
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen')
+optdepends=('opencv-samples'
+ 'eigen'
+ 'libcl: For coding with OpenCL'
+ 'python-numpy: Python 3 interface'
+ 'python2-numpy: Python 2 interface')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/Itseez/opencv/archive/$pkgver.zip"
+ "opencv_contrib-$pkgver.tar.gz::https://github.com/Itseez/opencv_contrib/archive/$pkgver.tar.gz"
+ '5852.patch')
+md5sums=('6082ee2124d4066581a7386972bfd52a'
+ 'a822839ad3ab79ff837c16785ea9dd10'
+ '5bd9cd736b171c15cedee3a32a0c47ff')
+
+_cmakeopts=('-D WITH_OPENCL=ON'
+ '-D WITH_OPENGL=ON'
+ '-D WITH_TBB=ON'
+ '-D WITH_XINE=ON'
+ '-D WITH_GSTREAMER=OFF'
+ '-D BUILD_WITH_DEBUG_INFO=OFF'
+ '-D BUILD_TESTS=OFF'
+ '-D BUILD_PERF_TESTS=OFF'
+ '-D BUILD_EXAMPLES=ON'
+ '-D INSTALL_C_EXAMPLES=ON'
+ '-D INSTALL_PYTHON_EXAMPLES=ON'
+ '-D CMAKE_BUILD_TYPE=Release'
+ '-D CMAKE_INSTALL_PREFIX=/usr'
+ '-D CMAKE_SKIP_RPATH=ON'
+ #'-D WITH_IPP=ON'
+ #'-D INSTALL_CREATE_DISTRIB=ON'
+ )
+
+# SSE only available from Pentium 3 onwards (i686 is way older)
+[[ "$CARCH" = 'i686' ]] && \
+ _cmakeopts+=('-D ENABLE_SSE=OFF'
+ '-D ENABLE_SSE2=OFF'
+ '-D ENABLE_SSE3=OFF')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/5852.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ cmake ${_cmakeopts[@]} \
+ -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+ .
+
+ make
+}
+
+package_opencv() {
+ options=('staticlibs')
+
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # install license file
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ cd "$pkgdir/usr/share"
+
+ # separate samples package; also be -R friendly
+ if [[ -d OpenCV/samples ]]; then
+ mv OpenCV/samples "$srcdir/$pkgname-samples"
+ mv OpenCV $pkgname # otherwise folder naming is inconsistent
+ elif [[ ! -d OpenCV ]]; then
+ warning "Directory naming issue; samples package may not be built!"
+ fi
+}
+
+package_opencv-samples() {
+ pkgdesc+=" (samples)"
+ depends=("opencv=$pkgver") # sample codes change with lib/API
+ unset optdepends
+
+ mkdir -p "$pkgdir/usr/share/opencv"
+ cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
+
+ # install license file
+ install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list