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: 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
 }