From 658229b894315dfee6339a25cbccd08cf5ce20a6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 11 Aug 2022 23:47:59 -0400 Subject: [PATCH 1/4] opencv: update to 3.4.18. remove subpackage: libopencv-python - python 2, no revdeps. --- srcpkgs/opencv/template | 26 ++++++++------------------ srcpkgs/opencv/update | 1 + srcpkgs/removed-packages/template | 1 + 3 files changed, 10 insertions(+), 18 deletions(-) create mode 100644 srcpkgs/opencv/update diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 10c687200014..770f150c124c 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,23 +1,23 @@ # Template file for 'opencv' pkgname=opencv -version=3.4.15 +version=3.4.18 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 - -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}" -hostmakedepends="pkg-config eigen python-numpy python3-numpy" + -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}" +hostmakedepends="pkg-config eigen python3-numpy" 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 - python-numpy python3-numpy python-devel python3-devel" + python3-numpy python3-devel" short_desc="Computer vision and machine learning software library" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://opencv.org" -distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz" -checksum=b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7 +changelog="https://github.com/opencv/opencv/wiki/ChangeLog" +distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz" +checksum=d6a69aa4a775a074662685b9bc2b07b88fb867f19d939b03ad281571b62f2620 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -31,9 +31,7 @@ fi if [ "$CROSS_BUILD" ]; then # Tell opencv where to find python and numpy _npincdir="numpy/core/include" - configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc} - -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir} - -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} + configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}" fi @@ -64,14 +62,6 @@ libopencv-devel_package() { } } -libopencv-python_package() { - short_desc+=" - Python2 bindings" - depends="python-numpy" - pkg_install() { - vmove usr/lib/python2.7 - } -} - libopencv-python3_package() { short_desc+=" - Python3 bindings" depends="python3-numpy" diff --git a/srcpkgs/opencv/update b/srcpkgs/opencv/update new file mode 100644 index 000000000000..4156f1d58aec --- /dev/null +++ b/srcpkgs/opencv/update @@ -0,0 +1 @@ +ignore='4*' diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 0d1180ad4903..51e14e29461b 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -230,6 +230,7 @@ replaces=" libmagick6-devel<=6.9.12.12_2 libmagick6-perl<=6.9.12.12_2 libmagick6<=6.9.12.12_2 + libopencv-python<=3.4.15_1 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 From 3859bc782ac9722e9effc4d41e13e05df38cf9f1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 11 Aug 2022 23:51:09 -0400 Subject: [PATCH 2/4] opencv4: update to 4.6.0. remove subpackage: libopencv4-python - python 2, no revdeps --- common/shlibs | 104 +++++++++++++++--------------- srcpkgs/opencv4/template | 37 +++++------ srcpkgs/removed-packages/template | 1 + 3 files changed, 68 insertions(+), 74 deletions(-) diff --git a/common/shlibs b/common/shlibs index 61924610cc52..5d70eec3404c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2110,58 +2110,58 @@ 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_quality.so.4.5 libopencv4-4.5.3_1 -libopencv_reg.so.4.5 libopencv4-4.5.3_1 -libopencv_surface_matching.so.4.5 libopencv4-4.5.3_1 -libopencv_xphoto.so.4.5 libopencv4-4.5.3_1 -libopencv_freetype.so.4.5 libopencv4-4.5.3_1 -libopencv_fuzzy.so.4.5 libopencv4-4.5.3_1 -libopencv_hfs.so.4.5 libopencv4-4.5.3_1 -libopencv_img_hash.so.4.5 libopencv4-4.5.3_1 -libopencv_line_descriptor.so.4.5 libopencv4-4.5.3_1 -libopencv_saliency.so.4.5 libopencv4-4.5.3_1 -libopencv_structured_light.so.4.5 libopencv4-4.5.3_1 -libopencv_aruco.so.4.5 libopencv4-4.5.3_1 -libopencv_bgsegm.so.4.5 libopencv4-4.5.3_1 -libopencv_bioinspired.so.4.5 libopencv4-4.5.3_1 -libopencv_ccalib.so.4.5 libopencv4-4.5.3_1 -libopencv_face.so.4.5 libopencv4-4.5.3_1 -libopencv_tracking.so.4.5 libopencv4-4.5.3_1 -libopencv_xfeatures2d.so.4.5 libopencv4-4.5.3_1 -libopencv_optflow.so.4.5 libopencv4-4.5.3_1 -libopencv_ximgproc.so.4.5 libopencv4-4.5.3_1 -libopencv_plot.so.4.5 libopencv4-4.5.3_1 -libopencv_text.so.4.5 libopencv4-4.5.3_1 -libopencv_ml.so.4.5 libopencv4-4.5.3_1 -libopencv_objdetect.so.4.5 libopencv4-4.5.3_1 -libopencv_dnn.so.4.5 libopencv4-4.5.3_1 -libopencv_shape.so.4.5 libopencv4-4.5.3_1 -libopencv_stitching.so.4.5 libopencv4-4.5.3_1 -libopencv_photo.so.4.5 libopencv4-4.5.3_1 -libopencv_video.so.4.5 libopencv4-4.5.3_1 -libopencv_calib3d.so.4.5 libopencv4-4.5.3_1 -libopencv_features2d.so.4.5 libopencv4-4.5.3_1 -libopencv_flann.so.4.5 libopencv4-4.5.3_1 -libopencv_highgui.so.4.5 libopencv4-4.5.3_1 -libopencv_videoio.so.4.5 libopencv4-4.5.3_1 -libopencv_imgcodecs.so.4.5 libopencv4-4.5.3_1 -libopencv_imgproc.so.4.5 libopencv4-4.5.3_1 -libopencv_core.so.4.5 libopencv4-4.5.3_1 -libopencv_superres.so.4.5 libopencv4-4.5.3_1 -libopencv_videostab.so.4.5 libopencv4-4.5.3_1 -libopencv_gapi.so.4.5 libopencv4-4.5.3_1 -libopencv_xobjdetect.so.4.5 libopencv4-4.5.3_1 -libopencv_datasets.so.4.5 libopencv4-4.5.3_1 -libopencv_dnn_objdetect.so.4.5 libopencv4-4.5.3_1 -libopencv_dnn_superres.so.4.5 libopencv4-4.5.3_1 -libopencv_dpm.so.4.5 libopencv4-4.5.3_1 -libopencv_phase_unwrapping.so.4.5 libopencv4-4.5.3_1 -libopencv_stereo.so.4.5 libopencv4-4.5.3_1 -libopencv_rapid.so.4.5 libopencv4-4.5.3_1 -libopencv_intensity_transform.so.4.5 libopencv4-4.5.3_1 -libopencv_alphamat.so.4.5 libopencv4-4.5.3_1 -libopencv_barcode.so.4.5 libopencv4-4.5.3_1 -libopencv_mcc.so.4.5 libopencv4-4.5.3_1 +libopencv_quality.so.406 libopencv4-4.6.0_1 +libopencv_reg.so.406 libopencv4-4.6.0_1 +libopencv_surface_matching.so.406 libopencv4-4.6.0_1 +libopencv_xphoto.so.406 libopencv4-4.6.0_1 +libopencv_freetype.so.406 libopencv4-4.6.0_1 +libopencv_fuzzy.so.406 libopencv4-4.6.0_1 +libopencv_hfs.so.406 libopencv4-4.6.0_1 +libopencv_img_hash.so.406 libopencv4-4.6.0_1 +libopencv_line_descriptor.so.406 libopencv4-4.6.0_1 +libopencv_saliency.so.406 libopencv4-4.6.0_1 +libopencv_structured_light.so.406 libopencv4-4.6.0_1 +libopencv_aruco.so.406 libopencv4-4.6.0_1 +libopencv_bgsegm.so.406 libopencv4-4.6.0_1 +libopencv_bioinspired.so.406 libopencv4-4.6.0_1 +libopencv_ccalib.so.406 libopencv4-4.6.0_1 +libopencv_face.so.406 libopencv4-4.6.0_1 +libopencv_tracking.so.406 libopencv4-4.6.0_1 +libopencv_xfeatures2d.so.406 libopencv4-4.6.0_1 +libopencv_optflow.so.406 libopencv4-4.6.0_1 +libopencv_ximgproc.so.406 libopencv4-4.6.0_1 +libopencv_plot.so.406 libopencv4-4.6.0_1 +libopencv_text.so.406 libopencv4-4.6.0_1 +libopencv_ml.so.406 libopencv4-4.6.0_1 +libopencv_objdetect.so.406 libopencv4-4.6.0_1 +libopencv_dnn.so.406 libopencv4-4.6.0_1 +libopencv_shape.so.406 libopencv4-4.6.0_1 +libopencv_stitching.so.406 libopencv4-4.6.0_1 +libopencv_photo.so.406 libopencv4-4.6.0_1 +libopencv_video.so.406 libopencv4-4.6.0_1 +libopencv_calib3d.so.406 libopencv4-4.6.0_1 +libopencv_features2d.so.406 libopencv4-4.6.0_1 +libopencv_flann.so.406 libopencv4-4.6.0_1 +libopencv_highgui.so.406 libopencv4-4.6.0_1 +libopencv_videoio.so.406 libopencv4-4.6.0_1 +libopencv_imgcodecs.so.406 libopencv4-4.6.0_1 +libopencv_imgproc.so.406 libopencv4-4.6.0_1 +libopencv_core.so.406 libopencv4-4.6.0_1 +libopencv_superres.so.406 libopencv4-4.6.0_1 +libopencv_videostab.so.406 libopencv4-4.6.0_1 +libopencv_gapi.so.406 libopencv4-4.6.0_1 +libopencv_xobjdetect.so.406 libopencv4-4.6.0_1 +libopencv_datasets.so.406 libopencv4-4.6.0_1 +libopencv_dnn_objdetect.so.406 libopencv4-4.6.0_1 +libopencv_dnn_superres.so.406 libopencv4-4.6.0_1 +libopencv_dpm.so.406 libopencv4-4.6.0_1 +libopencv_phase_unwrapping.so.406 libopencv4-4.6.0_1 +libopencv_stereo.so.406 libopencv4-4.6.0_1 +libopencv_rapid.so.406 libopencv4-4.6.0_1 +libopencv_intensity_transform.so.406 libopencv4-4.6.0_1 +libopencv_alphamat.so.406 libopencv4-4.6.0_1 +libopencv_barcode.so.406 libopencv4-4.6.0_1 +libopencv_mcc.so.406 libopencv4-4.6.0_1 libuniconf.so.4.6 wvstreams-4.6.1_20 libwvbase.so.4.6 wvstreams-4.6.1_20 libwvutils.so.4.6 wvstreams-4.6.1_20 diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 595d8b2e22a9..43e550d73498 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -1,29 +1,33 @@ # Template file for 'opencv4' pkgname=opencv4 -version=4.5.3 -revision=2 -wrksrc=opencv-${version} +version=4.6.0 +revision=1 +create_wrksrc=yes +build_wrksrc=opencv-${version} build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DOPENCV_GENERATE_PKGCONFIG=YES -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib} - -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${version}/modules -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF" -hostmakedepends="pkg-config eigen python-numpy python3-numpy" +hostmakedepends="pkg-config eigen python3-numpy" 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 - python-numpy python3-numpy python-devel python3-devel" + python3-numpy python3-devel" short_desc="Computer vision and machine learning software library, version 4.x" maintainer="Hazel Levine " license="BSD-3-Clause" homepage="https://opencv.org" +changelog="https://github.com/opencv/opencv/wiki/ChangeLog" distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" -checksum="77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab - 73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc" +checksum="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 + 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7" +patch_args="-Np1 -d ${build_wrksrc}" +# tests hang indenfinitely, even with test data included +make_check=no if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -36,11 +40,8 @@ fi if [ "$CROSS_BUILD" ]; then # Tell opencv where to find python and numpy - _npincdir="numpy/core/include" - configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc} - -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir} - -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} - -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}" + configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} + -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" fi case "$XBPS_TARGET_MACHINE" in @@ -72,14 +73,6 @@ libopencv4-devel_package() { } } -libopencv4-python_package() { - short_desc+=" - Python2 bindings" - depends="python-numpy" - pkg_install() { - vmove ${py2_sitelib} - } -} - libopencv4-python3_package() { short_desc+=" - Python3 bindings" depends="python3-numpy" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 51e14e29461b..c58680e345dd 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -231,6 +231,7 @@ replaces=" libmagick6-perl<=6.9.12.12_2 libmagick6<=6.9.12.12_2 libopencv-python<=3.4.15_1 + libopencv4-python<=4.5.3_2 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 From c2199625d856eff482599ae8a02f6182e609d7e8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 12 Aug 2022 01:10:22 -0400 Subject: [PATCH 3/4] mlt7: rebuild for opencv4-4.6.0. --- srcpkgs/mlt7/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 5aefa500dd8a..f8352c2fc3f3 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -1,7 +1,7 @@ # Template file for 'mlt7' pkgname=mlt7 version=7.4.0 -revision=1 +revision=2 wrksrc="mlt-${version}" build_style=cmake configure_args="-DSWIG_PYTHON=ON" From 68ba9d987ecfa45213199b3347ebcc0a3f9806de Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 12 Aug 2022 01:10:23 -0400 Subject: [PATCH 4/4] opentoonz: rebuild for opencv4-4.6.0. --- srcpkgs/opentoonz/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template index 23bba3407e89..a5f8c500006f 100644 --- a/srcpkgs/opentoonz/template +++ b/srcpkgs/opentoonz/template @@ -1,7 +1,7 @@ # Template file for 'opentoonz' pkgname=opentoonz version=1.6.0 -revision=1 +revision=2 build_wrksrc="toonz/sources" build_style=cmake make_cmd=make