From 9686da979aafd7b81cd7e4b71320a7aed75c5e48 Mon Sep 17 00:00:00 2001 From: newbluemoon 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 " +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 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 " 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 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 "$/conv") ++#set(CONV_EXE "$/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 - #include - #include - #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 " 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 }