Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] opencv: update to 3.4.15
@ 2021-08-03 13:21 newbluemoon
  2021-08-04 18:01 ` [PR PATCH] [Updated] " newbluemoon
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-03 13:21 UTC (permalink / raw)
  To: ml

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

There is a new 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? If it is working again then it should probably also be reenabled in mlt7.

<!-- 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: 2042 bytes --]

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

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 4ebf6fe915ed..cfcb77930f27 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,7 @@ 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
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -37,11 +37,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 +44,7 @@ post_install() {
 libopencv_package() {
 	short_desc+=" - library files"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -59,7 +54,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 +71,6 @@ libopencv-python3_package() {
 	short_desc+=" - Python3 bindings"
 	depends="python3-numpy"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
 	}
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
@ 2021-08-04 18:01 ` newbluemoon
  2021-08-04 18:13 ` newbluemoon
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-04 18:01 UTC (permalink / raw)
  To: ml

[-- 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: 2137 bytes --]

From 93adb6fd4967c20175cb71a2108044b6a8c362f6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 3 Aug 2021 15:01:23 +0200
Subject: [PATCH] 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*"
 	}
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
  2021-08-04 18:01 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-08-04 18:13 ` newbluemoon
  2021-08-09  9:45 ` q66
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-04 18:13 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-892868281

Comment:
Tests don’t seem to work well in a chroot and CI environment; there is no progress even after hours of running.
I tried running them outside the chroot locally: the first one finished but then the second one got stuck again :(
It seems they need a special setup? So I disabled the tests for now.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
  2021-08-04 18:01 ` [PR PATCH] [Updated] " newbluemoon
  2021-08-04 18:13 ` newbluemoon
@ 2021-08-09  9:45 ` q66
  2021-08-09 14:22 ` ericonr
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: q66 @ 2021-08-09  9:45 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-895089328

Comment:
idk, we'll see

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (2 preceding siblings ...)
  2021-08-09  9:45 ` q66
@ 2021-08-09 14:22 ` ericonr
  2021-08-09 21:21 ` newbluemoon
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-08-09 14:22 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-895267052

Comment:
Breaks digikam, at least:

```
Error relocating /lib/libdigikamgui.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v1716readNetFromTorchERKNS_6StringEbb: symbol not found
Error relocating /lib/libdigikamgui.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173NetC1Ev: symbol not found
Error relocating /lib/libdigikamgui.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v1713blobFromImageERKNS_11_InputArrayEdRKNS_5Size_IiEERKNS_7Scalar_IdEEbbi: symbol not found
Error relocating /lib/libdigikamgui.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173NetD1Ev: symbol not found
Error relocating /lib/libdigikamgui.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net8setInputERKNS_11_InputArrayERKNS_6StringEdRKNS_7Scalar_IdEE: symbol not found
Error relocating /lib/libdigikamgui.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net7forwardERKNS_6StringE: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173NetC1Ev: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZNK2cv3dnn23experimental_dnn_34_v173Net13getLayerNamesEv: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v1713blobFromImageERKNS_11_InputArrayEdRKNS_5Size_IiEERKNS_7Scalar_IdEEbbi: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173NetD1Ev: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v1716readNetFromCaffeERKNS_6StringES4_: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net20setPreferableBackendEi: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net7forwardERKNS_12_OutputArrayERKSt6vectorINS_6StringESaIS7_EE: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net8setInputERKNS_11_InputArrayERKNS_6StringEdRKNS_7Scalar_IdEE: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net7forwardERKNS_6StringE: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v1718readNetFromDarknetERKNS_6StringES4_: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v173Net19setPreferableTargetEi: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZNK2cv3dnn23experimental_dnn_34_v173Net23getUnconnectedOutLayersEv: symbol not found
Error relocating /lib/libdigikamcore.so.7.3.0: _ZN2cv3dnn23experimental_dnn_34_v178NMSBoxesERKSt6vectorINS_5Rect_IiEESaIS4_EERKS2_IfSaIfEEffRS2_IiSaIiEEfi: symbol not found
```

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (3 preceding siblings ...)
  2021-08-09 14:22 ` ericonr
@ 2021-08-09 21:21 ` newbluemoon
  2021-08-09 22:26 ` ericonr
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-09 21:21 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-895558508

Comment:
digikam needs a revbump, nomacs seems to work, but I’m not sure at which point it uses opencv.
Should I revbump all packages depending on opencv just to be sure?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (4 preceding siblings ...)
  2021-08-09 21:21 ` newbluemoon
@ 2021-08-09 22:26 ` ericonr
  2021-08-10  6:19 ` [PR PATCH] [Updated] " newbluemoon
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-08-09 22:26 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-895592500

Comment:
> Should I revbump all packages depending on opencv just to be sure?

Maybe easier. Testing with `digikam` it was just a matter of trying to run digikam, since it's dynamically linked to `libopencv`. But it's certainly possible there were more issues lurking underneath.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (5 preceding siblings ...)
  2021-08-09 22:26 ` ericonr
@ 2021-08-10  6:19 ` newbluemoon
  2021-08-10 13:47 ` newbluemoon
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-10  6:19 UTC (permalink / raw)
  To: ml

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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (6 preceding siblings ...)
  2021-08-10  6:19 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-08-10 13:47 ` newbluemoon
  2021-08-10 13:47 ` newbluemoon
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-10 13:47 UTC (permalink / raw)
  To: ml

[-- 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: 7064 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 a6117ff10f24f6b6344bbbe257654597a04581d9 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 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index 6ce3ccdc6b41..97215a3af10b 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
@@ -18,4 +18,3 @@ checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea
 post_build() {
 	lrelease-qt5 locale/*.ts
 }
-

From 39072751f42041e8c4071e53e67e085374372ef9 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 87a3e6c491a6e8e6ec4236898b76d597a09088c0 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 f4158d2716d2ed45bc6cf8b1153fd3da93710e8a 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 14e90e4a995fdff4f8c700e9b29f57fe6b5cc022 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

and disable check as there is no rule to make target 'check'
---
 srcpkgs/siril/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..dc4c365dba04 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
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.siril.org/"
 distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2"
 checksum=9fb7f8a10630ea028137e8f213727519ae9916ea1d88cd8d0cc87f336d8d53b1
+make_check=no # No rule to make target 'check'.
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 68640961814e8f7c708732f71399f06e76cbcadf 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

and fix test
---
 srcpkgs/waifu2x-converter-cpp/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 4030c6f0da06..2fdbb768a155 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"
@@ -26,6 +26,10 @@ pre_configure() {
 	cc -o build/conv conv.c
 }
 
+pre_check() {
+	cp -a models_rgb build
+}
+
 post_install() {
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (7 preceding siblings ...)
  2021-08-10 13:47 ` newbluemoon
@ 2021-08-10 13:47 ` newbluemoon
  2021-08-10 13:53 ` ericonr
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-10 13:47 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-896042908

Comment:
Some build/check errors occured in the revbumped packages. I tried to fix them, but gmic is still broken.
However, there are updates available for gmic, siril, and waifu2x-converter-cpp.
Maybe it’s better to update than trying to fix old versions. I could give it a try, but am not quite sure if the updates should each be a separate PR or added here?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (8 preceding siblings ...)
  2021-08-10 13:47 ` newbluemoon
@ 2021-08-10 13:53 ` ericonr
  2021-08-16  8:09 ` [PR PATCH] [Updated] " newbluemoon
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-08-10 13:53 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-896048231

Comment:
Adding them here is ok!

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (9 preceding siblings ...)
  2021-08-10 13:53 ` ericonr
@ 2021-08-16  8:09 ` newbluemoon
  2021-08-16  8:12 ` newbluemoon
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-16  8:09 UTC (permalink / raw)
  To: ml

[-- 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: 13495 bytes --]

From eb9bf9fbb9b8e7bba5d230e6c69f03ae8f0513a1 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 3 Aug 2021 15:01:23 +0200
Subject: [PATCH 1/8] 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 114acfe9d774909b6fb463345ae527b9d2e03339 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 2/8] actiona: rebuild for opencv-3.4.15

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

diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index 6ce3ccdc6b41..97215a3af10b 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
@@ -18,4 +18,3 @@ checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea
 post_build() {
 	lrelease-qt5 locale/*.ts
 }
-

From 3017ad0e15e73f1fbb21a05dde3a5938426c0e41 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 3/8] 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 002bcda7644bd3e64358820b957d9a03f3ca6e32 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 4/8] 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 ce6c0a05dd5ce2974135544efc5da3720cff1b13 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 5/8] 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 246ed22c043315a986723379ed9e4a01cd4bbb40 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 13 Aug 2021 12:07:38 +0200
Subject: [PATCH 6/8] New package: librtprocess-0.11.0

---
 common/shlibs                 |  1 +
 srcpkgs/librtprocess-devel    |  1 +
 srcpkgs/librtprocess/template | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/librtprocess-devel
 create mode 100644 srcpkgs/librtprocess/template

diff --git a/common/shlibs b/common/shlibs
index d24c2bacbc9e..2e841034ca2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3993,6 +3993,7 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+librtprocess.so.0 librtprocess-0.11.0_1
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
diff --git a/srcpkgs/librtprocess-devel b/srcpkgs/librtprocess-devel
new file mode 120000
index 000000000000..95794d1128ce
--- /dev/null
+++ b/srcpkgs/librtprocess-devel
@@ -0,0 +1 @@
+librtprocess
\ No newline at end of file
diff --git a/srcpkgs/librtprocess/template b/srcpkgs/librtprocess/template
new file mode 100644
index 000000000000..5d9f199866f1
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,24 @@
+# Template file for 'librtprocess'
+pkgname=librtprocess
+version=0.11.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libgomp-devel"
+short_desc="Raw preprocessing and demosaic library"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/CarVac/librtprocess"
+distfiles="https://github.com/CarVac/librtprocess/archive/refs/tags/${version}.tar.gz"
+checksum=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+librtprocess-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} libgomp-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 60d3b098666561c2b1837174083199adaa40f3ec Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:03 +0200
Subject: [PATCH 7/8] siril: update to 0.99.10.1

---
 srcpkgs/siril/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..53fad1a3c1a2 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,26 +1,27 @@
 # Template file for 'siril'
 pkgname=siril
-version=0.9.12
-revision=4
+version=0.99.10.1
+revision=1
+wrksrc=siril
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
  gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel
- ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel"
+ ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel exiv2-devel
+ json-glib-devel libffms2-devel libheif-devel librtprocess-devel"
 depends="gnuplot"
 short_desc="Free astronomical image processing software"
 maintainer="Andreas Kempe <kempe@lysator.liu.se>"
 license="GPL-3.0-or-later"
 homepage="https://www.siril.org/"
 distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2"
-checksum=9fb7f8a10630ea028137e8f213727519ae9916ea1d88cd8d0cc87f336d8d53b1
+checksum=a0b3debc1efb313a84958fb1819b3a5d0a1395b096db54cce7e3e34a463a5c79
+make_check=no # No rule to make target 'check'.
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-CFLAGS="-fcommon"
-
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From aacff9d062526e973e154cfd98c1054d50b51a16 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:47 +0200
Subject: [PATCH 8/8] waifu2x-converter-cpp: update to 5.3.4

---
 .../patches/fix-cross.patch                   | 47 ++++++++++++++-----
 .../patches/fix-cstdio.patch                  |  7 ---
 srcpkgs/waifu2x-converter-cpp/template        | 13 +++--
 3 files changed, 44 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch

diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
index 270197357130..1e5a5212407d 100644
--- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
+++ b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
@@ -1,12 +1,33 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12884cc..6139ae2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,14 @@ if(UNIX OR MINGW)
- 	set(FILE_SYSTEM_LIB "stdc++fs")
- endif()
+--- a/CMakeLists.txt	2020-12-20 19:39:26.000000000 +0100
++++ b/CMakeLists.txt	2021-08-13 09:50:54.728623869 +0200
+@@ -100,12 +100,12 @@
+ ### On Windows cmake fails to find the opencl.lib, as we only use Khronos Headers which doesn't come with the library
+ ### So we bypass that by not making it required and double check for the header after.
+ ### On linux typically the library always comes with the package.
+-if (WIN32)
+-	FIND_PACKAGE(OpenCL)
+-else()
+-	FIND_PACKAGE(OpenCL REQUIRED)
+-endif()
+-if (WIN32)
++#if (WIN32)
++#	FIND_PACKAGE(OpenCL)
++#else()
++#	FIND_PACKAGE(OpenCL REQUIRED)
++#endif()
++#if (WIN32)
+ 	set(OpenCL_FOUND FALSE)
+ 	foreach(_DIR ${OpenCL_INCLUDE_DIRS})
+ 		if(EXISTS "${_DIR}/CL/cl.h")
+@@ -119,9 +119,17 @@
+ 		message(STATUS "On Windows: Errors about 'missing: OpenCL_LIBRARY' can be ignored, that is not needed.")
+ 		include_directories(${OpenCL_INCLUDE_DIRS})
+ 	endif()
+-endif()
++#endif()
  
 -add_executable(conv conv.c)
++#add_executable(conv conv.c)
 +add_custom_target("conv")
 +add_custom_command(
 +	OUTPUT "build/conv"
@@ -15,16 +36,16 @@ index 12884cc..6139ae2 100644
 +	DEPENDS "build/conv"
 +	COMMENT "Generator"
 +)
- if(UNIX)
- 	set(OPENCV_PREFIX "/usr" CACHE FILEPATH "OpenCV path")
- 	find_package(OpenCV)
-@@ -269,7 +276,7 @@ else() # We are on linux and build for linux
- 	target_link_libraries(w2xc ${OpenCV_LIBS} ${CMAKE_DL_LIBS} pthread stdc++fs stdc++)
+ 
+ set(HAVE_OPENCV FALSE)
+ set(HAVE_OPENCV_3_X FALSE)
+@@ -355,7 +363,8 @@
+ 	target_link_libraries(w2xc ${OPENCV_LIBRARIES} ${CMAKE_DL_LIBS} pthread ${FILE_SYSTEM_LIB})
  endif()
  
 -set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
++#set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
 +set(CONV_EXE ${CMAKE_BINARY_DIR}/conv)
  
  add_custom_command(
  	OUTPUT modelHandler_OpenCL.cl.h
-
diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch
deleted file mode 100644
index f2a3357eeeec..000000000000
--- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/threadPool.cpp	2019-03-25 11:44:59.000000000 +0100
-+++ b/src/threadPool.cpp	2020-08-23 21:43:43.087489818 +0200
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include <thread>
- #include <atomic>
- #include "threadPool.hpp"
diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 4030c6f0da06..068d65c46fb6 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,9 +1,11 @@
 # Template file for 'waifu2x-converter-cpp'
 pkgname=waifu2x-converter-cpp
-version=5.2.4
+version=5.3.4
 revision=1
 build_style=cmake
-configure_args="-DINSTALL_MODELS=ON"
+configure_args="-DINSTALL_MODELS=ON
+ -DENABLE_TESTS=ON
+ -DOpenCL_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="pkg-config"
 makedepends="libopencv-devel opencl2-headers"
 short_desc="Image upscaling using deep convolutional neural networks"
@@ -11,7 +13,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/DeadSix27/waifu2x-converter-cpp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e10bd5c64015553d1340988cf886aa51ed3cf4108f1a3ba864b3ea818426de7d
+checksum=93e1dca78657c48f9c497a71b9e9d11e88ffadcc20fac27f9c48cdba7f132b51
 
 # silly workaround to prevent vector/bool/etc from being defined
 case "$XBPS_TARGET_MACHINE" in
@@ -23,9 +25,14 @@ pre_configure() {
 	# conv is a generator built with add_executable
 	# build it before so it is built with the correct
 	# toolchain
+	mkdir -p build
 	cc -o build/conv conv.c
 }
 
+pre_check() {
+	cp -a models_rgb build
+}
+
 post_install() {
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (10 preceding siblings ...)
  2021-08-16  8:09 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-08-16  8:12 ` newbluemoon
  2021-10-14  4:31 ` ahesford
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-08-16  8:12 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-899313945

Comment:
Updated waifu2x-converter-cpp and siril. The latter requires a new package librtprocess.
Updating Gmic is still a work in progress...

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (11 preceding siblings ...)
  2021-08-16  8:12 ` newbluemoon
@ 2021-10-14  4:31 ` ahesford
  2021-10-14  6:03 ` newbluemoon
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2021-10-14  4:31 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-942937981

Comment:
During the recent `python3` update, I noticed that `opencv` failed to build and updated to `opencv-3.4.15_1` in 88d67caf before I noticed this PR. The build failure predates the `python3` update, so the `opencv` package has been broken for some time.

Based on #33530 (the same issue noticed by @ericonr), I revbumped `digicam` in 1e88df94. Some quick tests suggest that the rebuild fixed the issue. I also did some very basic test of all other dependants that you touch in this PR, and all packages seem to be OK with the new `opencv`. I recommend we not revbump the remaining packages until we have concrete reports of ABI breakage that affects them.

The `gmic` build failure also predates the `opencv` and `python3` updates, as I describe in #33534. It would be good to fix this because `flowblade` requires `gmic` and I don't know if it can be disabled. `darktable` also requires `gmic` by default, but this can be disabled with build options. At the moment, the fix does not seem obvious. If you are willing to try, have at it.

Regarding the work in this PR, I suggest you:
- [ ] Drop the (now unnecessary) version bump from `opencv`.
- [ ] If you are certain that `opencv` works on `ppc*`, you can remove the `broken=` in the template. There is no need to revbump the template for this change. If you are uncertain whether the package will work on `ppc*`, just drop the entire `opencv` commit.
- [ ] Drop the commits for `actiona`, `digikam` and `nomacs`. `digikam` has already been rebuilt, and the other two seem to work just fine.
- [ ] Keep your existing `siril` and `waifu2x-converter-cpp` updates, if you like.
- [ ] Try updating or fixing the `gmic` template, if you like.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (12 preceding siblings ...)
  2021-10-14  4:31 ` ahesford
@ 2021-10-14  6:03 ` newbluemoon
  2021-10-14  6:46 ` [PR PATCH] [Updated] " newbluemoon
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-10-14  6:03 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-942993860

Comment:
- Regarding the `broken=` on `ppc*`: as mentioned above I got the exact same error on i686-musl which seems to be fixed with 3.4.15. Sadly I cannot test it on ppc right now and will drop the commit as you suggested.
- The problem with gmic seems to be using the right `CFLAGS`: to make the build succeed the ones specified in the `Makefile` are required, but then it ignores Void’s flags. If I manage to use Void’s flags then the build fails, because it doesn’t pick up gmic’s flags. When I build it outside the xbps chroot everything is ok. There doesn’t seem to be an easy way around this without some more or less heavy patching. I haven’t had the time to look deeper into it, but I can give it a try. :)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (13 preceding siblings ...)
  2021-10-14  6:03 ` newbluemoon
@ 2021-10-14  6:46 ` newbluemoon
  2021-10-14 20:03 ` newbluemoon
  2021-10-14 20:08 ` newbluemoon
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-10-14  6:46 UTC (permalink / raw)
  To: ml

[-- 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: 9124 bytes --]

From b7490450df38b9a7a04d40263d24885e12bb8925 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:02 +0200
Subject: [PATCH 1/4] 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 d9cff06ef27d33f5fac3b268f84ecb18148d6f81 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 13 Aug 2021 12:07:38 +0200
Subject: [PATCH 2/4] New package: librtprocess-0.11.0

---
 common/shlibs                 |  1 +
 srcpkgs/librtprocess-devel    |  1 +
 srcpkgs/librtprocess/template | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/librtprocess-devel
 create mode 100644 srcpkgs/librtprocess/template

diff --git a/common/shlibs b/common/shlibs
index 7a4d4ea1794d..4b70ad94015f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4017,6 +4017,7 @@ libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libfreeaptx.so.0 libfreeaptx-0.1.1_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+librtprocess.so.0 librtprocess-0.11.0_1
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
diff --git a/srcpkgs/librtprocess-devel b/srcpkgs/librtprocess-devel
new file mode 120000
index 000000000000..95794d1128ce
--- /dev/null
+++ b/srcpkgs/librtprocess-devel
@@ -0,0 +1 @@
+librtprocess
\ No newline at end of file
diff --git a/srcpkgs/librtprocess/template b/srcpkgs/librtprocess/template
new file mode 100644
index 000000000000..5d9f199866f1
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,24 @@
+# Template file for 'librtprocess'
+pkgname=librtprocess
+version=0.11.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libgomp-devel"
+short_desc="Raw preprocessing and demosaic library"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/CarVac/librtprocess"
+distfiles="https://github.com/CarVac/librtprocess/archive/refs/tags/${version}.tar.gz"
+checksum=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+librtprocess-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} libgomp-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 107358f2903bad25650672df61ec1d4a6b2e3322 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:03 +0200
Subject: [PATCH 3/4] siril: update to 0.99.10.1

---
 srcpkgs/siril/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..53fad1a3c1a2 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,26 +1,27 @@
 # Template file for 'siril'
 pkgname=siril
-version=0.9.12
-revision=4
+version=0.99.10.1
+revision=1
+wrksrc=siril
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
  gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel
- ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel"
+ ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel exiv2-devel
+ json-glib-devel libffms2-devel libheif-devel librtprocess-devel"
 depends="gnuplot"
 short_desc="Free astronomical image processing software"
 maintainer="Andreas Kempe <kempe@lysator.liu.se>"
 license="GPL-3.0-or-later"
 homepage="https://www.siril.org/"
 distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2"
-checksum=9fb7f8a10630ea028137e8f213727519ae9916ea1d88cd8d0cc87f336d8d53b1
+checksum=a0b3debc1efb313a84958fb1819b3a5d0a1395b096db54cce7e3e34a463a5c79
+make_check=no # No rule to make target 'check'.
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-CFLAGS="-fcommon"
-
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 2e283a488b8965cced54cd31bf325f7b7b442824 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:47 +0200
Subject: [PATCH 4/4] waifu2x-converter-cpp: update to 5.3.4

---
 .../patches/fix-cross.patch                   | 47 ++++++++++++++-----
 .../patches/fix-cstdio.patch                  |  7 ---
 srcpkgs/waifu2x-converter-cpp/template        | 13 +++--
 3 files changed, 44 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch

diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
index 270197357130..1e5a5212407d 100644
--- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
+++ b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
@@ -1,12 +1,33 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12884cc..6139ae2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,14 @@ if(UNIX OR MINGW)
- 	set(FILE_SYSTEM_LIB "stdc++fs")
- endif()
+--- a/CMakeLists.txt	2020-12-20 19:39:26.000000000 +0100
++++ b/CMakeLists.txt	2021-08-13 09:50:54.728623869 +0200
+@@ -100,12 +100,12 @@
+ ### On Windows cmake fails to find the opencl.lib, as we only use Khronos Headers which doesn't come with the library
+ ### So we bypass that by not making it required and double check for the header after.
+ ### On linux typically the library always comes with the package.
+-if (WIN32)
+-	FIND_PACKAGE(OpenCL)
+-else()
+-	FIND_PACKAGE(OpenCL REQUIRED)
+-endif()
+-if (WIN32)
++#if (WIN32)
++#	FIND_PACKAGE(OpenCL)
++#else()
++#	FIND_PACKAGE(OpenCL REQUIRED)
++#endif()
++#if (WIN32)
+ 	set(OpenCL_FOUND FALSE)
+ 	foreach(_DIR ${OpenCL_INCLUDE_DIRS})
+ 		if(EXISTS "${_DIR}/CL/cl.h")
+@@ -119,9 +119,17 @@
+ 		message(STATUS "On Windows: Errors about 'missing: OpenCL_LIBRARY' can be ignored, that is not needed.")
+ 		include_directories(${OpenCL_INCLUDE_DIRS})
+ 	endif()
+-endif()
++#endif()
  
 -add_executable(conv conv.c)
++#add_executable(conv conv.c)
 +add_custom_target("conv")
 +add_custom_command(
 +	OUTPUT "build/conv"
@@ -15,16 +36,16 @@ index 12884cc..6139ae2 100644
 +	DEPENDS "build/conv"
 +	COMMENT "Generator"
 +)
- if(UNIX)
- 	set(OPENCV_PREFIX "/usr" CACHE FILEPATH "OpenCV path")
- 	find_package(OpenCV)
-@@ -269,7 +276,7 @@ else() # We are on linux and build for linux
- 	target_link_libraries(w2xc ${OpenCV_LIBS} ${CMAKE_DL_LIBS} pthread stdc++fs stdc++)
+ 
+ set(HAVE_OPENCV FALSE)
+ set(HAVE_OPENCV_3_X FALSE)
+@@ -355,7 +363,8 @@
+ 	target_link_libraries(w2xc ${OPENCV_LIBRARIES} ${CMAKE_DL_LIBS} pthread ${FILE_SYSTEM_LIB})
  endif()
  
 -set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
++#set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
 +set(CONV_EXE ${CMAKE_BINARY_DIR}/conv)
  
  add_custom_command(
  	OUTPUT modelHandler_OpenCL.cl.h
-
diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch
deleted file mode 100644
index f2a3357eeeec..000000000000
--- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/threadPool.cpp	2019-03-25 11:44:59.000000000 +0100
-+++ b/src/threadPool.cpp	2020-08-23 21:43:43.087489818 +0200
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include <thread>
- #include <atomic>
- #include "threadPool.hpp"
diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 4030c6f0da06..068d65c46fb6 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,9 +1,11 @@
 # Template file for 'waifu2x-converter-cpp'
 pkgname=waifu2x-converter-cpp
-version=5.2.4
+version=5.3.4
 revision=1
 build_style=cmake
-configure_args="-DINSTALL_MODELS=ON"
+configure_args="-DINSTALL_MODELS=ON
+ -DENABLE_TESTS=ON
+ -DOpenCL_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="pkg-config"
 makedepends="libopencv-devel opencl2-headers"
 short_desc="Image upscaling using deep convolutional neural networks"
@@ -11,7 +13,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/DeadSix27/waifu2x-converter-cpp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e10bd5c64015553d1340988cf886aa51ed3cf4108f1a3ba864b3ea818426de7d
+checksum=93e1dca78657c48f9c497a71b9e9d11e88ffadcc20fac27f9c48cdba7f132b51
 
 # silly workaround to prevent vector/bool/etc from being defined
 case "$XBPS_TARGET_MACHINE" in
@@ -23,9 +25,14 @@ pre_configure() {
 	# conv is a generator built with add_executable
 	# build it before so it is built with the correct
 	# toolchain
+	mkdir -p build
 	cc -o build/conv conv.c
 }
 
+pre_check() {
+	cp -a models_rgb build
+}
+
 post_install() {
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (14 preceding siblings ...)
  2021-10-14  6:46 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-10-14 20:03 ` newbluemoon
  2021-10-14 20:08 ` newbluemoon
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-10-14 20:03 UTC (permalink / raw)
  To: ml

[-- 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: 8518 bytes --]

From 9686da979aafd7b81cd7e4b71320a7aed75c5e48 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 13 Aug 2021 12:07:38 +0200
Subject: [PATCH 1/3] New package: librtprocess-0.11.0

---
 common/shlibs                 |  1 +
 srcpkgs/librtprocess-devel    |  1 +
 srcpkgs/librtprocess/template | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/librtprocess-devel
 create mode 100644 srcpkgs/librtprocess/template

diff --git a/common/shlibs b/common/shlibs
index 6b97d658c44a..682998c30ee6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4017,6 +4017,7 @@ libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libfreeaptx.so.0 libfreeaptx-0.1.1_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+librtprocess.so.0 librtprocess-0.11.0_1
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
diff --git a/srcpkgs/librtprocess-devel b/srcpkgs/librtprocess-devel
new file mode 120000
index 000000000000..95794d1128ce
--- /dev/null
+++ b/srcpkgs/librtprocess-devel
@@ -0,0 +1 @@
+librtprocess
\ No newline at end of file
diff --git a/srcpkgs/librtprocess/template b/srcpkgs/librtprocess/template
new file mode 100644
index 000000000000..5d9f199866f1
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,24 @@
+# Template file for 'librtprocess'
+pkgname=librtprocess
+version=0.11.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libgomp-devel"
+short_desc="Raw preprocessing and demosaic library"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/CarVac/librtprocess"
+distfiles="https://github.com/CarVac/librtprocess/archive/refs/tags/${version}.tar.gz"
+checksum=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+librtprocess-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} libgomp-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 5e48d239dd67fd59107e8f22242e5dcb9867441e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:03 +0200
Subject: [PATCH 2/3] siril: update to 0.99.10.1

---
 srcpkgs/siril/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..53fad1a3c1a2 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,26 +1,27 @@
 # Template file for 'siril'
 pkgname=siril
-version=0.9.12
-revision=4
+version=0.99.10.1
+revision=1
+wrksrc=siril
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
  gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel
- ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel"
+ ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel exiv2-devel
+ json-glib-devel libffms2-devel libheif-devel librtprocess-devel"
 depends="gnuplot"
 short_desc="Free astronomical image processing software"
 maintainer="Andreas Kempe <kempe@lysator.liu.se>"
 license="GPL-3.0-or-later"
 homepage="https://www.siril.org/"
 distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2"
-checksum=9fb7f8a10630ea028137e8f213727519ae9916ea1d88cd8d0cc87f336d8d53b1
+checksum=a0b3debc1efb313a84958fb1819b3a5d0a1395b096db54cce7e3e34a463a5c79
+make_check=no # No rule to make target 'check'.
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-CFLAGS="-fcommon"
-
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 17d98eb05cca0bebb9de02fe62b3facaad249a16 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:47 +0200
Subject: [PATCH 3/3] waifu2x-converter-cpp: update to 5.3.4

---
 .../patches/fix-cross.patch                   | 47 ++++++++++++++-----
 .../patches/fix-cstdio.patch                  |  7 ---
 srcpkgs/waifu2x-converter-cpp/template        | 13 +++--
 3 files changed, 44 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch

diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
index 270197357130..1e5a5212407d 100644
--- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
+++ b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch
@@ -1,12 +1,33 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12884cc..6139ae2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,14 @@ if(UNIX OR MINGW)
- 	set(FILE_SYSTEM_LIB "stdc++fs")
- endif()
+--- a/CMakeLists.txt	2020-12-20 19:39:26.000000000 +0100
++++ b/CMakeLists.txt	2021-08-13 09:50:54.728623869 +0200
+@@ -100,12 +100,12 @@
+ ### On Windows cmake fails to find the opencl.lib, as we only use Khronos Headers which doesn't come with the library
+ ### So we bypass that by not making it required and double check for the header after.
+ ### On linux typically the library always comes with the package.
+-if (WIN32)
+-	FIND_PACKAGE(OpenCL)
+-else()
+-	FIND_PACKAGE(OpenCL REQUIRED)
+-endif()
+-if (WIN32)
++#if (WIN32)
++#	FIND_PACKAGE(OpenCL)
++#else()
++#	FIND_PACKAGE(OpenCL REQUIRED)
++#endif()
++#if (WIN32)
+ 	set(OpenCL_FOUND FALSE)
+ 	foreach(_DIR ${OpenCL_INCLUDE_DIRS})
+ 		if(EXISTS "${_DIR}/CL/cl.h")
+@@ -119,9 +119,17 @@
+ 		message(STATUS "On Windows: Errors about 'missing: OpenCL_LIBRARY' can be ignored, that is not needed.")
+ 		include_directories(${OpenCL_INCLUDE_DIRS})
+ 	endif()
+-endif()
++#endif()
  
 -add_executable(conv conv.c)
++#add_executable(conv conv.c)
 +add_custom_target("conv")
 +add_custom_command(
 +	OUTPUT "build/conv"
@@ -15,16 +36,16 @@ index 12884cc..6139ae2 100644
 +	DEPENDS "build/conv"
 +	COMMENT "Generator"
 +)
- if(UNIX)
- 	set(OPENCV_PREFIX "/usr" CACHE FILEPATH "OpenCV path")
- 	find_package(OpenCV)
-@@ -269,7 +276,7 @@ else() # We are on linux and build for linux
- 	target_link_libraries(w2xc ${OpenCV_LIBS} ${CMAKE_DL_LIBS} pthread stdc++fs stdc++)
+ 
+ set(HAVE_OPENCV FALSE)
+ set(HAVE_OPENCV_3_X FALSE)
+@@ -355,7 +363,8 @@
+ 	target_link_libraries(w2xc ${OPENCV_LIBRARIES} ${CMAKE_DL_LIBS} pthread ${FILE_SYSTEM_LIB})
  endif()
  
 -set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
++#set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
 +set(CONV_EXE ${CMAKE_BINARY_DIR}/conv)
  
  add_custom_command(
  	OUTPUT modelHandler_OpenCL.cl.h
-
diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch
deleted file mode 100644
index f2a3357eeeec..000000000000
--- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cstdio.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/threadPool.cpp	2019-03-25 11:44:59.000000000 +0100
-+++ b/src/threadPool.cpp	2020-08-23 21:43:43.087489818 +0200
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include <thread>
- #include <atomic>
- #include "threadPool.hpp"
diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 4030c6f0da06..068d65c46fb6 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,9 +1,11 @@
 # Template file for 'waifu2x-converter-cpp'
 pkgname=waifu2x-converter-cpp
-version=5.2.4
+version=5.3.4
 revision=1
 build_style=cmake
-configure_args="-DINSTALL_MODELS=ON"
+configure_args="-DINSTALL_MODELS=ON
+ -DENABLE_TESTS=ON
+ -DOpenCL_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="pkg-config"
 makedepends="libopencv-devel opencl2-headers"
 short_desc="Image upscaling using deep convolutional neural networks"
@@ -11,7 +13,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/DeadSix27/waifu2x-converter-cpp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e10bd5c64015553d1340988cf886aa51ed3cf4108f1a3ba864b3ea818426de7d
+checksum=93e1dca78657c48f9c497a71b9e9d11e88ffadcc20fac27f9c48cdba7f132b51
 
 # silly workaround to prevent vector/bool/etc from being defined
 case "$XBPS_TARGET_MACHINE" in
@@ -23,9 +25,14 @@ pre_configure() {
 	# conv is a generator built with add_executable
 	# build it before so it is built with the correct
 	# toolchain
+	mkdir -p build
 	cc -o build/conv conv.c
 }
 
+pre_check() {
+	cp -a models_rgb build
+}
+
 post_install() {
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: opencv: update to 3.4.15
  2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
                   ` (15 preceding siblings ...)
  2021-10-14 20:03 ` newbluemoon
@ 2021-10-14 20:08 ` newbluemoon
  16 siblings, 0 replies; 18+ messages in thread
From: newbluemoon @ 2021-10-14 20:08 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/32308#issuecomment-943689934

Comment:
gmic is taken care of in #33545 now so I removed it here.
What remains is siril and waifu2x which doesn’t fit with the PR title anymore ;)
Shall I open separate PRs for those or leave it be?

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2021-10-14 20:08 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-03 13:21 [PR PATCH] opencv: update to 3.4.15 newbluemoon
2021-08-04 18:01 ` [PR PATCH] [Updated] " newbluemoon
2021-08-04 18:13 ` newbluemoon
2021-08-09  9:45 ` q66
2021-08-09 14:22 ` ericonr
2021-08-09 21:21 ` newbluemoon
2021-08-09 22:26 ` ericonr
2021-08-10  6:19 ` [PR PATCH] [Updated] " newbluemoon
2021-08-10 13:47 ` newbluemoon
2021-08-10 13:47 ` newbluemoon
2021-08-10 13:53 ` ericonr
2021-08-16  8:09 ` [PR PATCH] [Updated] " newbluemoon
2021-08-16  8:12 ` newbluemoon
2021-10-14  4:31 ` ahesford
2021-10-14  6:03 ` newbluemoon
2021-10-14  6:46 ` [PR PATCH] [Updated] " newbluemoon
2021-10-14 20:03 ` newbluemoon
2021-10-14 20:08 ` newbluemoon

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git