opencv: update to 3.2.0. (soname bump)

This commit is contained in:
Michael Gehring 2016-12-30 18:05:33 +00:00
parent fbcc7dff59
commit 459ad973da
3 changed files with 19 additions and 59 deletions

View file

@ -1947,22 +1947,22 @@ libcapstone.so.3 capstone-3.0_1
libhavege.so.1 libhaveged-1.9.1_1
libnih.so.1 libnih-1.0.3_1
libnih-dbus.so.1 libnih-1.0.3_1
libopencv_videostab.so.3.1 libopencv-3.1.0_1
libopencv_flann.so.3.1 libopencv-3.1.0_1
libopencv_features2d.so.3.1 libopencv-3.1.0_1
libopencv_ml.so.3.1 libopencv-3.1.0_1
libopencv_highgui.so.3.1 libopencv-3.1.0_1
libopencv_imgproc.so.3.1 libopencv-3.1.0_1
libopencv_objdetect.so.3.1 libopencv-3.1.0_1
libopencv_superres.so.3.1 libopencv-3.1.0_1
libopencv_core.so.3.1 libopencv-3.1.0_1
libopencv_video.so.3.1 libopencv-3.1.0_1
libopencv_calib3d.so.3.1 libopencv-3.1.0_1
libopencv_stitching.so.3.1 libopencv-3.1.0_1
libopencv_photo.so.3.1 libopencv-3.1.0_1
libopencv_imgcodecs.so.3.1 libopencv-3.1.0_1
libopencv_shape.so.3.1 libopencv-3.1.0_1
libopencv_videoio.so.3.1 libopencv-3.1.0_1
libopencv_videostab.so.3.2 libopencv-3.2.0_1
libopencv_flann.so.3.2 libopencv-3.2.0_1
libopencv_features2d.so.3.2 libopencv-3.2.0_1
libopencv_ml.so.3.2 libopencv-3.2.0_1
libopencv_highgui.so.3.2 libopencv-3.2.0_1
libopencv_imgproc.so.3.2 libopencv-3.2.0_1
libopencv_objdetect.so.3.2 libopencv-3.2.0_1
libopencv_superres.so.3.2 libopencv-3.2.0_1
libopencv_core.so.3.2 libopencv-3.2.0_1
libopencv_video.so.3.2 libopencv-3.2.0_1
libopencv_calib3d.so.3.2 libopencv-3.2.0_1
libopencv_stitching.so.3.2 libopencv-3.2.0_1
libopencv_photo.so.3.2 libopencv-3.2.0_1
libopencv_imgcodecs.so.3.2 libopencv-3.2.0_1
libopencv_shape.so.3.2 libopencv-3.2.0_1
libopencv_videoio.so.3.2 libopencv-3.2.0_1
libcgmanager.so.0 libcgmanager-0.33_1
libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1

View file

@ -1,39 +0,0 @@
From 24dbb43c096691d0333cacf231e22f1369f8c826 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@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
--- cmake/OpenCVUtils.cmake
+++ 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} "^[\$]<")

View file

@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.1.0
revision=3
version=3.2.0
revision=1
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -WITH_OPENCL=ON"
hostmakedepends="pkg-config python-devel eigen"
@ -13,7 +13,7 @@ homepage="http://opencv.org"
license="BSD"
short_desc="Computer vision and machine learning software library"
distfiles="https://github.com/Itseez/${pkgname}/archive/${version}.tar.gz"
checksum=f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf
checksum=b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35
nocross=yes
pre_configure() {
@ -40,7 +40,6 @@ libopencv-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/share/OpenCV
}