diff --git a/.gitignore b/.gitignore index e2abc9e..c09e9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,3 @@ /waifu2x-converter-cpp-5.2.4.tar.gz /waifu2x-converter-cpp-5.3.tar.gz /waifu2x-converter-cpp-5.3.1.tar.gz -/waifu2x-converter-cpp-5.3.2.tar.gz -/waifu2x-converter-cpp-5.3.3.tar.gz -/waifu2x-converter-cpp-5.3.4.tar.gz diff --git a/sources b/sources index bf15a07..0f9ab7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waifu2x-converter-cpp-5.3.4.tar.gz) = 05bd5114bd5bf5084d619d6509e51bdc642d5643775d91f03ca0995cbc5e32e757f00f6f31706533546b5d936638c0dd9d2da8ccca25b3498ff4da4020695c2a +SHA512 (waifu2x-converter-cpp-5.3.1.tar.gz) = eb87c0db2738883ba79d693b0b7cd8e93129e979906de51d65ba35d0cdb50599f780a2713b9895fc06f0c3b9157befaba809a77e8a171e2055066f8a0644ff4a diff --git a/waifu2x-converter-cpp-5.2-set_soversion.patch b/waifu2x-converter-cpp-5.2-set_soversion.patch new file mode 100644 index 0000000..0c4f601 --- /dev/null +++ b/waifu2x-converter-cpp-5.2-set_soversion.patch @@ -0,0 +1,12 @@ +diff -up waifu2x-converter-cpp-5.2/CMakeLists.txt.set_soversion waifu2x-converter-cpp-5.2/CMakeLists.txt +--- waifu2x-converter-cpp-5.2/CMakeLists.txt.set_soversion 2017-11-19 11:31:04.000000000 +0100 ++++ waifu2x-converter-cpp-5.2/CMakeLists.txt 2018-10-13 02:42:07.458680604 +0200 +@@ -174,6 +174,8 @@ add_library(w2xc SHARED + src/Env.cpp src/Buffer.cpp + ) + ++set_target_properties(w2xc PROPERTIES SOVERSION 1) ++ + add_dependencies(w2xc gensrcs) + + diff --git a/waifu2x-converter-cpp-5.3-set_soversion.patch b/waifu2x-converter-cpp-5.3-set_soversion.patch deleted file mode 100644 index 0e23787..0000000 --- a/waifu2x-converter-cpp-5.3-set_soversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up waifu2x-converter-cpp-5.3.2/CMakeLists.txt.orig waifu2x-converter-cpp-5.3.2/CMakeLists.txt ---- waifu2x-converter-cpp-5.3.2/CMakeLists.txt.orig 2019-12-05 11:10:39.000000000 +0100 -+++ waifu2x-converter-cpp-5.3.2/CMakeLists.txt 2019-12-05 21:40:17.836591283 +0100 -@@ -313,6 +313,8 @@ add_library(w2xc SHARED - src/tstring.cpp - ) - -+set_target_properties(w2xc PROPERTIES SOVERSION 1) -+ - add_dependencies(w2xc gensrcs) - - diff --git a/waifu2x-converter-cpp.spec b/waifu2x-converter-cpp.spec index 12b8bbb..d3012e8 100644 --- a/waifu2x-converter-cpp.spec +++ b/waifu2x-converter-cpp.spec @@ -1,15 +1,14 @@ Name: waifu2x-converter-cpp -Version: 5.3.4 -Release: 21%{?dist} +Version: 5.3.1 +Release: 1%{?dist} Summary: Image Super-Resolution for Anime-style art using OpenCL and OpenCV -# Automatically converted from old format: BSD and MIT - review is highly recommended. -License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT +License: BSD and MIT URL: https://github.com/DeadSix27/waifu2x-converter-cpp Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz # Add soname versioning -Patch0: waifu2x-converter-cpp-5.3-set_soversion.patch +Patch0: waifu2x-converter-cpp-5.2-set_soversion.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -23,12 +22,14 @@ Recommends: mesa-libOpenCL Provides: bundled(picojson) Provides: bundled(tclap) + %description Image Super-Resolution for Anime-style art using OpenCL and OpenCV. This is a reimplementation of waifu2x (original) converter function, in C++, using OpenCV. + %package devel Summary: Development files for waifu2x-converter-cpp Requires: %{name}%{?_isa} = %{version}-%{release} @@ -36,17 +37,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for waifu2x-converter-cpp. + %prep %autosetup -p1 -# Fix ARM build -sed -i 's|-mfloat-abi=hard -mfloat-abi=softfp|-mfloat-abi=hard|' CMakeLists.txt + %build +mkdir _build && cd _build %cmake3 -DINSTALL_MODELS=true .. -%cmake3_build +%make_build + %install -%cmake3_install +cd _build +%make_install + %files %license LICENSE include/picojson_LICENSE.txt include/tclap/tclap_LICEENSE.txt @@ -55,112 +60,13 @@ sed -i 's|-mfloat-abi=hard -mfloat-abi=softfp|-mfloat-abi=hard|' CMakeLists.txt %{_libdir}/libw2xc.so.1* %{_datadir}/waifu2x-converter-cpp + %files devel %{_includedir}/w2xconv.h %{_libdir}/libw2xc.so + %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 5.3.4-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Thu Jan 29 2026 Nicolas Chauvet - 5.3.4-20 -- Rebuilt for OpenCV 4.13 - -* Sat Jan 17 2026 Fedora Release Engineering - 5.3.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Dec 10 2025 Nicolas Chauvet - 5.3.4-18 -- Rebuilt for OpenCV-4.12 - -* Fri Jul 25 2025 Fedora Release Engineering - 5.3.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 04 2025 Sérgio Basto - 5.3.4-16 -- Rebuild for opencv-4.11.0 - -* Sun Jan 19 2025 Fedora Release Engineering - 5.3.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 5.3.4-14 -- convert license to SPDX - -* Thu Jul 25 2024 Sérgio Basto - 5.3.4-13 -- Rebuild for opencv 4.10.0 - -* Sat Jul 20 2024 Fedora Release Engineering - 5.3.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Feb 05 2024 Sérgio Basto - 5.3.4-11 -- Rebuild for opencv 4.9.0 - -* Sat Jan 27 2024 Fedora Release Engineering - 5.3.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Aug 07 2023 Sérgio Basto - 5.3.4-9 -- Rebuild for opencv 4.8.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 5.3.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 5.3.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 16 2023 Sérgio Basto - 5.3.4-6 -- Rebuild for opencv 4.7.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 5.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 21 2022 Sérgio Basto - 5.3.4-4 -- Rebuilt for opencv 4.6.0 - -* Sat Jan 22 2022 Fedora Release Engineering - 5.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 5.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 24 18:35:59 CEST 2021 Robert-André Mauchin - 5.3.4-1 -- Update to 5.3.4 -- Close: rhbz#1920410 - -* Wed Jan 27 2021 Fedora Release Engineering - 5.3.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 22 2020 Nicolas Chauvet - 5.3.3-9 -- Rebuilt for OpenCV - -* Sat Aug 01 2020 Fedora Release Engineering - 5.3.3-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 5.3.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 04 2020 Nicolas Chauvet - 5.3.3-6 -- Rebuilt for OpenCV 4.3 - -* Fri Jan 31 2020 Fedora Release Engineering - 5.3.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 28 2020 Nicolas Chauvet - 5.3.3-4 -- Rebuild for OpenCV 4.2 - -* Mon Jan 27 2020 Nicolas Chauvet -- Fix build - -* Sun Dec 29 2019 Nicolas Chauvet - 5.3.3-2 -- Rebuilt for opencv4 - -* Thu Dec 05 21:22:55 CET 2019 Robert-André Mauchin - 5.3.3-1 -- Release 5.3.3 (#1782267) - -* Thu Dec 05 21:22:55 CET 2019 Robert-André Mauchin - 5.3.2-1 -- Release 5.3.2 (#1780136) - -* Sat Jul 27 2019 Fedora Release Engineering - 5.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Tue Jul 16 21:56:01 CEST 2019 Robert-André Mauchin - 5.3.1-1 - Release 5.3.1 (#1725442) @@ -170,8 +76,5 @@ sed -i 's|-mfloat-abi=hard -mfloat-abi=softfp|-mfloat-abi=hard|' CMakeLists.txt * Sun Mar 17 2019 Robert-André Mauchin - 5.2.3-1 - Release 5.2.3 (#1689455) -* Sun Feb 03 2019 Fedora Release Engineering - 5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Sat Oct 13 2018 Robert-André Mauchin - 5.2-1 - Initial release