[PR PATCH] OpenCV 3.4.13 and 4.5.1

[PR PATCH] OpenCV 3.4.13 and 4.5.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages opencv-3.4.13-4.5.1
https://github.com/void-linux/void-packages/pull/29565

OpenCV 3.4.13 and 4.5.1
Current Version ftbfs on x86_64
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29565.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-opencv-3.4.13-4.5.1-29565.patch --]
[-- Type: text/x-diff, Size: 9874 bytes --]

From 68bb0f38097bb736d7124b8de39adef0d8afa419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 18 Mar 2021 21:26:08 +0700
Subject: [PATCH 1/2] opencv4: update to 4.5.1.

---
 common/shlibs            | 100 +++++++++++++++++++--------------------
 srcpkgs/opencv4/template |  19 +++++---
 2 files changed, 63 insertions(+), 56 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..088ae416bafb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2054,56 +2054,56 @@ 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.3 libopencv4-4.3.0_1
-libopencv_reg.so.4.3 libopencv4-4.3.0_1
-libopencv_surface_matching.so.4.3 libopencv4-4.3.0_1
-libopencv_xphoto.so.4.3 libopencv4-4.3.0_1
-libopencv_freetype.so.4.3 libopencv4-4.3.0_1
-libopencv_fuzzy.so.4.3 libopencv4-4.3.0_1
-libopencv_hfs.so.4.3 libopencv4-4.3.0_1
-libopencv_img_hash.so.4.3 libopencv4-4.3.0_1
-libopencv_line_descriptor.so.4.3 libopencv4-4.3.0_1
-libopencv_saliency.so.4.3 libopencv4-4.3.0_1
-libopencv_structured_light.so.4.3 libopencv4-4.3.0_1
-libopencv_aruco.so.4.3 libopencv4-4.3.0_1
-libopencv_bgsegm.so.4.3 libopencv4-4.3.0_1
-libopencv_bioinspired.so.4.3 libopencv4-4.3.0_1
-libopencv_ccalib.so.4.3 libopencv4-4.3.0_1
-libopencv_face.so.4.3 libopencv4-4.3.0_1
-libopencv_tracking.so.4.3 libopencv4-4.3.0_1
-libopencv_xfeatures2d.so.4.3 libopencv4-4.3.0_1
-libopencv_optflow.so.4.3 libopencv4-4.3.0_1
-libopencv_ximgproc.so.4.3 libopencv4-4.3.0_1
-libopencv_plot.so.4.3 libopencv4-4.3.0_1
-libopencv_text.so.4.3 libopencv4-4.3.0_1
-libopencv_ml.so.4.3 libopencv4-4.3.0_1
-libopencv_objdetect.so.4.3 libopencv4-4.3.0_1
-libopencv_dnn.so.4.3 libopencv4-4.3.0_1
-libopencv_shape.so.4.3 libopencv4-4.3.0_1
-libopencv_stitching.so.4.3 libopencv4-4.3.0_1
-libopencv_photo.so.4.3 libopencv4-4.3.0_1
-libopencv_video.so.4.3 libopencv4-4.3.0_1
-libopencv_calib3d.so.4.3 libopencv4-4.3.0_1
-libopencv_features2d.so.4.3 libopencv4-4.3.0_1
-libopencv_flann.so.4.3 libopencv4-4.3.0_1
-libopencv_highgui.so.4.3 libopencv4-4.3.0_1
-libopencv_videoio.so.4.3 libopencv4-4.3.0_1
-libopencv_imgcodecs.so.4.3 libopencv4-4.3.0_1
-libopencv_imgproc.so.4.3 libopencv4-4.3.0_1
-libopencv_core.so.4.3 libopencv4-4.3.0_1
-libopencv_superres.so.4.3 libopencv4-4.3.0_1
-libopencv_videostab.so.4.3 libopencv4-4.3.0_1
-libopencv_gapi.so.4.3 libopencv4-4.3.0_1
-libopencv_xobjdetect.so.4.3 libopencv4-4.3.0_1
-libopencv_datasets.so.4.3 libopencv4-4.3.0_1
-libopencv_dnn_objdetect.so.4.3 libopencv4-4.3.0_1
-libopencv_dnn_superres.so.4.3 libopencv4-4.3.0_1
-libopencv_dpm.so.4.3 libopencv4-4.3.0_1
-libopencv_phase_unwrapping.so.4.3 libopencv4-4.3.0_1
-libopencv_stereo.so.4.3 libopencv4-4.3.0_1
-libopencv_rapid.so.4.3 libopencv4-4.3.0_1
-libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
-libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
+libopencv_quality.so.4.5 libopencv4-4.5.1_1
+libopencv_reg.so.4.5 libopencv4-4.5.1_1
+libopencv_surface_matching.so.4.5 libopencv4-4.5.1_1
+libopencv_xphoto.so.4.5 libopencv4-4.5.1_1
+libopencv_freetype.so.4.5 libopencv4-4.5.1_1
+libopencv_fuzzy.so.4.5 libopencv4-4.5.1_1
+libopencv_hfs.so.4.5 libopencv4-4.5.1_1
+libopencv_img_hash.so.4.5 libopencv4-4.5.1_1
+libopencv_line_descriptor.so.4.5 libopencv4-4.5.1_1
+libopencv_saliency.so.4.5 libopencv4-4.5.1_1
+libopencv_structured_light.so.4.5 libopencv4-4.5.1_1
+libopencv_aruco.so.4.5 libopencv4-4.5.1_1
+libopencv_bgsegm.so.4.5 libopencv4-4.5.1_1
+libopencv_bioinspired.so.4.5 libopencv4-4.5.1_1
+libopencv_ccalib.so.4.5 libopencv4-4.5.1_1
+libopencv_face.so.4.5 libopencv4-4.5.1_1
+libopencv_tracking.so.4.5 libopencv4-4.5.1_1
+libopencv_xfeatures2d.so.4.5 libopencv4-4.5.1_1
+libopencv_optflow.so.4.5 libopencv4-4.5.1_1
+libopencv_ximgproc.so.4.5 libopencv4-4.5.1_1
+libopencv_plot.so.4.5 libopencv4-4.5.1_1
+libopencv_text.so.4.5 libopencv4-4.5.1_1
+libopencv_ml.so.4.5 libopencv4-4.5.1_1
+libopencv_objdetect.so.4.5 libopencv4-4.5.1_1
+libopencv_dnn.so.4.5 libopencv4-4.5.1_1
+libopencv_shape.so.4.5 libopencv4-4.5.1_1
+libopencv_stitching.so.4.5 libopencv4-4.5.1_1
+libopencv_photo.so.4.5 libopencv4-4.5.1_1
+libopencv_video.so.4.5 libopencv4-4.5.1_1
+libopencv_calib3d.so.4.5 libopencv4-4.5.1_1
+libopencv_features2d.so.4.5 libopencv4-4.5.1_1
+libopencv_flann.so.4.5 libopencv4-4.5.1_1
+libopencv_highgui.so.4.5 libopencv4-4.5.1_1
+libopencv_videoio.so.4.5 libopencv4-4.5.1_1
+libopencv_imgcodecs.so.4.5 libopencv4-4.5.1_1
+libopencv_imgproc.so.4.5 libopencv4-4.5.1_1
+libopencv_core.so.4.5 libopencv4-4.5.1_1
+libopencv_superres.so.4.5 libopencv4-4.5.1_1
+libopencv_videostab.so.4.5 libopencv4-4.5.1_1
+libopencv_gapi.so.4.5 libopencv4-4.5.1_1
+libopencv_xobjdetect.so.4.5 libopencv4-4.5.1_1
+libopencv_datasets.so.4.5 libopencv4-4.5.1_1
+libopencv_dnn_objdetect.so.4.5 libopencv4-4.5.1_1
+libopencv_dnn_superres.so.4.5 libopencv4-4.5.1_1
+libopencv_phase_unwrapping.so.4.5 libopencv4-4.5.1_1
+libopencv_rapid.so.4.5 libopencv4-4.5.1_1
+libopencv_intensity_transform.so.4.5 libopencv4-4.5.1_1
+libopencv_alphamat.so.4.5 libopencv4-4.5.1_1
+libopencv_mcc.so.4.5 libopencv4-4.5.1_1
+libopencv_sfm.so.4.5 libopencv4-4.5.1_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 f15c5f1ec2f1..11617c97b8d4 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,29 +1,32 @@
 # Template file for 'opencv4'
 pkgname=opencv4
-version=4.3.0
-revision=4
+version=4.5.1
+revision=1
 wrksrc=opencv-${version}
 build_style=cmake
 configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
  -DOPENCV_GENERATE_PKGCONFIG=YES
+ -DBUILD_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=ON
  -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_rgbd=OFF"
-hostmakedepends="pkg-config eigen python-numpy python3-numpy"
+hostmakedepends="pkg-config eigen python-numpy python3-numpy protobuf"
 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
+ gflags-devel glog-devel
+ libopenjpeg2-devel libwebp-devel protobuf-devel libprotoc-devel
  python-numpy python3-numpy python-devel python3-devel"
 short_desc="Computer vision and machine learning software library, version 4.x"
 maintainer="Hazel Levine <me@qtp2t.club>"
 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="68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a
-	acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55"
+ https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>opencv_contrib-${version}.tar.gz"
+checksum="e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513
+ 12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -52,6 +55,10 @@ post_install() {
 	vlicense LICENSE
 }
 
+pre_clean() {
+	rm -rf ${XBPS_BUILDDIR}/opencv_contrib-${version}
+}
+
 libopencv4_package() {
 	short_desc+=" - library files"
 	pkg_install() {

From 46cf259bb70f9c8633384103c191f960d3369cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 18 Mar 2021 08:00:19 +0700
Subject: [PATCH 2/2] opencv: update to 3.4.13.

../modules/imgcodecs/src/grfmt_jpeg2000.cpp:380:48: error: lvalue
required as unary '&' operand
---
 srcpkgs/opencv/template | 10 ++++++----
 srcpkgs/opencv/update   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/opencv/update

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 4ebf6fe915ed..44d2993808f0 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,23 +1,25 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=3.4.10
-revision=2
+version=3.4.13
+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
+ -DBUILD_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=ON
  -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}
  -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
-hostmakedepends="pkg-config eigen python-numpy python3-numpy"
+hostmakedepends="pkg-config eigen python-numpy python3-numpy protobuf"
 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
+ libwebp-devel protobuf-devel libprotoc-devel
  python-numpy python3-numpy python-devel python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://opencv.org"
 distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
-checksum=1ed6f5b02a7baf14daca04817566e7c98ec668cec381e0edf534fa49f10f58a2
+checksum=70230049194ae03ed8bfaab6cd1388569aa1b5c482d8b50d3af1cd2ae5a0b95d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/opencv/update b/srcpkgs/opencv/update
new file mode 100644
index 000000000000..a4487f535b92
--- /dev/null
+++ b/srcpkgs/opencv/update
@@ -0,0 +1 @@
+ignore='4.*'

Re: [PR PATCH] [Closed]: OpenCV 3.4.13 and 4.5.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]

There's a closed pull request on the void-packages repository

OpenCV 3.4.13 and 4.5.1
https://github.com/void-linux/void-packages/pull/29565

Description:
Current Version ftbfs on x86_64
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->