2.9.6
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=57
This commit is contained in:
Christophe Giboudeaux
Git OBS Bridge
parent
01a550713a
commit
db1a53cf14
@ -1,80 +0,0 @@
|
||||
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 +++++++++++++++---------
|
||||
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 b5c9005..cbbaba6 100644
|
||||
--- a/cmake/FindCImg.cmake
|
||||
+++ b/cmake/FindCImg.cmake
|
||||
@@ -65,7 +65,8 @@ if(ENABLE_CURL)
|
||||
|
||||
if(CURL_FOUND)
|
||||
list(APPEND COMPILE_FLAGS "cimg_use_curl")
|
||||
- list(APPEND EXTRA_LIBRARY_TARGETS CURL::libcurl)
|
||||
+ list(APPEND EXTRA_LIBRARY_TARGETS ${CURL_LIBRARIES})
|
||||
+ list(APPEND HEADER_DIR ${CURL_INCLUDE_DIRS})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -74,10 +75,11 @@ if(ENABLE_X)
|
||||
find_package(X11)
|
||||
|
||||
if(X11_FOUND)
|
||||
- list(APPEND COMPILE_FLAGS "cimg_display=1" "cimg_appname=\"gmic\"")
|
||||
- list(APPEND EXTRA_LIBRARY_TARGETS X11::X11)
|
||||
+ list(APPEND COMPILE_FLAGS cimg_display=1 cimg_appname=\"gmic\")
|
||||
+ list(APPEND EXTRA_LIBRARY_TARGETS ${X11_LIBRARIES})
|
||||
+ list(APPEND HEADER_DIR ${X11_INCLUDE_DIR})
|
||||
else()
|
||||
- list(APPEND COMPILE_FLAGS "cimg_display=0" "cimg_appname=\"gmic\"")
|
||||
+ list(APPEND COMPILE_FLAGS cimg_display=0 cimg_appname=\"gmic\")
|
||||
endif()
|
||||
|
||||
if(ENABLE_XSHM AND X11_XShm_FOUND)
|
||||
@@ -142,7 +144,8 @@ if(ENABLE_JPEG)
|
||||
|
||||
if(JPEG_FOUND)
|
||||
list(APPEND CLI_COMPILE_FLAGS "cimg_use_jpeg")
|
||||
- list(APPEND EXTRA_LIBRARY_TARGETS JPEG::JPEG)
|
||||
+ list(APPEND EXTRA_LIBRARY_TARGETS ${JPEG_LIBRARIES})
|
||||
+ list(APPEND HEADER_DIR ${JPEG_INCLUDE_DIRS})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -169,7 +172,10 @@ endif()
|
||||
|
||||
add_library(CImg::CImg INTERFACE IMPORTED)
|
||||
|
||||
-target_compile_definitions(CImg::CImg INTERFACE ${COMPILE_FLAGS} ${CLI_COMPILE_FLAGS})
|
||||
-target_link_options(CImg::CImg INTERFACE ${LINK_FLAGS})
|
||||
-target_link_libraries(CImg::CImg INTERFACE ${EXTRA_LIBRARY_TARGETS})
|
||||
-target_include_directories(CImg::CImg INTERFACE ${HEADER_DIR})
|
||||
+set(CIMG_BUILD_FLAGS ${COMPILE_FLAGS} ${CLI_COMPILE_FLAGS})
|
||||
+
|
||||
+set_target_properties(CImg::CImg PROPERTIES
|
||||
+ INTERFACE_COMPILE_DEFINITIONS "${CIMG_BUILD_FLAGS}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${HEADER_DIR}"
|
||||
+ INTERFACE_LINK_LIBRARIES "${EXTRA_LIBRARY_TARGETS}"
|
||||
+)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 10 17:06:54 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 2.9.6. No changelog.
|
||||
- Drop the digikam-plugin-gmic subpackage. Integration was
|
||||
removed upstream.
|
||||
- Drop 0001-Don-t-use-CMake-commands-not-available-in-CMake-3.9.patch
|
||||
no longer needed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 26 15:17:29 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
63
gmic.spec
63
gmic.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gmic
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,19 +26,14 @@
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
|
||||
%bcond_without digikam_plugin
|
||||
%else
|
||||
%bcond_with digikam_plugin
|
||||
%endif
|
||||
# opencv3 is not available for ppc
|
||||
%ifnarch ppc64 ppc64le
|
||||
# opencv3 is not available for ppc64
|
||||
%ifnarch ppc64
|
||||
%bcond_without opencv
|
||||
%else
|
||||
%bcond_with opencv
|
||||
%endif
|
||||
Name: gmic
|
||||
Version: 2.9.4
|
||||
Version: 2.9.6
|
||||
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
|
||||
@ -49,15 +44,10 @@ URL: https://gmic.eu
|
||||
# Git URL: https://framagit.org/dtschump/gmic
|
||||
Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz
|
||||
Source1: gmic_qt.png
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch: 0001-Don-t-use-CMake-commands-not-available-in-CMake-3.9.patch
|
||||
BuildRequires: cmake >= 3.9.4
|
||||
BuildRequires: cmake >= 3.14.0
|
||||
BuildRequires: fftw3-threads-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
%if %{with digikam_plugin}
|
||||
BuildRequires: cmake(DigikamCore) >= 6.3.0
|
||||
%endif
|
||||
BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5LinguistTools)
|
||||
@ -74,12 +64,13 @@ BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libtiff-4)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if %{with opencv}
|
||||
# gmic first looks for opencv 4 first and falls back to opencv 3 if not found.
|
||||
# opencv in not available in leap <= 15.2
|
||||
# gmic first looks for opencv 4 and falls back to opencv 3 if not found.
|
||||
# opencv 4 in not available in leap <= 15.3
|
||||
%if 0%{?suse_version} <= 1500
|
||||
BuildRequires: pkgconfig(opencv)
|
||||
%else
|
||||
BuildRequires: pkgconfig(opencv4)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@ -130,17 +121,6 @@ Requires: krita
|
||||
%description -n krita-plugin-gmic
|
||||
This is a plugin for krita to provide gmic features.
|
||||
|
||||
%if %{with digikam_plugin}
|
||||
%package -n digikam-plugin-gmic
|
||||
Summary: GMIC plugin for digikam
|
||||
License: GPL-3.0-or-later
|
||||
Group: Productivity/Graphics/Bitmap Editors
|
||||
Requires: digikam
|
||||
|
||||
%description -n digikam-plugin-gmic
|
||||
This is a plugin for digikam to provide gmic features.
|
||||
%endif
|
||||
|
||||
%package zart
|
||||
Summary: GMIC GUI for video streams
|
||||
License: CECILL-2.0
|
||||
@ -180,7 +160,7 @@ cd ..
|
||||
# Create link for zart dynamic linking
|
||||
ln -s ../build/libgmic.so src/libgmic.so
|
||||
|
||||
# Build gmic{_gimp|_krita|_digikam}_qt
|
||||
# Build gmic{_gimp|_krita}_qt
|
||||
pushd gmic-qt
|
||||
%cmake \
|
||||
-DENABLE_DYNAMIC_LINKING=ON \
|
||||
@ -200,17 +180,6 @@ cd ..
|
||||
|
||||
cd ..
|
||||
|
||||
%if %{with digikam_plugin}
|
||||
%cmake \
|
||||
-DENABLE_DYNAMIC_LINKING=ON \
|
||||
-DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
|
||||
-DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
|
||||
-DGMIC_QT_HOST=digikam
|
||||
%cmake_build
|
||||
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
%cmake \
|
||||
-DENABLE_DYNAMIC_LINKING=ON \
|
||||
-DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
|
||||
@ -253,12 +222,6 @@ install -m 0755 build/gmic_krita_qt %{buildroot}%{_bindir}/gmic_krita_qt
|
||||
# gimp plugin
|
||||
install -d -m 0755 %{buildroot}%{_gimpplugindir}
|
||||
install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt
|
||||
|
||||
%if %{with digikam_plugin}
|
||||
# digikam plugin
|
||||
install -d -m 0755 %{buildroot}%{_libqt5_plugindir}/digikam/editor
|
||||
install -m 0755 build/Editor_GmicQt_Plugin.so %{buildroot}%{_libqt5_plugindir}/digikam/editor/Editor_GmicQt_Plugin.so
|
||||
%endif
|
||||
popd
|
||||
|
||||
%if %{with opencv}
|
||||
@ -294,14 +257,6 @@ popd
|
||||
%license COPYING
|
||||
%{_bindir}/gmic_krita_qt
|
||||
|
||||
%if %{with digikam_plugin}
|
||||
%files -n digikam-plugin-gmic
|
||||
%license COPYING
|
||||
%dir %{_libqt5_plugindir}/digikam
|
||||
%dir %{_libqt5_plugindir}/digikam/editor
|
||||
%{_libqt5_plugindir}/digikam/editor/Editor_GmicQt_Plugin.so
|
||||
%endif
|
||||
|
||||
%files -n libgmic1
|
||||
%license COPYING
|
||||
%{_libdir}/libgmic.so.*
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:790bee48f496765f6b59067dfb10dc34e1eb576caf9a95f30af0d567026eacc7
|
||||
size 7279628
|
||||
3
gmic_2.9.6.tar.gz
Normal file
3
gmic_2.9.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d22fe8515af16dcd050d09a0bc7127ec29f4795ce732a0c6c3eaf839356bc11a
|
||||
size 7304588
|
||||
Loading…
Reference in New Issue
Block a user