From 6a89e0c4c68ef22eab9dfa159af5295d5fb9fa04 Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sat, 18 Jan 2020 20:12:48 -0500 Subject: [PATCH] opencv: update to 4.2.0. --- common/shlibs | 35 ++++++++++++++++++----------------- srcpkgs/opencv/template | 11 +++++------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/common/shlibs b/common/shlibs index 889115c8112..e17fdb24b11 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1975,23 +1975,24 @@ libcapstone.so.4 capstone-4.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_ml.so.3.4 libopencv-3.4.1_1 -libopencv_objdetect.so.3.4 libopencv-3.4.1_1 -libopencv_dnn.so.3.4 libopencv-3.4.1_1 -libopencv_shape.so.3.4 libopencv-3.4.1_1 -libopencv_stitching.so.3.4 libopencv-3.4.1_1 -libopencv_photo.so.3.4 libopencv-3.4.1_1 -libopencv_video.so.3.4 libopencv-3.4.1_1 -libopencv_calib3d.so.3.4 libopencv-3.4.1_1 -libopencv_features2d.so.3.4 libopencv-3.4.1_1 -libopencv_flann.so.3.4 libopencv-3.4.1_1 -libopencv_highgui.so.3.4 libopencv-3.4.1_1 -libopencv_videoio.so.3.4 libopencv-3.4.1_1 -libopencv_imgcodecs.so.3.4 libopencv-3.4.1_1 -libopencv_imgproc.so.3.4 libopencv-3.4.1_1 -libopencv_core.so.3.4 libopencv-3.4.1_1 -libopencv_superres.so.3.4 libopencv-3.4.1_1 -libopencv_videostab.so.3.4 libopencv-3.4.1_1 +libopencv_ml.so.4.2 libopencv-4.2.0_1 +libopencv_objdetect.so.4.2 libopencv-4.2.0_1 +libopencv_dnn.so.4.2 libopencv-4.2.0_1 +libopencv_shape.so.4.2 libopencv-4.2.0_1 +libopencv_stitching.so.4.2 libopencv-4.2.0_1 +libopencv_photo.so.4.2 libopencv-4.2.0_1 +libopencv_video.so.4.2 libopencv-4.2.0_1 +libopencv_calib3d.so.4.2 libopencv-4.2.0_1 +libopencv_features2d.so.4.2 libopencv-4.2.0_1 +libopencv_flann.so.4.2 libopencv-4.2.0_1 +libopencv_highgui.so.4.2 libopencv-4.2.0_1 +libopencv_videoio.so.4.2 libopencv-4.2.0_1 +libopencv_imgcodecs.so.4.2 libopencv-4.2.0_1 +libopencv_imgproc.so.4.2 libopencv-4.2.0_1 +libopencv_core.so.4.2 libopencv-4.2.0_1 +libopencv_superres.so.4.2 libopencv-4.2.0_1 +libopencv_videostab.so.4.2 libopencv-4.2.0_1 +libopencv_gapi.so.4.2 libopencv-4.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 diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index fc6e169b413..ac8daeb6bc7 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv -version=3.4.8 -revision=3 +version=4.2.0 +revision=1 build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON @@ -12,11 +12,11 @@ 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" short_desc="Computer vision and machine learning software library" -maintainer="Orphaned " +maintainer="Hazel Levine " license="BSD-3-Clause" homepage="https://opencv.org" distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz" -checksum=f0901648a1db3dc3af30e65082665921dbe998673137380450bdd91e8251b567 +checksum=9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) makedepends+=" libatomic-devel";; @@ -38,9 +38,8 @@ libopencv-devel_package() { depends="libopencv>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/pkgconfig vmove usr/lib/*.so - vmove usr/share/OpenCV + vmove usr/share/opencv4 } }