Re: [PR PATCH] [Updated] opencv: update to 3.4.15

[newbluemoon <newbluemoon@users.noreply.github.com>]

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

There is an updated pull request by newbluemoon against master on the void-packages repository

https://github.com/newbluemoon/void-packages opencv
https://github.com/void-linux/void-packages/pull/32308

opencv: update to 3.4.15
It’s a dependency of `nomacs` which I tried to build for i686-musl but the build failed. The update seems to have fixed it, nomacs builds fine with this opencv version, but I didn’t/couldn’t test any particular opencv functionality.
Successfully built for i686-musl, armv7l, x86_64-musl.

@q66 I removed the broken for `ppc*` because I got the exact same error on i686-musl which isn’t the case with this version anymore. Can you please have a look? <s>If it is working again then it should probably also be reenabled in mlt7.</s> Sorry, mlt7 depends on opencv4; but it’s likely an update will fix this, too, but that’s for another PR.

<!-- 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/32308.patch is attached

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

From 7b3c21a12bcbd1805cbab3f2a8725fabeb8ef5b4 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 3 Aug 2021 15:01:23 +0200
Subject: [PATCH 1/7] opencv: update to 3.4.15

and remove broken for ppc*
---
 srcpkgs/opencv/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 4ebf6fe915ed..a8ef366ebe23 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=3.4.10
-revision=2
+version=3.4.15
+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
@@ -17,7 +17,9 @@ 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=b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7
+# test seems to be stuck with high cpu load and no progress even after hours
+make_check=no
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -37,11 +39,6 @@ if [ "$CROSS_BUILD" ]; then
 	 -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
 }
@@ -49,7 +46,7 @@ post_install() {
 libopencv_package() {
 	short_desc+=" - library files"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -59,7 +56,7 @@ libopencv-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 		vmove usr/share/OpenCV
 	}
 }
@@ -76,6 +73,6 @@ libopencv-python3_package() {
 	short_desc+=" - Python3 bindings"
 	depends="python3-numpy"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
 	}
 }

From 870d692b415731a26294141e3ff8bf424d7148c0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 2/7] actiona: rebuild for opencv-3.4.15

---
 srcpkgs/actiona/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index 6ce3ccdc6b41..8a3d63889648 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -1,7 +1,7 @@
 # Template file for 'actiona'
 pkgname=actiona
 version=3.10.1
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"
 makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel

From f125ed1b51f31b657e742d31446a348494e027f2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 3/7] digikam: rebuild for opencv-3.4.15

---
 srcpkgs/digikam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 0a5e9fa36dc1..ba0f4931db08 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
 # Template file for 'digikam'
 pkgname=digikam
 version=7.3.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 57ffaa00f4b8052f669c53d70fe3a7d890c966a6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 4/7] gmic: rebuild for opencv-3.4.15

---
 srcpkgs/gmic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 6d6f4ec13ba2..530abe449d7a 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake

From 37775c12fa8d1b9f97f3e92a6bbf8c5170211fb4 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 5/7] nomacs: rebuild for opencv-3.4.15

---
 srcpkgs/nomacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 0c38e2737bac..79fc38bf5e10 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

From 980db2ca7787de63c45fe0b87bdfa7ccb827956a Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:03 +0200
Subject: [PATCH 6/7] siril: rebuild for opencv-3.4.15

---
 srcpkgs/siril/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..ac6ed336e1e1 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From b151e095a0f40b6c0976000be776ec948cdb0ae3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:47 +0200
Subject: [PATCH 7/7] waifu2x-converter-cpp: rebuild for opencv-3.4.15

---
 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"