From 13a43ec8e067b099406a80ddabdec0f8813fee09 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 11 Aug 2022 23:47:59 -0400 Subject: [PATCH 01/12] opencv: update to 4.6.0. remove subpackage: libopencv-python - python 2, no revdeps. --- common/shlibs | 69 +++++++++++++++++++++++-------- srcpkgs/libopencv-python | 1 - srcpkgs/opencv/template | 48 ++++++++++----------- srcpkgs/removed-packages/template | 1 + 4 files changed, 75 insertions(+), 44 deletions(-) delete mode 120000 srcpkgs/libopencv-python diff --git a/common/shlibs b/common/shlibs index 2e5258f3a243..6f1d32fe8fe6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2093,23 +2093,6 @@ libcapstone.so.4 capstone-4.0_1 libhavege.so.2 libhaveged-1.9.11_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_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 @@ -2162,6 +2145,58 @@ 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 libopencv-4.6.0_1 +libopencv_reg.so.406 libopencv-4.6.0_1 +libopencv_surface_matching.so.406 libopencv-4.6.0_1 +libopencv_xphoto.so.406 libopencv-4.6.0_1 +libopencv_freetype.so.406 libopencv-4.6.0_1 +libopencv_fuzzy.so.406 libopencv-4.6.0_1 +libopencv_hfs.so.406 libopencv-4.6.0_1 +libopencv_img_hash.so.406 libopencv-4.6.0_1 +libopencv_line_descriptor.so.406 libopencv-4.6.0_1 +libopencv_saliency.so.406 libopencv-4.6.0_1 +libopencv_structured_light.so.406 libopencv-4.6.0_1 +libopencv_aruco.so.406 libopencv-4.6.0_1 +libopencv_bgsegm.so.406 libopencv-4.6.0_1 +libopencv_bioinspired.so.406 libopencv-4.6.0_1 +libopencv_ccalib.so.406 libopencv-4.6.0_1 +libopencv_face.so.406 libopencv-4.6.0_1 +libopencv_tracking.so.406 libopencv-4.6.0_1 +libopencv_xfeatures2d.so.406 libopencv-4.6.0_1 +libopencv_optflow.so.406 libopencv-4.6.0_1 +libopencv_ximgproc.so.406 libopencv-4.6.0_1 +libopencv_plot.so.406 libopencv-4.6.0_1 +libopencv_text.so.406 libopencv-4.6.0_1 +libopencv_ml.so.406 libopencv-4.6.0_1 +libopencv_objdetect.so.406 libopencv-4.6.0_1 +libopencv_dnn.so.406 libopencv-4.6.0_1 +libopencv_shape.so.406 libopencv-4.6.0_1 +libopencv_stitching.so.406 libopencv-4.6.0_1 +libopencv_photo.so.406 libopencv-4.6.0_1 +libopencv_video.so.406 libopencv-4.6.0_1 +libopencv_calib3d.so.406 libopencv-4.6.0_1 +libopencv_features2d.so.406 libopencv-4.6.0_1 +libopencv_flann.so.406 libopencv-4.6.0_1 +libopencv_highgui.so.406 libopencv-4.6.0_1 +libopencv_videoio.so.406 libopencv-4.6.0_1 +libopencv_imgcodecs.so.406 libopencv-4.6.0_1 +libopencv_imgproc.so.406 libopencv-4.6.0_1 +libopencv_core.so.406 libopencv-4.6.0_1 +libopencv_superres.so.406 libopencv-4.6.0_1 +libopencv_videostab.so.406 libopencv-4.6.0_1 +libopencv_gapi.so.406 libopencv-4.6.0_1 +libopencv_xobjdetect.so.406 libopencv-4.6.0_1 +libopencv_datasets.so.406 libopencv-4.6.0_1 +libopencv_dnn_objdetect.so.406 libopencv-4.6.0_1 +libopencv_dnn_superres.so.406 libopencv-4.6.0_1 +libopencv_dpm.so.406 libopencv-4.6.0_1 +libopencv_phase_unwrapping.so.406 libopencv-4.6.0_1 +libopencv_stereo.so.406 libopencv-4.6.0_1 +libopencv_rapid.so.406 libopencv-4.6.0_1 +libopencv_intensity_transform.so.406 libopencv-4.6.0_1 +libopencv_alphamat.so.406 libopencv-4.6.0_1 +libopencv_barcode.so.406 libopencv-4.6.0_1 +libopencv_mcc.so.406 libopencv-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/libopencv-python b/srcpkgs/libopencv-python deleted file mode 120000 index f5341cf36786..000000000000 --- a/srcpkgs/libopencv-python +++ /dev/null @@ -1 +0,0 @@ -opencv \ No newline at end of file diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 10c687200014..d6a810e0d3a2 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,40 +1,43 @@ # Template file for 'opencv' pkgname=opencv -version=3.4.15 +version=4.6.0 revision=1 +create_wrksrc=yes +build_wrksrc=${pkgname}-${version} 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_GENERATE_PKGCONFIG=YES -DWITH_EIGEN=ON + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${version}/modules + -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF + -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF" +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 + https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" +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" fi -if [ -z "$XBPS_CHECK_PKGS" ]; then - # opencv by default builds tests that only seem to be used in make check - configure_args+=" -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF" -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 @@ -58,17 +61,10 @@ libopencv-devel_package() { depends="libopencv>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove usr/lib/*.so - vmove usr/share/OpenCV - } -} - -libopencv-python_package() { - short_desc+=" - Python2 bindings" - depends="python-numpy" - pkg_install() { - vmove usr/lib/python2.7 + vmove usr/share/opencv4 } } @@ -76,6 +72,6 @@ libopencv-python3_package() { short_desc+=" - Python3 bindings" depends="python3-numpy" pkg_install() { - vmove usr/lib/python3* + vmove ${py3_sitelib} } } diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 272d240a429d..1a9dfcf70031 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -235,6 +235,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 7ed2c5a7654940a96fc640e9e2845a92ba2cbcb2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 11 Aug 2022 23:51:09 -0400 Subject: [PATCH 02/12] opencv4: remove package. no longer needed, merged into opencv template --- common/shlibs | 52 ----------- srcpkgs/libopencv4 | 2 +- srcpkgs/libopencv4-devel | 2 +- srcpkgs/libopencv4-python | 1 - srcpkgs/libopencv4-python3 | 2 +- srcpkgs/opencv/template | 24 +++++ srcpkgs/opencv4 | 1 + .../patches/undef-altivec-macros-cpp.patch | 16 ---- srcpkgs/opencv4/template | 89 ------------------- srcpkgs/removed-packages/template | 1 + 10 files changed, 29 insertions(+), 161 deletions(-) delete mode 120000 srcpkgs/libopencv4-python create mode 120000 srcpkgs/opencv4 delete mode 100644 srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch delete mode 100644 srcpkgs/opencv4/template diff --git a/common/shlibs b/common/shlibs index 6f1d32fe8fe6..b18b9e974e18 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2093,58 +2093,6 @@ libcapstone.so.4 capstone-4.0_1 libhavege.so.2 libhaveged-1.9.11_1 libnih.so.1 libnih-1.0.3_1 libnih-dbus.so.1 libnih-1.0.3_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 libopencv-4.6.0_1 libopencv_reg.so.406 libopencv-4.6.0_1 libopencv_surface_matching.so.406 libopencv-4.6.0_1 diff --git a/srcpkgs/libopencv4 b/srcpkgs/libopencv4 index 84ec4806fc8d..f5341cf36786 120000 --- a/srcpkgs/libopencv4 +++ b/srcpkgs/libopencv4 @@ -1 +1 @@ -opencv4 \ No newline at end of file +opencv \ No newline at end of file diff --git a/srcpkgs/libopencv4-devel b/srcpkgs/libopencv4-devel index 84ec4806fc8d..f5341cf36786 120000 --- a/srcpkgs/libopencv4-devel +++ b/srcpkgs/libopencv4-devel @@ -1 +1 @@ -opencv4 \ No newline at end of file +opencv \ No newline at end of file diff --git a/srcpkgs/libopencv4-python b/srcpkgs/libopencv4-python deleted file mode 120000 index 84ec4806fc8d..000000000000 --- a/srcpkgs/libopencv4-python +++ /dev/null @@ -1 +0,0 @@ -opencv4 \ No newline at end of file diff --git a/srcpkgs/libopencv4-python3 b/srcpkgs/libopencv4-python3 index 84ec4806fc8d..f5341cf36786 120000 --- a/srcpkgs/libopencv4-python3 +++ b/srcpkgs/libopencv4-python3 @@ -1 +1 @@ -opencv4 \ No newline at end of file +opencv \ No newline at end of file diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index d6a810e0d3a2..a46cf9d79a78 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -75,3 +75,27 @@ libopencv-python3_package() { vmove ${py3_sitelib} } } + +opencv4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} + +libopencv4_package() { + depends="lib${sourcepkg}>=${version}_${revision}" + short_desc+=" - library files (transitional dummy package)" + build_style=meta +} + +libopencv4-devel_package() { + depends="lib${sourcepkg}-devel>=${version}_${revision}" + short_desc+=" - development files (transitional dummy package)" + build_style=meta +} + +libopencv4-python3_package() { + depends="lib${sourcepkg}-python3>=${version}_${revision}" + short_desc+=" - Python3 bindings (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/opencv4 b/srcpkgs/opencv4 new file mode 120000 index 000000000000..f5341cf36786 --- /dev/null +++ b/srcpkgs/opencv4 @@ -0,0 +1 @@ +opencv \ No newline at end of file diff --git a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch b/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch deleted file mode 100644 index 83460ce56fb6..000000000000 --- a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch +++ /dev/null @@ -1,16 +0,0 @@ -This is necessary because otherwise conflicts are introduced in C++ code that -includes this. The header itself does not rely on the macros. The issue is not -visible on little endian because they undef the macros somewhere else. - ---- a/3rdparty/include/opencl/1.2/CL/cl_platform.h -+++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h -@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum; - /* Define basic vector types */ - #if defined( __VEC__ ) - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -+ #undef vector -+ #undef pixel -+ #undef bool - typedef __vector unsigned char __cl_uchar16; - typedef __vector signed char __cl_char16; - typedef __vector unsigned short __cl_ushort8; diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template deleted file mode 100644 index 595d8b2e22a9..000000000000 --- a/srcpkgs/opencv4/template +++ /dev/null @@ -1,89 +0,0 @@ -# Template file for 'opencv4' -pkgname=opencv4 -version=4.5.3 -revision=2 -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 - -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF" -hostmakedepends="pkg-config eigen python-numpy 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" -short_desc="Computer vision and machine learning software library, version 4.x" -maintainer="Hazel Levine " -license="BSD-3-Clause" -homepage="https://opencv.org" -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" - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - -if [ -z "$XBPS_CHECK_PKGS" ]; then - # opencv by default builds tests that only seem to be used in make check - configure_args+=" -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF" -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}" -fi - -case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*) broken="grfmt_jpeg2000.cpp:380:48: error: lvalue required as unary '&' operand";; -esac - -post_install() { - vlicense LICENSE -} - -libopencv4_package() { - short_desc+=" - library files" - pkg_install() { - vmove usr/lib/*.so.* - } -} - -libopencv4-devel_package() { - short_desc+=" - development files" - depends="libopencv4>=${version}_${revision}" - conflicts="libopencv-devel>=0" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - vmove usr/share/opencv4 - } -} - -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" - pkg_install() { - vmove ${py3_sitelib} - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 1a9dfcf70031..d329179d1d96 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -236,6 +236,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 c5b584d2a051d681d909029d78950cec863d437d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:23:43 -0400 Subject: [PATCH 03/12] actiona: rebuild for opencv-4.6.0 --- srcpkgs/actiona/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template index 6ce3ccdc6b41..cf5f0b7a2ae6 100644 --- a/srcpkgs/actiona/template +++ b/srcpkgs/actiona/template @@ -1,8 +1,9 @@ # Template file for 'actiona' pkgname=actiona version=3.10.1 -revision=1 +revision=2 build_style=qmake +configure_args="PKGCONFIG_OPENCV=opencv4" hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools" makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel qt5-multimedia-devel qt5-script-devel qt5-speech-devel qt5-tools-devel @@ -12,10 +13,9 @@ short_desc="Cross platform automation tool" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://actiona.tools/" -distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +distfiles="https://github.com/Jmgr/actiona/archive/v${version}.tar.gz" checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea post_build() { lrelease-qt5 locale/*.ts } - From d24c5e8b7244f395f186036d93af954dd8fb8964 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:28:09 -0400 Subject: [PATCH 04/12] digikam: rebuild for opencv-4.6.0 --- srcpkgs/digikam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 1a08760e0f56..169a101e5cf4 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam version=7.7.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt5-qmake From 4959677f8e9e31ba92560d974a5314320b9bc024 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:37:55 -0400 Subject: [PATCH 05/12] gmic: rebuild for opencv-4.6.0 --- srcpkgs/gmic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index b9871e7bbe7c..f08da26fd824 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,7 +1,7 @@ # Template file for 'gmic' pkgname=gmic version=2.9.9 -revision=2 +revision=3 _zart_hash=939cf381c5871e506aabd066037acf2b55143c1d build_wrksrc="src" build_style=gnu-makefile From 80f954b5fd99f2e7694c6cb05494fbbe585a2604 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:40:01 -0400 Subject: [PATCH 06/12] mlt7: rebuild for opencv-4.6.0 --- srcpkgs/mlt7/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 5aefa500dd8a..15c426838648 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" @@ -35,7 +35,7 @@ esac if [ "$_have_opencv" = "yes" ]; then configure_args+=" -DMOD_OPENCV=ON" - makedepends+=" libopencv4-devel" + makedepends+=" libopencv-devel" fi post_install() { From b9eabbd0cf26cf9689e613acfac33d4ba81c7042 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:41:06 -0400 Subject: [PATCH 07/12] nomacs: rebuild for opencv-4.6.0, fix homepage --- srcpkgs/nomacs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 0c38e2737bac..895e83071a8a 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,7 +1,7 @@ # Template file for 'nomacs' pkgname=nomacs version=3.16.224 -revision=2 +revision=3 build_wrksrc=ImageLounge build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_TRANSLATIONS=1 @@ -12,6 +12,6 @@ makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel short_desc="Simple yet powerful Qt imageviewer" maintainer="Kharlamov Alexey " license="GPL-3.0-or-later" -homepage="https://nomacs.org/" +homepage="https://github.com/nomacs/nomacs" distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz" checksum=bbc7e9048026ef9e0d2b64902c88050f17a679ef3d3c009de2c3b7de5d1d217c From d6ef8b55277f5ef3a8c41eb5008221f2acfcceb5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:49:12 -0400 Subject: [PATCH 08/12] opentoonz: rebuild for opencv-4.6.0 --- srcpkgs/opentoonz/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template index 23bba3407e89..0452c1e68d09 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 @@ -9,7 +9,7 @@ hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool" makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel libusb-devel SDL2-devel libmypaint-devel boost-devel libfreeglut-devel - openblas-devel qt5-serialport-devel libopencv4-devel" + openblas-devel qt5-serialport-devel libopencv-devel" short_desc="Full-featured 2D animation creation software" maintainer="bra1nwave " license="BSD-3-Clause" From 7044e3d56ba1addff8c613d2db6b0ca304870442 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:56:06 -0400 Subject: [PATCH 09/12] retroshare: rebuild for opencv-4.6.0 --- srcpkgs/retroshare/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 8a72be9ca3fa..13fe19f4d9fd 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.6 -revision=1 +revision=2 wrksrc="RetroShare-${version}" build_style=qmake #XXX broadcast feature requires an ancient udp-discovery-cpp which either needs From 59a14a7b877d2de9812af4c2848d19d7264f221a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:57:27 -0400 Subject: [PATCH 10/12] siril: rebuild for opencv-4.6.0 --- srcpkgs/siril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 1a3c7c761e9d..0a9e150a80a3 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,7 +1,7 @@ # Template file for 'siril' pkgname=siril version=0.9.12 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel From 6287db2f3e95c27658335ccf6a16d2ab53936de1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:58:26 -0400 Subject: [PATCH 11/12] waifu2x-converter-cpp: rebuild for opencv-4.6.0 --- srcpkgs/waifu2x-converter-cpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template index 4030c6f0da06..698cc897e59a 100644 --- a/srcpkgs/waifu2x-converter-cpp/template +++ b/srcpkgs/waifu2x-converter-cpp/template @@ -1,7 +1,7 @@ # Template file for 'waifu2x-converter-cpp' pkgname=waifu2x-converter-cpp version=5.2.4 -revision=1 +revision=2 build_style=cmake configure_args="-DINSTALL_MODELS=ON" hostmakedepends="pkg-config" From d4858796e32aba8aa5417229ca1dfeb67892462a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:59:22 -0400 Subject: [PATCH 12/12] qimgv: fix dependency name --- srcpkgs/qimgv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template index 7dede61524ee..bb91ee98eab7 100644 --- a/srcpkgs/qimgv/template +++ b/srcpkgs/qimgv/template @@ -8,7 +8,7 @@ configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON -DVIDEO_SUPPORT=OFF) $(vopt_if kde -DKDE_SUPPORT=ON -DKDE_SUPPORT=OFF)" hostmakedepends="pkg-config" makedepends="exiv2-devel qt5-devel qt5-svg-devel $(vopt_if video mpv-devel) - $(vopt_if scale libopencv4-devel) $(vopt_if kde kwindowsystem-devel)" + $(vopt_if scale libopencv-devel) $(vopt_if kde kwindowsystem-devel)" depends="hicolor-icon-theme qt5-imageformats" short_desc="Cross-platform image viewer with webm support" maintainer="travankor "