Christophe Giboudeaux 2020-09-08 11:01:48 +00:00 committed by Git OBS Bridge
parent 5f8ae1ec65
commit a66c0b4671
5 changed files with 30 additions and 8 deletions

View File

@ -1,14 +1,28 @@
From a913fd2cd5512723be26704d01d9a7e7039f3491 Mon Sep 17 00:00:00 2001
From 60377bb25c4f1c8075e17310b00383a4761c9be0 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 14 Jun 2020 14:57:05 +0200
Subject: [PATCH] Don't use CMake commands not available in CMake 3.9
---
CMakeLists.txt | 2 +-
cmake/FindCImg.cmake | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 537ea01..80960be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@
# knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms.
#
-cmake_minimum_required(VERSION 3.14.0)
+cmake_minimum_required(VERSION 3.9.0)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
message("Build directory is equal to source directory. Binaries will be put in the src directory.")
diff --git a/cmake/FindCImg.cmake b/cmake/FindCImg.cmake
index fbc3f9c..47d1771 100644
index b5c9005..cbbaba6 100644
--- a/cmake/FindCImg.cmake
+++ b/cmake/FindCImg.cmake
@@ -65,7 +65,8 @@ if(ENABLE_CURL)
@ -62,5 +76,5 @@ index fbc3f9c..47d1771 100644
+ INTERFACE_LINK_LIBRARIES "${EXTRA_LIBRARY_TARGETS}"
+)
--
2.27.0
2.28.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 8 10:33:50 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 2.9.2. No changelog.
- Update 0001-Don-t-use-CMake-commands-not-available-in-CMake-3.9.patch
-------------------------------------------------------------------
Sun Jun 14 09:25:43 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -38,7 +38,7 @@
%bcond_with opencv
%endif
Name: gmic
Version: 2.9.1
Version: 2.9.2
Release: 0
Summary: GREYC's Magick for Image Computing (denoise and others)
# gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are
@ -154,6 +154,8 @@ a GUI for G'MIC real-time manipulations on the output of a webcam.
%package bash-completion
Summary: Bash completion for gmic
License: CECILL-2.1
Group: Productivity/Graphics/Bitmap Editors
Requires: bash-completion
Supplements: (%{name} and bash-completion)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50c9dd418b8d0e80c703c2e2b179b6049343567483d37d9ff6c642c6ede95d8d
size 6212626

3
gmic_2.9.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:385db1ef3ef5805bc7bcb65255e188e349fc5e0ae35687b1b914291212bc4c91
size 6639693