diff --git a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch index 27019735713..0649d1b9fd3 100644 --- a/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch +++ b/srcpkgs/waifu2x-converter-cpp/patches/fix-cross.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12884cc..6139ae2 100644 +index 8b728b5..17d9dea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -36,7 +36,14 @@ if(UNIX OR MINGW) - set(FILE_SYSTEM_LIB "stdc++fs") +@@ -121,7 +121,14 @@ if (WIN32) + endif() endif() -add_executable(conv conv.c) @@ -15,11 +15,11 @@ 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 +362,7 @@ else() + target_link_libraries(w2xc ${OPENCV_LIBRARIES} ${CMAKE_DL_LIBS} pthread ${FILE_SYSTEM_LIB}) endif() -set(CONV_EXE "$/conv") @@ -27,4 +27,3 @@ index 12884cc..6139ae2 100644 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 f2a3357eeee..00000000000 --- 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 - #include - #include - #include "threadPool.hpp" diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template index c5ac17eb54e..9bd76a982d4 100644 --- a/srcpkgs/waifu2x-converter-cpp/template +++ b/srcpkgs/waifu2x-converter-cpp/template @@ -1,17 +1,17 @@ # Template file for 'waifu2x-converter-cpp' pkgname=waifu2x-converter-cpp -version=5.2.4 -revision=3 +version=5.3.4 +revision=1 build_style=cmake configure_args="-DINSTALL_MODELS=ON" hostmakedepends="pkg-config" -makedepends="libopencv-devel OpenCL-Headers" +makedepends="libopencv-devel OpenCL-Headers ocl-icd-devel" short_desc="Image upscaling using deep convolutional neural networks" maintainer="SolitudeSF " 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,6 +23,7 @@ pre_configure() { # conv is a generator built with add_executable # build it before so it is built with the correct # toolchain + mkdir build cc -o build/conv conv.c }