mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
waifu2x-converter-cpp: update to 5.3.4.
This commit is contained in:
parent
da2df3b29c
commit
395adb7d37
3 changed files with 13 additions and 20 deletions
|
@ -1,9 +1,9 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 12884cc..6139ae2 100644
|
index 8b728b5..17d9dea 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -36,7 +36,14 @@ if(UNIX OR MINGW)
|
@@ -121,7 +121,14 @@ if (WIN32)
|
||||||
set(FILE_SYSTEM_LIB "stdc++fs")
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-add_executable(conv conv.c)
|
-add_executable(conv conv.c)
|
||||||
|
@ -15,11 +15,11 @@ index 12884cc..6139ae2 100644
|
||||||
+ DEPENDS "build/conv"
|
+ DEPENDS "build/conv"
|
||||||
+ COMMENT "Generator"
|
+ COMMENT "Generator"
|
||||||
+)
|
+)
|
||||||
if(UNIX)
|
|
||||||
set(OPENCV_PREFIX "/usr" CACHE FILEPATH "OpenCV path")
|
set(HAVE_OPENCV FALSE)
|
||||||
find_package(OpenCV)
|
set(HAVE_OPENCV_3_X FALSE)
|
||||||
@@ -269,7 +276,7 @@ else() # We are on linux and build for linux
|
@@ -355,7 +362,7 @@ else()
|
||||||
target_link_libraries(w2xc ${OpenCV_LIBS} ${CMAKE_DL_LIBS} pthread stdc++fs stdc++)
|
target_link_libraries(w2xc ${OPENCV_LIBRARIES} ${CMAKE_DL_LIBS} pthread ${FILE_SYSTEM_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
|
-set(CONV_EXE "$<TARGET_FILE_DIR:conv>/conv")
|
||||||
|
@ -27,4 +27,3 @@ index 12884cc..6139ae2 100644
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT modelHandler_OpenCL.cl.h
|
OUTPUT modelHandler_OpenCL.cl.h
|
||||||
|
|
||||||
|
|
|
@ -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"
|
|
|
@ -1,17 +1,17 @@
|
||||||
# Template file for 'waifu2x-converter-cpp'
|
# Template file for 'waifu2x-converter-cpp'
|
||||||
pkgname=waifu2x-converter-cpp
|
pkgname=waifu2x-converter-cpp
|
||||||
version=5.2.4
|
version=5.3.4
|
||||||
revision=3
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DINSTALL_MODELS=ON"
|
configure_args="-DINSTALL_MODELS=ON"
|
||||||
hostmakedepends="pkg-config"
|
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"
|
short_desc="Image upscaling using deep convolutional neural networks"
|
||||||
maintainer="SolitudeSF <solitudesf@protonmail.com>"
|
maintainer="SolitudeSF <solitudesf@protonmail.com>"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
homepage="https://github.com/DeadSix27/waifu2x-converter-cpp"
|
homepage="https://github.com/DeadSix27/waifu2x-converter-cpp"
|
||||||
distfiles="${homepage}/archive/v${version}.tar.gz"
|
distfiles="${homepage}/archive/v${version}.tar.gz"
|
||||||
checksum=e10bd5c64015553d1340988cf886aa51ed3cf4108f1a3ba864b3ea818426de7d
|
checksum=93e1dca78657c48f9c497a71b9e9d11e88ffadcc20fac27f9c48cdba7f132b51
|
||||||
|
|
||||||
# silly workaround to prevent vector/bool/etc from being defined
|
# silly workaround to prevent vector/bool/etc from being defined
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
@ -23,6 +23,7 @@ pre_configure() {
|
||||||
# conv is a generator built with add_executable
|
# conv is a generator built with add_executable
|
||||||
# build it before so it is built with the correct
|
# build it before so it is built with the correct
|
||||||
# toolchain
|
# toolchain
|
||||||
|
mkdir build
|
||||||
cc -o build/conv conv.c
|
cc -o build/conv conv.c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue