moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

opencv: update to 3.3.0 (soname bump)

Browse source
This commit is contained in:
Julien Dehos 2017-08-12 17:24:43 +02:00 • committed by Michael Gehring
parent a4b385a0c9
commit cdb709cba2
3 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common/shlibs
View file

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

1
srcpkgs/libopencv-python3/template Symbolic link
View file

@ -0,0 +1 @@
../opencv/template

52
srcpkgs/opencv/template
View file

@ -1,27 +1,20 @@
# Template file for 'opencv' # Template file for 'opencv'
pkgname=opencv pkgname=opencv
version=3.2.0 version=3.3.0
revision=3 revision=1
build_style=cmake build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -WITH_OPENCL=ON" configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
hostmakedepends="pkg-config python-devel eigen" -DWITH_OPENCL=ON -DENABLE_CXX11=ON"
makedepends="python-numpy ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel hostmakedepends="pkg-config eigen"
jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+-devel gtk+3-devel makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel" libgphoto2-devel gst-plugins-base1-devel openblas-devel"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://opencv.org" homepage="http://opencv.org"
license="BSD" license="BSD"
short_desc="Computer vision and machine learning software library" short_desc="Computer vision and machine learning software library"
distfiles="https://github.com/Itseez/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
checksum=b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 checksum=95029eb5578af3b20b8c7f8f6f59db1b827c2d5aaaa74b6becb1de647cbdda5a
nocross=yes
pre_configure() {
case "$XBPS_TARGET_MACHINE" in
*-musl)
sed -i 's|PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP|PTHREAD_MUTEX_INITIALIZER|g' modules/core/src/parallel_pthreads.cpp;;
esac
}
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE
@ -45,9 +38,26 @@ libopencv-devel_package() {
} }
} }
libopencv-python_package() { if [ -z "$CROSS_BUILD" ]; then
short_desc+=" - Python bindings" # because python-numpy cannot be cross compiled
pkg_install() {
vmove usr/lib/python2.7 hostmakedepends+=" python-devel python3-devel"
makedepends+=" python-numpy python3-numpy"
libopencv-python_package() {
short_desc+=" - Python bindings"
pkg_install() {
mkdir -p ${DESTDIR}/usr/lib/python2.7
vmove usr/lib/python2.7
}
} }
}
libopencv-python3_package() {
short_desc+=" - Python3 bindings"
pkg_install() {
mkdir -p ${DESTDIR}/usr/lib/python3.5
vmove usr/lib/python3.5
}
}
fi