Update to 2.7.1

OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=21
This commit is contained in:
2019-09-15 16:41:42 +00:00
committed by Git OBS Bridge
parent a1642de9f6
commit b3a7989295
8 changed files with 160 additions and 124 deletions

View File

@@ -2,7 +2,7 @@
<constraints> <constraints>
<hardware> <hardware>
<physicalmemory> <physicalmemory>
<size unit="M">1920</size> <size unit="M">2200</size>
</physicalmemory> </physicalmemory>
<processors>3</processors> <processors>3</processors>
</hardware> </hardware>

View File

@@ -1,13 +0,0 @@
Index: gmic-2.4.5/CMakeLists.txt
===================================================================
--- gmic-2.4.5.orig/CMakeLists.txt
+++ gmic-2.4.5/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.9)
+cmake_minimum_required(VERSION 3.5)
cmake_policy(SET CMP0046 OLD)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Sep 8 19:29:39 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 2.7.1, no changelog available
- Use cmake() and pkgconfig() for build requirements when possible
- Run spec-cleaner
- Prepare the spec file for the future gmic-digikam plugin
- Drop cmake-fixes.patch, no longer needed
- Drop gmic_reference.pdf
- Use %cmake_build, remove the ninja dependency
- Trim marketing wording from the description
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 22 16:05:55 UTC 2019 - Marcus Rueckert <mrueckert@suse.de> Wed May 22 16:05:55 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>

238
gmic.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package gmic # spec file for package gmic
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -12,56 +12,74 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins %global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
%global zart_version 20180503git34f7e48 %bcond_without digikam_plugin
%else
# The macro make_jobs gets overwritten by macros.qt5 => ninja doesn't work %bcond_with digikam_plugin
#define __builder ninja %endif
# opencv3 is not available for ppc
%ifnarch ppc64 ppc64le
%bcond_without opencv
%else
%bcond_with opencv
%endif
Name: gmic Name: gmic
Version: 2.6.3 Version: 2.7.1
Release: 0 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
# CECILL-2.1 and CECILL-C
License: CECILL-2.1 AND CECILL-C
Group: Productivity/Graphics/Bitmap Editors
URL: https://gmic.eu URL: https://gmic.eu
# Git URL: https://framagit.org/dtschump/gmic # Git URL: https://framagit.org/dtschump/gmic
Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz
Source1: gmic_qt.desktop Source1: gmic_qt.png
Source2: gmic_qt.png BuildRequires: cmake > 3.8
Source10: http://gmic.eu/gmic_reference.pdf
Patch: cmake-fixes.patch
Summary: GREYC's Magick for Image Computing (denoise and others)
License: CECILL-2.1
Group: Productivity/Graphics/Bitmap Editors
BuildRequires: cmake
BuildRequires: OpenEXR-devel
BuildRequires: fftw3-devel
BuildRequires: fftw3-threads-devel BuildRequires: fftw3-threads-devel
BuildRequires: gcc-c++ BuildRequires: pkgconfig
BuildRequires: gimp-devel BuildRequires: update-desktop-files
BuildRequires: libGraphicsMagick++-devel # Not available yet
BuildRequires: libcurl-devel # %%if %%{with digikam_plugin}
BuildRequires: libjasper-devel # BuildRequires: cmake(DigikamCore) >= 6.3.0
BuildRequires: libjpeg-devel # %%endif
BuildRequires: libqt5-linguist-devel BuildRequires: cmake(Qt5Core)
BuildRequires: libqt5-qtbase-devel BuildRequires: cmake(Qt5Gui)
BuildRequires: libstdc++-devel BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: libtiff-devel BuildRequires: cmake(Qt5Network)
BuildRequires: ninja BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
BuildRequires: pkgconfig(GraphicsMagick++)
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(gimp-2.0)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(zlib)
%if %{with opencv}
# in openSUSE >= 15.2, opencv-devel is opencv4 and pkgconfig(opencv) is opencv3
# ...and opencv3-devel doesn't exist in leap 15.0 and 15.1
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
BuildRequires: opencv-devel BuildRequires: opencv-devel
BuildRequires: pkgconfig(Qt5Widgets) %else
BuildRequires: pkgconfig(opencv)
%endif
%endif
%description %description
G'MIC is an open and full-featured framework for image processing, providing G'MIC is a framework for image processing, providing
several different user interfaces to convert/manipulate/filter/visualize several different user interfaces to convert/manipulate/filter/visualize
generic image datasets, from 1d scalar signals to 3d+t sequences of generic image datasets, from 1d scalar signals to 3d+t sequences of
multi-spectral volumetric images. Technically speaking, what it does is: multi-spectral volumetric images. Technically speaking, what it does is:
* Define a lightweight but powerful script language (the G'MIC language) * Define a lightweight language (the G'MIC language)
dedicated to the design of image processing operators and pipelines. dedicated to the design of image processing operators and pipelines.
* Provide several user interfaces embedding the corresponding interpreter: * Provide several user interfaces embedding the corresponding interpreter:
@@ -99,10 +117,12 @@ G'MIC has superior denoising and sharpening capabilities.
%package -n libgmic1 %package -n libgmic1
Summary: Shared library that belongs to gmic Summary: Shared library that belongs to gmic
License: CECILL-2.1
Group: Productivity/Graphics/Bitmap Editors Group: Productivity/Graphics/Bitmap Editors
%package -n libgmic-devel %package -n libgmic-devel
Summary: Header and library from gmic for use in other C++ projects Summary: Header and library from gmic for use in other C++ projects
License: CECILL-2.1
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libgmic1 = %{version} Requires: libgmic1 = %{version}
@@ -116,11 +136,12 @@ uses the gmic functionality provided by the gmic library.
%package -n gimp-plugin-gmic %package -n gimp-plugin-gmic
Summary: GMIC plugin for gimp Summary: GMIC plugin for gimp
Group: Productivity/Graphics/Bitmap Editors
License: GPL-3.0-or-later License: GPL-3.0-or-later
Group: Productivity/Graphics/Bitmap Editors
Requires: gimp Requires: gimp
Obsoletes: gmic-gimp # This package was only available in the 'graphics' repo
Provides: gmic-gimp Provides: gmic-gimp = %{version}
Obsoletes: gmic-gimp < %{version}
%description -n gimp-plugin-gmic %description -n gimp-plugin-gmic
This is a plugin for gimp that exposes many of the nice gmic features This is a plugin for gimp that exposes many of the nice gmic features
@@ -128,24 +149,28 @@ for interactive use in gimp.
%package -n krita-plugin-gmic %package -n krita-plugin-gmic
Summary: GMIC plugin for krita Summary: GMIC plugin for krita
Group: Productivity/Graphics/Bitmap Editors
License: GPL-3.0-or-later License: GPL-3.0-or-later
Group: Productivity/Graphics/Bitmap Editors
Requires: krita Requires: krita
%description -n krita-plugin-gmic %description -n krita-plugin-gmic
This is a plugin for krita to provide gmic features. This is a plugin for krita to provide gmic features.
%package doc # %%if %%{with digikam_plugin}
Summary: GMIC reference documentation # %%package -n digikam-plugin-gmic
Group: Productivity/Graphics/Bitmap editors # Summary: GMIC plugin for digikam
License: GFDL-1.3-or-later # License: GPL-3.0-or-later
# Group: Productivity/Graphics/Bitmap Editors
%description doc # Requires: digikam
This is the reference documentation for G'MIC in .pdf format. #
# %%description -n digikam-plugin-gmic
# This is a plugin for digikam to provide gmic features.
# %%endif
%package zart %package zart
Summary: GMIC GUI for video streams Summary: GMIC GUI for video streams
Group: Productivity/Graphics/Bitmap editors License: CECILL-2.0
Group: Productivity/Graphics/Bitmap Editors
%description zart %description zart
ZArt is a computer program whose purpose is to demonstrate the possibilities of ZArt is a computer program whose purpose is to demonstrate the possibilities of
@@ -154,61 +179,87 @@ manipulations on a video stream acquired from a webcam. In other words, ZArt is
a GUI for G'MIC real-time manipulations on the output of a webcam. a GUI for G'MIC real-time manipulations on the output of a webcam.
%prep %prep
%autosetup -p1 %setup -q
# Generated file that should not be there
cp %{SOURCE10} . rm -f zart/.qmake.stash
%build %build
# Leap 15.0 doesn't know %%cmake_build
%{?!cmake_build:%define cmake_build() make %{?_smp_mflags} VERBOSE=1}
# Build gmic # Build gmic
%cmake \ %cmake \
-DENABLE_DYNAMIC_LINKING=ON \ -DENABLE_DYNAMIC_LINKING=ON \
-DBUILD_LIB_STATIC=OFF \ -DBUILD_LIB_STATIC=OFF
|| cat CMakeFiles/CMakeError.log %cmake_build
%make_jobs
cd .. cd ..
# Create link for zart dynamic linking # Create link for zart dynamic linking
ln -s ../build/libgmic.so src/libgmic.so ln -s ../build/libgmic.so src/libgmic.so
# Build gmic{_gimp|_krita}_qt # Build gmic{_gimp|_krita|_digikam}_qt
pushd gmic-qt pushd gmic-qt
%cmake \ %cmake \
-DENABLE_DYNAMIC_LINKING=ON \ -DENABLE_DYNAMIC_LINKING=ON \
-DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \ -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
-DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \ -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
-DGMIC_QT_HOST=gimp \ -DGMIC_QT_HOST=gimp
|| cat CMakeFiles/CMakeError.log %cmake_build
%make_jobs
cd .. cd ..
%cmake \ %cmake \
-DENABLE_DYNAMIC_LINKING=ON \ -DENABLE_DYNAMIC_LINKING=ON \
-DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \ -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
-DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \ -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
-DGMIC_QT_HOST=krita \ -DGMIC_QT_HOST=krita
|| cat CMakeFiles/CMakeError.log %cmake_build
%make_jobs
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 \ %cmake \
-DENABLE_DYNAMIC_LINKING=ON \ -DENABLE_DYNAMIC_LINKING=ON \
-DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \ -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
-DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \ -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
-DGMIC_QT_HOST=none \ -DGMIC_QT_HOST=none
|| cat CMakeFiles/CMakeError.log %cmake_build
%make_jobs
cd ..
popd popd
%if %{with opencv}
# Build zart # Build zart
pushd zart pushd zart
qmake-qt5 CONFIG+=release GMIC_DYNAMIC_LINKING=on GMIC_PATH=%{_builddir}/%{name}-%{version}/src zart.pro %qmake5 zart.pro \
make %{?_smp_mflags} CONFIG+=release \
GMIC_DYNAMIC_LINKING=on \
GMIC_PATH=%{_builddir}/%{name}-%{version}/src
%make_jobs
popd popd
%endif
%install %install
%cmake_install %cmake_install
install -d -m 0755 %{buildroot}%{_sysconfdir}/bash_completion.d
install -m 0644 build/resources/gmic_bashcompletion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/gmic install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gmic_qt.png
%suse_update_desktop_file -c gmic_qt "G'Mic Qt" "G'MIC Qt GUI" "gmic_qt %%F" gmic_qt "Qt;Graphics;Photography;"
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions
install -m 0644 build/resources/gmic_bashcompletion.sh %{buildroot}%{_datadir}/bash-completion/completions
# Film color lookup tables # Film color lookup tables
install -d -m 0755 %{buildroot}%{_gimpplugindir} install -d -m 0755 %{buildroot}%{_gimpplugindir}
@@ -226,62 +277,61 @@ install -d -m 0755 %{buildroot}%{_gimpplugindir}
install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt
popd popd
# %%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
%if %{with opencv}
# zart # zart
pushd zart pushd zart
install -m 0755 zart %{buildroot}%{_bindir}/zart install -m 0755 zart %{buildroot}%{_bindir}/zart
popd popd
%endif
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/applications/gmic_qt.desktop %post -n libgmic1 -p /sbin/ldconfig
install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/pixmaps/gmic_qt.png %postun -n libgmic1 -p /sbin/ldconfig
%post -n libgmic1
%{run_ldconfig}
%postun -n libgmic1
%{run_ldconfig}
%files %files
%defattr(-,root,root)
%license COPYING %license COPYING
#license gmic-qt/COPYING
%doc README gmic-qt/README.md %doc README gmic-qt/README.md
%{_bindir}/gmic %{_bindir}/gmic
%{_bindir}/gmic_qt %{_bindir}/gmic_qt
%{_mandir}/man1/gmic.1* %{_mandir}/man1/gmic.1%{?ext_man}
%config %attr(0644,root,root) /etc/bash_completion.d/gmic
%{_datadir}/applications/gmic_qt.desktop %{_datadir}/applications/gmic_qt.desktop
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/gmic_bashcompletion.sh
%{_datadir}/pixmaps/gmic_qt.png %{_datadir}/pixmaps/gmic_qt.png
%files doc %if %{with opencv}
%defattr(-,root,root)
%doc gmic_reference.pdf
%files zart %files zart
%defattr(-,root,root)
#license zart/LICENSE
#doc zart/README
%{_bindir}/zart %{_bindir}/zart
%endif
%files -n gimp-plugin-gmic %files -n gimp-plugin-gmic
%defattr(-,root,root) %license COPYING
#license gmic-qt/COPYING
%doc gmic-qt/README.md
%{_gimpplugindir}/gmic_gimp_qt %{_gimpplugindir}/gmic_gimp_qt
%{_gimpplugindir}/gmic_cluts.gmz %{_gimpplugindir}/gmic_cluts.gmz
%files -n krita-plugin-gmic %files -n krita-plugin-gmic
%defattr(-,root,root) %license COPYING
#license gmic-qt/COPYING
%doc gmic-qt/README.md
%{_bindir}/gmic_krita_qt %{_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 %files -n libgmic1
%defattr(-,root,root)
%license COPYING %license COPYING
%{_libdir}/libgmic.so.* %{_libdir}/libgmic.so.*
%files -n libgmic-devel %files -n libgmic-devel
%defattr(-,root,root)
%{_includedir}/gmic.h %{_includedir}/gmic.h
%{_libdir}/libgmic.so %{_libdir}/libgmic.so
%{_libdir}/cmake/gmic/ %{_libdir}/cmake/gmic/

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a3947850ad8e6997039ebf8d03ce8ac371f2a01c3ec6330e7d8d447932cbb47
size 5537926

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

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

View File

@@ -1,10 +0,0 @@
[Desktop Entry]
Value=1.0
Type=Application
Name=G'MIC Qt
GenericName=G'MIC Qt GUI
Comment=GREYC's Magic for Image Computing
Icon=gmic_qt
Exec=/usr/bin/gmic_qt %F
Categories=Graphics;Photography;Qt;
Terminal=false

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b926aaf95417accf734b6f1bb866d1541a7f79033b0d89ba03ef07f499d13d1
size 60443455