From: newbluemoon <newbluemoon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] update siril + waifu2x-converter-cpp (was opencv: update to 3.4.15)
Date: Fri, 11 Mar 2022 16:45:19 +0100 [thread overview]
Message-ID: <20220311154519.wGpcOnbcAivxgFTSN6zJqdBOsO2EHw_OIVsygkVlY0o@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32308@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2295 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
update siril + waifu2x-converter-cpp (was 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: 4751 bytes --]
From 153d741959d4eb50fa91ccb5daad7aeead92b0e9 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 10 Aug 2021 07:31:47 +0200
Subject: [PATCH] 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
}
next prev parent reply other threads:[~2022-03-11 15:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2021-11-17 16:49 ` [PR PATCH] [Updated] " newbluemoon
2021-11-17 17:14 ` newbluemoon
2021-11-18 5:53 ` [PR PATCH] [Updated] update siril + waifu2x-converter-cpp (was opencv: update to 3.4.15) newbluemoon
2022-03-11 15:45 ` newbluemoon [this message]
2022-03-11 15:46 ` newbluemoon
2022-03-28 18:57 ` [PR PATCH] [Updated] " newbluemoon
2022-05-07 15:44 ` newbluemoon
2022-08-07 2:13 ` waifu2x-converter-cpp: update to 5.3.4 " github-actions
2022-08-14 7:37 ` [PR PATCH] [Updated] " newbluemoon
2022-08-29 2:14 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220311154519.wGpcOnbcAivxgFTSN6zJqdBOsO2EHw_OIVsygkVlY0o@z \
--to=newbluemoon@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).