Merge pull request #2074 from thypon/opencv

opencv: update to 3.0.0.
This commit is contained in:
Andrea Brancaleoni 2015-07-22 15:46:42 +02:00
commit 2033c7b394
6 changed files with 61 additions and 44 deletions

View file

@ -1886,24 +1886,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.2.4 libopencv-2.4.10_1
libopencv_flann.so.2.4 libopencv-2.4.10_1
libopencv_features2d.so.2.4 libopencv-2.4.10_1
libopencv_ml.so.2.4 libopencv-2.4.10_1
libopencv_nonfree.so.2.4 libopencv-2.4.10_1
libopencv_highgui.so.2.4 libopencv-2.4.10_1
libopencv_imgproc.so.2.4 libopencv-2.4.10_1
libopencv_gpu.so.2.4 libopencv-2.4.10_1
libopencv_ocl.so.2.4 libopencv-2.4.10_1
libopencv_objdetect.so.2.4 libopencv-2.4.10_1
libopencv_superres.so.2.4 libopencv-2.4.10_1
libopencv_core.so.2.4 libopencv-2.4.10_1
libopencv_video.so.2.4 libopencv-2.4.10_1
libopencv_calib3d.so.2.4 libopencv-2.4.10_1
libopencv_contrib.so.2.4 libopencv-2.4.10_1
libopencv_stitching.so.2.4 libopencv-2.4.10_1
libopencv_photo.so.2.4 libopencv-2.4.10_1
libopencv_legacy.so.2.4 libopencv-2.4.10_1
libopencv_videostab.so.3.0 libopencv-3.0.0_1
libopencv_flann.so.3.0 libopencv-3.0.0_1
libopencv_features2d.so.3.0 libopencv-3.0.0_1
libopencv_ml.so.3.0 libopencv-3.0.0_1
libopencv_highgui.so.3.0 libopencv-3.0.0_1
libopencv_imgproc.so.3.0 libopencv-3.0.0_1
libopencv_objdetect.so.3.0 libopencv-3.0.0_1
libopencv_superres.so.3.0 libopencv-3.0.0_1
libopencv_core.so.3.0 libopencv-3.0.0_1
libopencv_video.so.3.0 libopencv-3.0.0_1
libopencv_calib3d.so.3.0 libopencv-3.0.0_1
libopencv_stitching.so.3.0 libopencv-3.0.0_1
libopencv_photo.so.3.0 libopencv-3.0.0_1
libopencv_imgcodecs.so.3.0 libopencv-3.0.0_1
libopencv_shape.so.3.0 libopencv-3.0.0_1
libopencv_videoio.so.3.0 libopencv-3.0.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,7 +1,7 @@
# Template file for 'nomacs-qt5'
pkgname=nomacs-qt5
revision=1
version=2.4.4
revision=2
_pkg=${pkgname//-qt5/}
wrksrc=${_pkg}-${version}
build_style=cmake

View file

@ -1,7 +1,7 @@
# Template file for 'nomacs'
pkgname=nomacs
revision=1
version=2.4.4
revision=2
build_style=cmake
hostmakedepends="cmake pkg-config"
makedepends="qt-devel exiv2-devel libraw-devel libopencv-devel libgomp-devel"

View file

@ -1,40 +1,59 @@
# Template file for 'opencv'
# vim: set ts=4 sw=4 sts=4 et:
# vim: set ts=4 sw=4 sts=4 noet:
pkgname=opencv
version=2.4.11
version=3.0.0
revision=1
build_style=cmake
configure_args="-Wno-dev"
hostmakedepends="cmake pkg-config python-devel eigen unzip python-numpy-devel"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
jasper-devel libopenexr-devel"
jasper-devel ocl-icd-devel libgomp-devel"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://opencv.org"
license="BSD"
short_desc="Computer vision and machine learning software library"
distfiles="${SOURCEFORGE_SITE}/opencvlibrary/opencv-unix/${version}/opencv-${version}.zip"
checksum=af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea
distfiles="https://github.com/Itseez/${pkgname}/archive/${version}.tar.gz"
checksum=da51a4e459b0bcbe14fb847c4f168415f421765fb91996f42b9e1ce0575f05d5
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -WITH_OPENCL=ON"
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" libopenexr-devel"
fi
case "$XBPS_TARGET_MACHINE" in
i686|x86_64)
makedepends+=" tbb-devel"
configure_args+=" -DWITH_TBB=ON"
esac
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
}
libopencv_package() {
short_desc+=" - library files"
pkg_install() {
vmove usr/lib/*.so.*
}
short_desc+=" - library files"
pkg_install() {
vmove usr/lib/*.so.*
}
}
libopencv-devel_package() {
short_desc+=" - development files"
depends="libopencv>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/share/OpenCV
}
short_desc+=" - development files"
depends="libopencv>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/share/OpenCV
}
}
libopencv-python_package(){
short_desc+=" - Python bindings"
pkg_install() {
vmove usr/lib/python2.7
}
short_desc+=" - Python bindings"
pkg_install() {
vmove usr/lib/python2.7
}
}

View file

@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=1.5.13
revision=4
revision=5
wrksrc=oiio-Release-${version}
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0"

View file

@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname="qtox"
version="20150325"
revision=2
revision=3
_commithash="41efb1491b52a1c857702c69ca70e95d9a7933ce"
short_desc="QT-based TOX instant messenger client"
maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"