From 44ab27ba34bc043a0fd285917be84b4634eed17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 17 Mar 2019 23:46:15 +0100 Subject: [PATCH 1/3] Release 5.2.3 (#1689455) --- .gitignore | 1 + sources | 2 +- waifu2x-converter-cpp.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db2d3e1..5fa6caa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /waifu2x-converter-cpp-5.2.tar.gz +/waifu2x-converter-cpp-5.2.3.tar.gz diff --git a/sources b/sources index 48cf080..5c90ac7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waifu2x-converter-cpp-5.2.tar.gz) = 387e58fdc4a640087732e4fcae69bafdcb65747f032236905c51d2f791127679679d10ee51b931c3f25a2166f630aa560b5083f290b29c5a297f0fec986d7764 +SHA512 (waifu2x-converter-cpp-5.2.3.tar.gz) = b92dd7fdc2ad9c8afe4986b931b850c323591cd10be602efa83eba9c6ca39df9baa69c2c617d9118def301104d5dbe8259e1a8d7dec50c9cf8d6a104a68ed62b diff --git a/waifu2x-converter-cpp.spec b/waifu2x-converter-cpp.spec index 0a7787c..781b7d1 100644 --- a/waifu2x-converter-cpp.spec +++ b/waifu2x-converter-cpp.spec @@ -1,6 +1,6 @@ Name: waifu2x-converter-cpp -Version: 5.2 -Release: 2%{?dist} +Version: 5.2.3 +Release: 1%{?dist} Summary: Image Super-Resolution for Anime-style art using OpenCL and OpenCV License: BSD and MIT @@ -66,6 +66,9 @@ cd _build %changelog +* 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 From 1293b86606e49ae454ac94401edcb18d2351fc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 26 Mar 2019 17:18:27 +0100 Subject: [PATCH 2/3] Release 5.2.4 (#1692338) --- .gitignore | 1 + ...4le-build-failure-with-GNU-C-and-std.patch | 42 +++++++++++++++++++ sources | 2 +- waifu2x-converter-cpp.spec | 10 ++++- 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch diff --git a/.gitignore b/.gitignore index 5fa6caa..31600d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /waifu2x-converter-cpp-5.2.tar.gz /waifu2x-converter-cpp-5.2.3.tar.gz +/waifu2x-converter-cpp-5.2.4.tar.gz diff --git a/0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch b/0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch new file mode 100644 index 0000000..fac2729 --- /dev/null +++ b/0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch @@ -0,0 +1,42 @@ +From f0fca253c24af2b8e9d12a1adf2ae2ee871377c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Tue, 26 Mar 2019 16:57:19 +0100 +Subject: [PATCH] Work around ppc64le build failure with GNU C++ and -std=c++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Robert-André Mauchin +--- + CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a04883..60c51b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -236,7 +236,11 @@ add_dependencies(w2xc gensrcs) + + if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES "^(Apple)?Clang$") + set(CMAKE_CXX_STANDARD 17) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") ++ if(CMAKE_COMPILER_IS_GNUCXX) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17") ++ else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") ++ endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +@@ -372,7 +376,7 @@ if(WIN32) + else() + option(INSTALL_MODELS "Install waifu2x RGB models" true) + endif() +- ++ + if(INSTALL_MODELS) + add_definitions(-DDEFAULT_MODELS_DIRECTORY="${CMAKE_INSTALL_PREFIX}/share/waifu2x-converter-cpp") + install(DIRECTORY models_rgb/ DESTINATION share/waifu2x-converter-cpp) +-- +2.20.1 + diff --git a/sources b/sources index 5c90ac7..3f69984 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waifu2x-converter-cpp-5.2.3.tar.gz) = b92dd7fdc2ad9c8afe4986b931b850c323591cd10be602efa83eba9c6ca39df9baa69c2c617d9118def301104d5dbe8259e1a8d7dec50c9cf8d6a104a68ed62b +SHA512 (waifu2x-converter-cpp-5.2.4.tar.gz) = 01479bef0821f2e1cdd6700a4e45d26d19f5527a260c660539a9bc2321b908d903c61acb8cecd12dcf6f489d32030d17c980b66670c7dbf56b419373cdb0a3f7 diff --git a/waifu2x-converter-cpp.spec b/waifu2x-converter-cpp.spec index 781b7d1..0210a58 100644 --- a/waifu2x-converter-cpp.spec +++ b/waifu2x-converter-cpp.spec @@ -1,5 +1,5 @@ Name: waifu2x-converter-cpp -Version: 5.2.3 +Version: 5.2.4 Release: 1%{?dist} Summary: Image Super-Resolution for Anime-style art using OpenCL and OpenCV @@ -9,6 +9,9 @@ Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz # Add soname versioning Patch0: waifu2x-converter-cpp-5.2-set_soversion.patch +# Fix build error on ppc64le +# https://github.com/DeadSix27/waifu2x-converter-cpp/pull/120 +Patch1: 0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -25,7 +28,7 @@ Provides: bundled(tclap) %description Image Super-Resolution for Anime-style art using OpenCL and OpenCV. -This is a reimplementation of waifu2x (original) converter function, +This is a reimplementation of waifu2x (original) converter function, in C++, using OpenCV. @@ -66,6 +69,9 @@ cd _build %changelog +* Tue Mar 26 16:39:11 CET 2019 Robert-André Mauchin - 5.2.4-1 +- Release 5.2.4 (#1692338) + * Sun Mar 17 2019 Robert-André Mauchin - 5.2.3-1 - Release 5.2.3 (#1689455) From 61f77119b76d99ec71b20930dbbee80d479149d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 16 Jul 2019 23:28:55 +0200 Subject: [PATCH 3/3] Release 5.3.1 (#1725442) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 2 + ...4le-build-failure-with-GNU-C-and-std.patch | 42 ------------------- sources | 2 +- waifu2x-converter-cpp.spec | 9 ++-- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch diff --git a/.gitignore b/.gitignore index 31600d1..c09e9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /waifu2x-converter-cpp-5.2.tar.gz /waifu2x-converter-cpp-5.2.3.tar.gz /waifu2x-converter-cpp-5.2.4.tar.gz +/waifu2x-converter-cpp-5.3.tar.gz +/waifu2x-converter-cpp-5.3.1.tar.gz diff --git a/0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch b/0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch deleted file mode 100644 index fac2729..0000000 --- a/0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f0fca253c24af2b8e9d12a1adf2ae2ee871377c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Tue, 26 Mar 2019 16:57:19 +0100 -Subject: [PATCH] Work around ppc64le build failure with GNU C++ and -std=c++ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Robert-André Mauchin ---- - CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a04883..60c51b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -236,7 +236,11 @@ add_dependencies(w2xc gensrcs) - - if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES "^(Apple)?Clang$") - set(CMAKE_CXX_STANDARD 17) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") -+ if(CMAKE_COMPILER_IS_GNUCXX) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17") -+ else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") -+ endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -@@ -372,7 +376,7 @@ if(WIN32) - else() - option(INSTALL_MODELS "Install waifu2x RGB models" true) - endif() -- -+ - if(INSTALL_MODELS) - add_definitions(-DDEFAULT_MODELS_DIRECTORY="${CMAKE_INSTALL_PREFIX}/share/waifu2x-converter-cpp") - install(DIRECTORY models_rgb/ DESTINATION share/waifu2x-converter-cpp) --- -2.20.1 - diff --git a/sources b/sources index 3f69984..0f9ab7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waifu2x-converter-cpp-5.2.4.tar.gz) = 01479bef0821f2e1cdd6700a4e45d26d19f5527a260c660539a9bc2321b908d903c61acb8cecd12dcf6f489d32030d17c980b66670c7dbf56b419373cdb0a3f7 +SHA512 (waifu2x-converter-cpp-5.3.1.tar.gz) = eb87c0db2738883ba79d693b0b7cd8e93129e979906de51d65ba35d0cdb50599f780a2713b9895fc06f0c3b9157befaba809a77e8a171e2055066f8a0644ff4a diff --git a/waifu2x-converter-cpp.spec b/waifu2x-converter-cpp.spec index 0210a58..d02f3d6 100644 --- a/waifu2x-converter-cpp.spec +++ b/waifu2x-converter-cpp.spec @@ -1,5 +1,5 @@ Name: waifu2x-converter-cpp -Version: 5.2.4 +Version: 5.3.1 Release: 1%{?dist} Summary: Image Super-Resolution for Anime-style art using OpenCL and OpenCV @@ -9,13 +9,11 @@ Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz # Add soname versioning Patch0: waifu2x-converter-cpp-5.2-set_soversion.patch -# Fix build error on ppc64le -# https://github.com/DeadSix27/waifu2x-converter-cpp/pull/120 -Patch1: 0001-Work-around-ppc64le-build-failure-with-GNU-C-and-std.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: ocl-icd-devel BuildRequires: opencl-headers BuildRequires: opencv-devel Recommends: beignet @@ -69,6 +67,9 @@ cd _build %changelog +* Tue Jul 16 21:56:01 CEST 2019 Robert-André Mauchin - 5.3.1-1 +- Release 5.3.1 (#1725442) + * Tue Mar 26 16:39:11 CET 2019 Robert-André Mauchin - 5.2.4-1 - Release 5.2.4 (#1692338)