diff --git a/.gitignore b/.gitignore index 359a03d..c8a6374 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,4 @@ x86_64/ /gmic-community-*.tar.gz /gmic-community/ /zart*.tar.gz -/zart/ -/41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch +/zart/ \ No newline at end of file diff --git a/Makefile_arch.patch b/Makefile_arch.patch new file mode 100644 index 0000000..ddbd038 --- /dev/null +++ b/Makefile_arch.patch @@ -0,0 +1,11 @@ +--- gmic-2.9.1/src/Makefile.orig 2020-06-10 15:43:15.000000000 +0200 ++++ gmic-2.9.1/src/Makefile 2020-06-12 09:33:42.374067915 +0200 +@@ -194,7 +194,7 @@ + FLTO = -flto + OPT_CLI_CFLAGS = + ifdef IS_GCC +-OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO) ++OPT_CLI_CFLAGS = -Ofast $(FLTO) + OPT_CLI_LIBS = $(FLTO) + endif + ifdef icpc diff --git a/changelog b/changelog deleted file mode 100644 index 88cb777..0000000 --- a/changelog +++ /dev/null @@ -1,397 +0,0 @@ -* Wed Jun 11 2025 josef radinger - 3.5.5-1 -- bump version - -* Wed Jan 29 2025 josef radinger - 3.5.2-1 -- bump version -- set HOST=gimp -- add /usr/share/gmic/gmic_scale2x_cnn.gmz to gimp-subpackage - -* Thu Jan 16 2025 Fedora Release Engineering - 3.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 07 2025 josef radinger - 3.5.0-2 -- try to fix compilation -- switch to new git-repo (https://github.com/GreycLab/gmic-qt - instead of https://github.com/c-koi/gmic-qt) - - -* Sat Jan 04 2025 josef radinger - 3.5.0-1 -- bump version - -* Fri Oct 25 2024 Orion Poplawski - 3.4.3-2 -- Rebuild for hdf5 1.14.5 - -* Mon Oct 14 2024 josef radinger - 3.4.3-1 -- bump version - -* Thu Sep 12 2024 josef radinger - 3.4.2-5 -- missed the release being still on -4 -- Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch no longer needed - - -* Thu Sep 12 2024 josef radinger - 3.4.2-1 -- bump version -- Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch no longer be needed -- Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch no longer needed - -* Thu Aug 29 2024 Daniel P. Berrangé - 3.4.0-4 -- Update to new versions -- Fix GIMP 2.99.19 compat - -* Thu Jul 25 2024 Sérgio Basto - 3.4.0-3 -- Rebuild for opencv 4.10.0 - -* Thu Jul 18 2024 Fedora Release Engineering - 3.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 24 2024 josef radinger - 3.4.0-1 -- bump version - -* Fri May 31 2024 Sérgio Basto - 3.3.6-1 -- Update gmic to 3.3.6 (#2083488) - -* Wed May 08 2024 Sérgio Basto - 3.3.5-1 -- Update gmic to 3.3.5 (#2083488) - -* Wed Apr 24 2024 Benjamin A. Beasley - 3.3.1-5 -- Rebuilt for openexr 3.2.4 - -* Mon Feb 05 2024 Sérgio Basto - 3.3.1-4 -- Rebuild for opencv 4.9.0 - -* Wed Jan 24 2024 Fedora Release Engineering - 3.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 09 2023 josef radinger - 3.3.1-1 -- bump version - -* Mon Aug 07 2023 Sérgio Basto - 3.2.6-3 -- Rebuild for opencv 4.8.0 - -* Wed Jul 19 2023 Fedora Release Engineering - 3.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 26 2023 josef radinger - 3.2.6-1 -- bump version - -* Tue May 30 2023 josef radinger - 3.2.5-1 -- bump version - -* Mon May 22 2023 josef radinger - 3.2.4-1 -- bump version -- remove Patch3 -- adjust rpath removal - -* Thu Jan 19 2023 Fedora Release Engineering - 3.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 16 2023 Sérgio Basto - 3.1.6-3 -- Rebuild for opencv 4.7.0 - -* Sun Nov 13 2022 josef radinger - 3.1.6-2 -- build - -* Tue Nov 08 2022 Sérgio Basto - 3.1.6-1 -- Update to 3.1.6 - -* Sun Oct 09 2022 Kalev Lember - 3.1.0-5 -- Split out gmic-libs to a subpackage - -* Wed Sep 07 2022 Kalev Lember - 3.1.0-4 -- Clean up multilib path install - -* Thu Jul 21 2022 Fedora Release Engineering - 3.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 21 2022 Sérgio Basto - 3.1.0-2 -- Rebuilt for opencv 4.6.0 - -* Thu Apr 28 2022 josef radinger - 3.1.0-1 -- bump version -- disable patch0 -- disable patch2 -- BuildRequires: chrpath - -* Wed Jan 26 2022 josef radinger - 3.0.2-1 -- bump version - -* Thu Jan 20 2022 Fedora Release Engineering - 3.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jan 14 2022 josef radinger -3.0.1-1 -- bump version -- add gmic_denoise_cnn.gmz to gimp-subpackage - -* Sat Dec 11 2021 josef radinger -3.0.0-1 -- bump version - -* Thu Nov 25 2021 Orion Poplawski - 2.9.9-2 -- Rebuild for hdf5 1.12.1 - -* Mon Sep 06 2021 josef radinger - 2.9.9-1 -- bump version - -* Sat Aug 21 2021 Richard Shaw - 2.9.8-4 -- Rebuild for OpenEXR/Imath 3.1. - -* Sat Jul 31 2021 Richard Shaw - 2.9.8-3 -- Rebuild with OpenEXR/Imath 3. - -* Thu Jul 22 2021 Fedora Release Engineering - 2.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 20 2021 josef radinger - 2.9.8-1 -- bump version - -* Fri Apr 09 2021 josef radinger - 2.9.7-1 -- bump version - -* Thu Feb 11 2021 josef radinger - 2.9.6-1 -- bump version - -* Tue Jan 26 2021 Fedora Release Engineering - 2.9.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 12 2021 Mamoru TASAKA - 2.9.4-5 -- Again try to build on all archs - -* Tue Jan 12 2021 Mamoru TASAKA - 2.9.4-4 -- Once make this package available on buildable arch - -* Mon Jan 04 2021 josef radinger - 2.9.4-3 -- remove stray stash file - -* Fri Jan 01 2021 Richard Shaw - 2.9.4-2 -- Rebuild for OpenEXR 2.5.3. - -* Tue Nov 24 2020 josef radinger - 2.9.4-1 -- bump version - -* Thu Nov 19 2020 josef radinger - 2.9.3-1 -- bump version - -* Thu Oct 22 2020 Nicolas Chauvet - 2.9.2-4 -- Rebuilt for OpenCV - -* Tue Sep 08 2020 josef radinger - 2.9.2-3 -- we now have desktop-files - -* Tue Sep 08 2020 josef radinger - 2.9.2-1 -- bump version - -* Sat Aug 01 2020 Fedora Release Engineering - 2.9.1-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jun 12 2020 josef radinger - 2.9.1-2 -- rebuild - -* Fri Jun 12 2020 josef radinger - 2.9.1-1 -- bump version -- remove patch1 (for new opencv) - -* Thu Jun 04 2020 Nicolas Chauvet - 2.9.0-4 -- Rebuilt for OpenCV 4.3 - -* Thu Apr 2 2020 josef radinger - 2.9.0-3 -- enable mtune on aarch64 - -* Thu Apr 2 2020 josef radinger - 2.9.0-2 -- disable mtune=generic for s390x, armv7hl and ppc64le - -* Mon Mar 30 2020 josef radinger - 2.9.0-1 -- bump version -- update gmic_opencv.patch - -* Thu Feb 13 2020 josef radinger - 2.8.4-1 -- bump version - -* Tue Jan 28 2020 Fedora Release Engineering - 2.8.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 28 2020 Nicolas Chauvet - 2.8.3-2 -- Rebuild for OpenCV 4.2 - -* Fri Jan 24 2020 josef radinger - 2.8.3-1 -- bump version - -* Wed Jan 15 2020 josef radinger - 2.8.2-1 -- bump version - -* Sun Dec 29 2019 Nicolas Chauvet - 2.7.4-4 -- Rebuilt for opencv4 - -* Fri Oct 18 2019 josef radinger - 2.7.4-3 -- add patch for building against opencv 4.1.2 - -* Fri Oct 18 2019 josef radinger - 2.7.4-2 -- rebuild against opencv 4.1.2 - -* Tue Oct 15 2019 josef radinger - 2.7.4-1 -- bump version - -* Wed Sep 11 2019 Mamoru TASAKA - 2.7.0-2 -- Rebuild for opencv (with vtk disabled) - -* Thu Aug 15 2019 josef radinger - 2.7.0-1 -- bump version - -* Thu Jul 25 2019 Fedora Release Engineering - 2.6.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 19 2019 josef radinger - 2.6.6-1 -- bump version - -* Tue May 28 2019 josef radinger - 2.6.4-1 -- bump version - -* Thu Apr 18 2019 josef radinger - 2.5.7-1 -- bump version - -* Thu Apr 11 2019 Richard Shaw - 2.5.6-2 -- Rebuild for OpenEXR/Ilmbase 2.3.0. -- Move licences files to %%license. - -* Mon Apr 08 2019 josef radinger - 2.5.6-1 -- bump version - -* Sat Mar 30 2019 josef radinger - 2.5.5-1 -- bump version - -* Sun Mar 24 2019 josef radinger - 2.5.4-1 -- bump version - -* Mon Mar 18 2019 Orion Poplawski - 2.5.3-2 -- Rebuild for hdf5 1.10.5 - -* Sun Mar 17 2019 josef radinger - 2.5.3-1 -- bump version -- use gmic_cluts.gmz instead of gmic_film_cluts.gmz - -* Sat Mar 16 2019 josef radinger - 2.5.2-1 -- bump version - -* Thu Jan 31 2019 Fedora Release Engineering - 2.4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 21 2019 josef radinger - 2.4.5-1 -- bump version -- create %%{_sysconfdir}/bash_completion.d and move the file - -* Tue Oct 16 2018 Daniel P. Berrangé - 2.4.0-1 -- Update to 2.4.0 release - -* Tue Sep 4 2018 Daniel P. Berrangé - 2.3.6-1 -- Update to 2.3.6 release -- Drop BuildRoot and Group tags -- Use system CImg -- Update URL tag - -* Mon Jul 23 2018 Daniel P. Berrangé - 2.3.3-1 -- Updated to latest release / snapshots -- Add BR on gcc-c++ - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Mar 05 2018 Adam Williamson - 2.2.0-2 -- Rebuild for opencv soname bump - -* Thu Feb 22 2018 Daniel P. Berrange - 2.2.0-1 -- Update to new 2.2.0 upstream release -- Some parts now licensed under choice of CeCILL or CeCILL-C - -* Wed Feb 07 2018 Fedora Release Engineering - 2.1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 11 2018 Daniel P. Berrange - 2.1.8-1 -- Update to new 2.1.8 upstream release -- Remove bogus -static sub-RPM which contained shared libs - -* Thu Jan 04 2018 josef radinger - 1.7.2-6 -- Rebuilt for libopencv - -* Wed Aug 02 2017 Fedora Release Engineering - 1.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Mar 2 2017 Fedora Release Engineering - 1.7.2-3 -- Rebuild due to opencv soname change - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jun 4 2016 josef radinger - 1.7.2-1 -- bump version - -* Sun May 8 2016 josef radinger - 1.7.1-2 -- rebuild for rawhide - -* Fri Apr 29 2016 josef radinger - 1.7.1-1 -- bump version -- update Patch1 -- fix link on libgmic -- remove smp_mflags (because of compile-errors) -- split a *-static package - -* Fri Feb 5 2016 josef radinger - 1.6.9-1 -- bump version -- update Patch1 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.6.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 7 2015 josef radinger - 1.6.8-1 -- bump version - -* Sat Oct 24 2015 josef radinger - 1.6.7-1 -- bump version -- new downloadurl - -* Tue Oct 13 2015 josef radinger - 1.6.6.1-1 -- bump version - -* Tue Jun 23 2015 Daniel P. Berrange - 1.6.5.0-1 -- Update to 1.6.5.0 release -- Enable zart binary build - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun May 10 2015 Daniel P. Berrange - 1.6.2.0-1 -- Update to 1.6.2.0 release - -* Sat May 02 2015 Kalev Lember - 1.6.1.0-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Mar 20 2015 Daniel P. Berrange - 1.6.1.0-1 -- Update to 1.6.1.0 release - -* Fri Feb 6 2015 Daniel P. Berrange - 1.6.0.4-1 -- Update to 1.6.0.4 release - -* Fri Dec 19 2014 Daniel P. Berrange - 1.6.0.3-1 -- Update to 1.6.0.3 release - -* Wed Nov 26 2014 Rex Dieter 1.6.0.1-2 -- rebuild (openexr), s|qt-devel|qt4-devel|, tighten subpkg deps - -* Fri Oct 3 2014 Daniel P. Berrange - 1.6.0.1-1 -- Update to 1.6.0.1 release - -* Mon Aug 25 2014 Daniel P. Berrange - 1.6.0.0-1 -- Update to 1.6.0.0 release - -* Sat Aug 16 2014 Fedora Release Engineering - 1.5.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 23 2014 Daniel P. Berrange - 1.5.9.4-1 -- Initial Fedora package after review (rhbz #1061801) diff --git a/gmic-openexr3.patch b/gmic-openexr3.patch new file mode 100644 index 0000000..6cde4fe --- /dev/null +++ b/gmic-openexr3.patch @@ -0,0 +1,31 @@ +Index: gmic-2.9.7/cmake/FindCImg.cmake +=================================================================== +--- gmic-2.9.7.orig/cmake/FindCImg.cmake ++++ gmic-2.9.7/cmake/FindCImg.cmake +@@ -147,7 +147,10 @@ if(ENABLE_JPEG) + endif() + + if(ENABLE_OPENEXR) +- find_package(OpenEXR) ++ find_package(OpenEXR CONFIG) ++ if(NOT TARGET OpenEXR::OpenEXR) ++ find_package(OpenEXR) ++ endif() + + if(OpenEXR_FOUND) + list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr") +Index: gmic-2.9.7/src/Makefile +=================================================================== +--- gmic-3.0.0.orig/src/Makefile ++++ gmic-3.0.0/src/Makefile +@@ -307,8 +307,8 @@ + + # Enable native support of EXR image files, using the OpenEXR library. + # (http://www.openexr.com/) +-OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR) +-OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) ++OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath) ++OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath) + + # Enable Fast Fourier Transforms, using the FFTW3 library. + # (http://www.fftw.org/) diff --git a/gmic-prefix-fixes.patch b/gmic-prefix-fixes.patch new file mode 100644 index 0000000..761a889 --- /dev/null +++ b/gmic-prefix-fixes.patch @@ -0,0 +1,243 @@ +--- ./src/Makefile.old 2022-11-08 03:18:08.964802055 +0000 ++++ ./src/Makefile 2022-11-08 03:18:12.482790804 +0000 +@@ -80,14 +80,15 @@ + + # Try to auto-detect target OS. + OS = $(shell uname) +-USR = /usr +-LIB = lib +-BIN = bin +-INCLUDE = include ++PREFIX ?= /usr ++LIB ?= lib ++BIN ?= bin ++INCLUDE ?= include + PIC = -fPIC + EXE = + WGET = wget --no-check-certificate --quiet -O + PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins ++BASH_COMPLETIONSDIR = $(shell pkg-config --variable completionsdir bash-completion || echo $(PREFIX)/share/bash-completion/completions) + VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3) + VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1) + VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1) +@@ -120,12 +121,12 @@ endif + + ifeq ($(OS),FreeBSD) + OS = Unix +-USR = /usr/local ++PREFIX = /usr/local + endif + + ifeq ($(OS),DragonFly) + OS = Unix +-USR = /usr/local ++PREFIX = /usr/local + endif + + ifeq ($(OS),NetBSD) +@@ -134,15 +135,15 @@ endif + + ifneq (,$(findstring MINGW,$(OS))) + OS = Windows +-USR = /mingw64 ++PREFIX = /mingw64 + endif + + ifeq ($(OS),Darwin) + ifeq (,$(wildcard /opt/local)) +-USR = /usr/local ++PREFIX = /usr/local + PLUGINDIR = $(HOME)/Library/Application\ Support/Gimp/plug-ins + else +-USR = /opt/local ++PREFIX = /opt/local + endif + WGET = curl -k -L --silent -o + endif +@@ -181,13 +182,13 @@ NO_PRERELEASE = $(shell date +%y%m%d) + NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\"" + + # Minimal set of flags mandatory to compile G'MIC. +-MANDATORY_CFLAGS = -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS) ++MANDATORY_CFLAGS = -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(PREFIX)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS) + MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS) + + ifndef NO_SRIPDLIB + MANDATORY_CFLAGS += -std=c++11 -pedantic + endif +-MANDATORY_LIBS += -L. -L$(USR)/$(LIB) -Wl,-rpath,. ++MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) -Wl,-rpath,. + ifdef IS_GCC + MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label + GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5) +@@ -264,7 +265,7 @@ endif + # Enable faster X11 display, using XShm extension. + # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml) + XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm) +-XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext ++XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(PREFIX)/X11R6/lib) -lXext + + # Enable image display, using GDI32 (Windows). + GDI32_CFLAGS = -Dcimg_display=2 +@@ -317,12 +318,12 @@ OPENCV_LIBS = $(shell pkg-config opencv + + # Enable support of most classical image file formats, using the GraphicsMagick++ library. + # (http://www.graphicsmagick.org/Magick++/) +-MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick) ++MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(PREFIX)/$(INCLUDE)/GraphicsMagick) + MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++) + + # Enable native support of EXR image files, using the OpenEXR library. + # (http://www.openexr.com/) +-OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR) ++OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(PREFIX)/$(INCLUDE)/OpenEXR) + OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) + + # Enable Fast Fourier Transforms, using the FFTW3 library. +@@ -439,7 +440,7 @@ cli_shared: + + # CLI (static). + #-------------- +-GMIC_STATIC_CLI_PATH = $(USR)/$(LIB)/x86_64-linux-gnu ++GMIC_STATIC_CLI_PATH = $(PREFIX)/$(LIB)/x86_64-linux-gnu + GMIC_STATIC_CLI_EXTRA = + GMIC_STATIC_CLI_CFLAGS = -Dcimg_display=0 $(MANDATORY_CFLAGS) $(OPENMP_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(ZLIB_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(FFTW_CFLAGS) + GMIC_STATIC_CLI_LIBS = ./libgmic.o $(PARALLEL_LIBS) \ +@@ -818,84 +819,78 @@ man: + # Install / uninstall / clean. + #----------------------------- + install: +- mkdir -p $(DESTDIR)$(USR)/$(INCLUDE) +- mkdir -p $(DESTDIR)$(USR)/$(BIN) ++ mkdir -p $(DESTDIR)$(PREFIX)/$(INCLUDE) ++ mkdir -p $(DESTDIR)$(PREFIX)/$(BIN) + mkdir -p $(DESTDIR)$(PLUGINDIR) +- mkdir -p $(DESTDIR)$(USR)/share +- mkdir -p $(DESTDIR)$(USR)/$(LIB) +- @if [ -f gmic ]; then cp -f gmic $(DESTDIR)$(USR)/$(BIN); fi +- @if [ -f gmic_libc.h ]; then cp -f gmic_libc.h $(DESTDIR)$(USR)/$(INCLUDE)/; fi ++ mkdir -p $(DESTDIR)$(PREFIX)/share ++ mkdir -p $(DESTDIR)$(PREFIX)/$(LIB) ++ @if [ -f gmic ]; then cp -f gmic $(DESTDIR)$(PREFIX)/$(BIN); fi ++ @if [ -f gmic_libc.h ]; then cp -f gmic_libc.h $(DESTDIR)$(PREFIX)/$(INCLUDE)/; fi + @if [ -f ../resources/gmic_cluts.gmz ]; then cp -f ../resources/gmic_cluts.gmz $(DESTDIR)$(PLUGINDIR); fi + @if [ -f ../resources/gmic_denoise_cnn.gmz ]; then cp -f ../resources/gmic_denoise_cnn.gmz $(DESTDIR)$(PLUGINDIR); fi +- @if [ -f ../zart/zart ]; then cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN); fi +- @if [ -f ../gmic-qt/gmic_qt ]; then cp -f ../gmic-qt/gmic_qt $(DESTDIR)$(USR)/$(BIN); fi ++ @if [ -f ../zart/zart ]; then cp -f ../zart/zart $(DESTDIR)$(PREFIX)/$(BIN); fi ++ @if [ -f ../gmic-qt/gmic_qt ]; then cp -f ../gmic-qt/gmic_qt $(DESTDIR)$(PREFIX)/$(BIN); fi + @if [ -f ../gmic-qt/gmic_gimp_qt ]; then cp -f ../gmic-qt/gmic_gimp_qt $(DESTDIR)$(PLUGINDIR); fi + @if [ -f libgmic.so ]; then \ +- cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE); \ +- cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.$(VERSION); \ +- ln -fs libgmic.so.$(VERSION) $(DESTDIR)$(USR)/$(LIB)/libgmic.so.$(VERSION1); \ +- ln -fs libgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libgmic.so; \ ++ cp -f gmic.h $(DESTDIR)$(PREFIX)/$(INCLUDE); \ ++ cp -f libgmic.so $(DESTDIR)$(PREFIX)/$(LIB)/libgmic.so.$(VERSION); \ ++ ln -fs libgmic.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libgmic.so.$(VERSION1); \ ++ ln -fs libgmic.so.$(VERSION1) $(DESTDIR)$(PREFIX)/$(LIB)/libgmic.so; \ + fi + @if [ -f libcgmic.so ]; then \ +- cp -f gmic_libc.h $(DESTDIR)$(USR)/$(INCLUDE); \ +- cp -f libcgmic.so $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.$(VERSION); \ +- ln -fs libcgmic.so.$(VERSION) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.$(VERSION1); \ +- ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \ ++ cp -f gmic_libc.h $(DESTDIR)$(PREFIX)/$(INCLUDE); \ ++ cp -f libcgmic.so $(DESTDIR)$(PREFIX)/$(LIB)/libcgmic.so.$(VERSION); \ ++ ln -fs libcgmic.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libcgmic.so.$(VERSION1); \ ++ ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(PREFIX)/$(LIB)/libcgmic.so; \ + fi + @if [ -f ../man/gmic.1.gz ]; then \ +- mkdir -p $(DESTDIR)$(USR)/share/man/man1; \ +- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1; \ +- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz; \ +- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/man/fr/man1; \ ++ cp -f ../man/gmic.1.gz $(DESTDIR)$(PREFIX)/share/man/man1/gmic.1.gz; \ ++ cp -f ../man/gmic.1.gz $(DESTDIR)$(PREFIX)/share/man/fr/man1/gmic.1.gz; \ + fi + @if [ -f ../resources/gmic_bashcompletion.sh ]; then \ +- if [ -d /usr/share/bash-completion/completions ]; then \ +- mkdir -p $(DESTDIR)/usr/share/bash-completion/completions; \ +- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; \ +- fi; \ +- if [ -d /opt/local/etc/bash_completion.d/ ]; then \ +- mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d; \ +- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; \ +- fi; \ ++ mkdir -p $(DESTDIR)$(BASH_COMPLETIONSDIR); \ ++ cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)$(BASH_COMPLETIONSDIR)/gmic; \ + fi + @if [ -f ../zart/zart ]; then \ +- mkdir -p $(DESTDIR)$(USR)/share/applications; \ +- mkdir -p $(DESTDIR)$(USR)/share/icons/hicolor/48x48/apps; \ +- mkdir -p $(DESTDIR)$(USR)/share/icons/hicolor/scalable/apps; \ +- cp -f ../zart/zart.desktop $(DESTDIR)$(USR)/share/applications; \ +- cp -f ../zart/icons/48-zart.png $(DESTDIR)$(USR)/share/icons/hicolor/48x48/apps/zart.png; \ +- cp -f ../zart/icons/zart.svg $(DESTDIR)$(USR)/share/icons/hicolor/scalable/apps; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/applications; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps; \ ++ cp -f ../zart/zart.desktop $(DESTDIR)$(PREFIX)/share/applications; \ ++ cp -f ../zart/icons/48-zart.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/zart.png; \ ++ cp -f ../zart/icons/zart.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps; \ + fi + @if [ -f ../gmic-qt/gmic_qt ]; then \ +- mkdir -p $(DESTDIR)$(USR)/share/applications; \ +- mkdir -p $(DESTDIR)$(USR)/share/icons/hicolor/48x48/apps; \ +- mkdir -p $(DESTDIR)$(USR)/share/icons/hicolor/scalable/apps; \ +- cp -f ../gmic-qt/gmic_qt.desktop $(DESTDIR)$(USR)/share/applications; \ +- cp -f ../gmic-qt/icons/application/48-gmic_qt.png $(DESTDIR)$(USR)/share/icons/hicolor/48x48/apps/gmic_qt.png; \ +- cp -f ../gmic-qt/icons/application/gmic_qt.svg $(DESTDIR)$(USR)/share/icons/hicolor/scalable/apps; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/applications; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps; \ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps; \ ++ cp -f ../gmic-qt/gmic_qt.desktop $(DESTDIR)$(PREFIX)/share/applications; \ ++ cp -f ../gmic-qt/icons/application/48-gmic_qt.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/gmic_qt.png; \ ++ cp -f ../gmic-qt/icons/application/gmic_qt.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps; \ + fi + + uninstall: + rm -f $(DESTDIR)$(PLUGINDIR)/gmic_gimp_qt +- rm -f $(DESTDIR)$(USR)/$(BIN)/gmic +- rm -f $(DESTDIR)$(USR)/$(BIN)/zart +- rm -f $(DESTDIR)$(USR)/$(BIN)/gmic_qt +- rm -f $(DESTDIR)$(USR)/$(INCLUDE)/gmic.h +- rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.$(VERSION) +- rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.$(VERSION1) +- rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so +- rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.$(VERSION) +- rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.$(VERSION1) +- rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic.so +- rm -rf $(DESTDIR)$(USR)/share/doc/gmic/ +- rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz +- rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz +- rm -f $(DESTDIR)$(USR)/share/applications/zart.desktop +- rm -f $(DESTDIR)$(USR)/share/icons/hicolor/48x48/apps/zart.png +- rm -f $(DESTDIR)$(USR)/share/icons/hicolor/scalable/apps/zart.svg +- rm -f $(DESTDIR)$(USR)/share/applications/gmic_qt.desktop +- rm -f $(DESTDIR)$(USR)/share/icons/hicolor/48x48/apps/gmic_qt.png +- rm -f $(DESTDIR)$(USR)/share/icons/hicolor/scalable/apps/gmic_qt.svg ++ rm -f $(DESTDIR)$(PREFIX)/$(BIN)/gmic ++ rm -f $(DESTDIR)$(PREFIX)/$(BIN)/zart ++ rm -f $(DESTDIR)$(PREFIX)/$(BIN)/gmic_qt ++ rm -f $(DESTDIR)$(PREFIX)/$(INCLUDE)/gmic.h ++ rm -f $(DESTDIR)$(PREFIX)/$(LIB)/libgmic.so.$(VERSION) ++ rm -f $(DESTDIR)$(PREFIX)/$(LIB)/libgmic.so.$(VERSION1) ++ rm -f $(DESTDIR)$(PREFIX)/$(LIB)/libgmic.so ++ rm -f $(DESTDIR)$(PREFIX)/$(LIB)/libcgmic.so.$(VERSION) ++ rm -f $(DESTDIR)$(PREFIX)/$(LIB)/libcgmic.so.$(VERSION1) ++ rm -f $(DESTDIR)$(PREFIX)/$(LIB)/libcgmic.so ++ rm -rf $(DESTDIR)$(PREFIX)/share/doc/gmic/ ++ rm -f $(DESTDIR)$(PREFIX)/share/man/man1/gmic.1.gz ++ rm -f $(DESTDIR)$(PREFIX)/share/man/fr/man1/gmic.1.gz ++ rm -f $(DESTDIR)$(PREFIX)/share/applications/zart.desktop ++ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/zart.png ++ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/zart.svg ++ rm -f $(DESTDIR)$(PREFIX)/share/applications/gmic_qt.desktop ++ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/gmic_qt.png ++ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/gmic_qt.svg + + distclean: clean + diff --git a/gmic.spec b/gmic.spec index 873b12a..04e95db 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,26 +1,24 @@ -%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins +%global gimpplugindir %(gimptool --gimpplugindir)/plug-ins %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20231127gitd014169 -%global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251227git7e21d80b +%global zart_version 20220629git34ebf6c +%global gmic_qt_version 20221109git44b0ed3 +%global gmic_community_version 20221112git98b7617 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.6 -%global shortver %(foo=%{version}; echo ${foo//./}) -Release: %autorelease +Version: 3.1.6 +Release: 2%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart Source1: zart-%{zart_version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/gmic-qt -Source2: gmic-qt-%{gmic_qt_version}.tar.gz +# Source2: gmic-qt-%{gmic_qt_version}.tar.gz # GIT archive snapshot of https://github.com/dtschump/gmic-community Source3: gmic-community-%{gmic_community_version}.tar.gz - -License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later +License: (CeCILL or CeCILL-C) and GPLv3+ Url: http://gmic.eu/ %if %{use_system_cimg} BuildRequires: CImg-devel == 1:%{version} @@ -44,24 +42,25 @@ BuildRequires: hdf5-devel BuildRequires: opencv-devel BuildRequires: GraphicsMagick-c++-devel BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-linguist BuildRequires: libcurl-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: make +#BuildRequires: cmake BuildRequires: chrpath -Provides: bundled(zart) = %{zart_version} -Provides: bundled(gmic-qt) = %{gmic_qt_version} -Provides: bundled(gmic-community) = %{gmic_community_version} - Requires: %{name}-libs%{?_isa} = %{version}-%{release} # The C library binding was mistakenly put in a -static # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 -# we no longer have gimp-devel-tools on s390x -ExcludeArch: s390x + +#Patch0: gmic-openexr3.patch +#Patch2: Makefile_arch.patch +# Backported from upstream +# https://github.com/GreycLab/gmic/pull/412 +Patch3: gmic-prefix-fixes.patch + %description G'MIC is an open and full-featured framework for image processing, providing @@ -107,16 +106,15 @@ Provides G'MIC shared libraries %prep %setup -q -a 1 -a 3 -# gmic bundles 'qt', but we don't assume they have the latest -# version, so remove it and provide our own -rm -rf gmic-qt -tar zxvf %{SOURCE2} +#%if 0%{?fedora} > 34 +#%patch0 -p1 +#%endif -cd gmic-qt -# no longer needed -#%%patch 1 -p1 -#%%patch 2 -p1 -#%%patch 3 -p1 +#%ifarch armv7hl s390x ppc64le +#%patch2 -p1 -b.arch +#%endif + +%patch3 -p1 -F1 -b.prefix-fixes # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -143,6 +141,11 @@ make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 PREFIX=%{_prefix} LIB=%{_lib} cli lib cd ../gmic-qt %{qmake_qt5} CONFIG+=release GMIC_PATH=../src HOST=gimp gmic_qt.pro && %{make_build} %{qmake_qt5} CONFIG+=release GMIC_PATH=../src HOST=none gmic_qt.pro && %{make_build} +#%%define gmic_qt_options -DGMIC_PATH=../src -DENABLE_SYSTEM_GMIC=OFF -DENABLE_DYNAMIC_LINKING=ON +#%%cmake %{gmic_qt_options} -DGMIC_QT_HOST=none +#%%cmake_build +#%%cmake %{gmic_qt_options} -DGMIC_QT_HOST=gimp +#%%cmake_build cd ../zart %{qmake_qt5} CONFIG+=release GMIC_PATH=../src zart.pro && %{make_build} @@ -170,8 +173,8 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic # remove rpaths chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gmic -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.%{shortver} -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.%{shortver} +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.316 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.316 %ldconfig_scriptlets libs @@ -184,42 +187,6 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -# Handle upgrades across the Gimp 3 transition, which required -# moving the plugin into a sub-directory. -# -# cpio can't handle file -> dir replacements, so must manually -# purge the old file path. -# -# Then also handle upgrades from a botched update to 3.5.5 which -# created an extra sub-directory level. -# -# cpio can't handle dir -> file replacements, so must manually -# purge the old directory path. -# -# Workaround could be removed in Fedora >= 45 timeframe at which -# point we shouldn't see any legacy files around in a normal -# upgrade scenario. -%pretrans -p gimp -path = "%{gimpplugindir}/gmic_gimp_qt" -st = posix.stat(path) -if st and st.type == "regular" then - os.remove(path) -end - -path = "%{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt" -st = posix.stat(path) -if st and st.type == "directory" then - status = os.rename(path, path .. ".rpmmoved") - if not status then - suffix = 0 - while not status do - suffix = suffix + 1 - status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) - end - os.rename(path, path .. ".rpmmoved") - end -end - %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -246,17 +213,9 @@ end %{_libdir}/libcgmic.so %files gimp -%dir %{gimpplugindir} %{gimpplugindir}/gmic_gimp_qt -# Remove ghosts in Fedora >= 45, see pretrans script -%ghost %{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt.rpmmoved -%ghost %{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt.rpmmoved/gmic_gimp_qt -%dir %{_datadir}/gmic -%{_datadir}/gmic/gmic_cluts.gmz -%{_datadir}/gmic/gmic_denoise_cnn.gmz -%{_datadir}/gmic/gmic_fonts.gmz -%{_datadir}/gmic/gmic_lightleaks.gmz -%{_datadir}/gmic/gmic_scale2x_cnn.gmz +%{gimpplugindir}/gmic_cluts.gmz +%{gimpplugindir}/gmic_denoise_cnn.gmz %files libs %license COPYING COPYING-libcgmic @@ -264,4 +223,307 @@ end %{_libdir}/libcgmic.so.3* %changelog -%autochangelog +* Mon Nov 14 2022 josef radinger - 3.1.6-2 +- build + +* Tue Nov 08 2022 Sérgio Basto - 3.1.6-1 +- Update to 3.1.6 + +* Sun Oct 09 2022 Kalev Lember - 3.1.0-5 +- Split out gmic-libs to a subpackage + +* Wed Sep 07 2022 Kalev Lember - 3.1.0-4 +- Clean up multilib path install + +* Thu Jul 21 2022 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Sérgio Basto - 3.1.0-2 +- Rebuilt for opencv 4.6.0 + +* Thu Apr 28 2022 josef radinger - 3.1.0-1 +- bump version +- disable patch0 +- disable patch2 +- BuildRequires: chrpath + +* Wed Jan 26 2022 josef radinger - 3.0.2-1 +- bump version + +* Thu Jan 20 2022 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 14 2022 josef radinger -3.0.1-1 +- bump version +- add gmic_denoise_cnn.gmz to gimp-subpackage + +* Sat Dec 11 2021 josef radinger -3.0.0-1 +- bump version + +* Thu Nov 25 2021 Orion Poplawski - 2.9.9-2 +- Rebuild for hdf5 1.12.1 + +* Mon Sep 06 2021 josef radinger - 2.9.9-1 +- bump version + +* Sat Aug 21 2021 Richard Shaw - 2.9.8-4 +- Rebuild for OpenEXR/Imath 3.1. + +* Sat Jul 31 2021 Richard Shaw - 2.9.8-3 +- Rebuild with OpenEXR/Imath 3. + +* Thu Jul 22 2021 Fedora Release Engineering - 2.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 20 2021 josef radinger - 2.9.8-1 +- bump version + +* Fri Apr 09 2021 josef radinger - 2.9.7-1 +- bump version + +* Thu Feb 11 2021 josef radinger - 2.9.6-1 +- bump version + +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 12 2021 Mamoru TASAKA - 2.9.4-5 +- Again try to build on all archs + +* Tue Jan 12 2021 Mamoru TASAKA - 2.9.4-4 +- Once make this package available on buildable arch + +* Mon Jan 04 2021 josef radinger - 2.9.4-3 +- remove stray stash file + +* Fri Jan 01 2021 Richard Shaw - 2.9.4-2 +- Rebuild for OpenEXR 2.5.3. + +* Tue Nov 24 2020 josef radinger - 2.9.4-1 +- bump version + +* Thu Nov 19 2020 josef radinger - 2.9.3-1 +- bump version + +* Thu Oct 22 2020 Nicolas Chauvet - 2.9.2-4 +- Rebuilt for OpenCV + +* Tue Sep 08 2020 josef radinger - 2.9.2-3 +- we now have desktop-files + +* Tue Sep 08 2020 josef radinger - 2.9.2-1 +- bump version + +* Sat Aug 01 2020 Fedora Release Engineering - 2.9.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 12 2020 josef radinger - 2.9.1-2 +- rebuild + +* Fri Jun 12 2020 josef radinger - 2.9.1-1 +- bump version +- remove patch1 (for new opencv) + +* Thu Jun 04 2020 Nicolas Chauvet - 2.9.0-4 +- Rebuilt for OpenCV 4.3 + +* Thu Apr 2 2020 josef radinger - 2.9.0-3 +- enable mtune on aarch64 + +* Thu Apr 2 2020 josef radinger - 2.9.0-2 +- disable mtune=generic for s390x, armv7hl and ppc64le + +* Mon Mar 30 2020 josef radinger - 2.9.0-1 +- bump version +- update gmic_opencv.patch + +* Thu Feb 13 2020 josef radinger - 2.8.4-1 +- bump version + +* Tue Jan 28 2020 Fedora Release Engineering - 2.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 28 2020 Nicolas Chauvet - 2.8.3-2 +- Rebuild for OpenCV 4.2 + +* Fri Jan 24 2020 josef radinger - 2.8.3-1 +- bump version + +* Wed Jan 15 2020 josef radinger - 2.8.2-1 +- bump version + +* Sun Dec 29 2019 Nicolas Chauvet - 2.7.4-4 +- Rebuilt for opencv4 + +* Fri Oct 18 2019 josef radinger - 2.7.4-3 +- add patch for building against opencv 4.1.2 + +* Fri Oct 18 2019 josef radinger - 2.7.4-2 +- rebuild against opencv 4.1.2 + +* Tue Oct 15 2019 josef radinger - 2.7.4-1 +- bump version + +* Wed Sep 11 2019 Mamoru TASAKA - 2.7.0-2 +- Rebuild for opencv (with vtk disabled) + +* Thu Aug 15 2019 josef radinger - 2.7.0-1 +- bump version + +* Thu Jul 25 2019 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 19 2019 josef radinger - 2.6.6-1 +- bump version + +* Tue May 28 2019 josef radinger - 2.6.4-1 +- bump version + +* Thu Apr 18 2019 josef radinger - 2.5.7-1 +- bump version + +* Thu Apr 11 2019 Richard Shaw - 2.5.6-2 +- Rebuild for OpenEXR/Ilmbase 2.3.0. +- Move licences files to %%license. + +* Mon Apr 08 2019 josef radinger - 2.5.6-1 +- bump version + +* Sat Mar 30 2019 josef radinger - 2.5.5-1 +- bump version + +* Sun Mar 24 2019 josef radinger - 2.5.4-1 +- bump version + +* Mon Mar 18 2019 Orion Poplawski - 2.5.3-2 +- Rebuild for hdf5 1.10.5 + +* Sun Mar 17 2019 josef radinger - 2.5.3-1 +- bump version +- use gmic_cluts.gmz instead of gmic_film_cluts.gmz + +* Sat Mar 16 2019 josef radinger - 2.5.2-1 +- bump version + +* Thu Jan 31 2019 Fedora Release Engineering - 2.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 21 2019 josef radinger - 2.4.5-1 +- bump version +- create %%{_sysconfdir}/bash_completion.d and move the file + +* Tue Oct 16 2018 Daniel P. Berrangé - 2.4.0-1 +- Update to 2.4.0 release + +* Tue Sep 4 2018 Daniel P. Berrangé - 2.3.6-1 +- Update to 2.3.6 release +- Drop BuildRoot and Group tags +- Use system CImg +- Update URL tag + +* Mon Jul 23 2018 Daniel P. Berrangé - 2.3.3-1 +- Updated to latest release / snapshots +- Add BR on gcc-c++ + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 05 2018 Adam Williamson - 2.2.0-2 +- Rebuild for opencv soname bump + +* Thu Feb 22 2018 Daniel P. Berrange - 2.2.0-1 +- Update to new 2.2.0 upstream release +- Some parts now licensed under choice of CeCILL or CeCILL-C + +* Wed Feb 07 2018 Fedora Release Engineering - 2.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 Daniel P. Berrange - 2.1.8-1 +- Update to new 2.1.8 upstream release +- Remove bogus -static sub-RPM which contained shared libs + +* Thu Jan 04 2018 josef radinger - 1.7.2-6 +- Rebuilt for libopencv + +* Wed Aug 02 2017 Fedora Release Engineering - 1.7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Mar 2 2017 Fedora Release Engineering - 1.7.2-3 +- Rebuild due to opencv soname change + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jun 4 2016 josef radinger - 1.7.2-1 +- bump version + +* Sun May 8 2016 josef radinger - 1.7.1-2 +- rebuild for rawhide + +* Fri Apr 29 2016 josef radinger - 1.7.1-1 +- bump version +- update Patch1 +- fix link on libgmic +- remove smp_mflags (because of compile-errors) +- split a *-static package + +* Fri Feb 5 2016 josef radinger - 1.6.9-1 +- bump version +- update Patch1 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 7 2015 josef radinger - 1.6.8-1 +- bump version + +* Sat Oct 24 2015 josef radinger - 1.6.7-1 +- bump version +- new downloadurl + +* Tue Oct 13 2015 josef radinger - 1.6.6.1-1 +- bump version + +* Tue Jun 23 2015 Daniel P. Berrange - 1.6.5.0-1 +- Update to 1.6.5.0 release +- Enable zart binary build + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 10 2015 Daniel P. Berrange - 1.6.2.0-1 +- Update to 1.6.2.0 release + +* Sat May 02 2015 Kalev Lember - 1.6.1.0-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Mar 20 2015 Daniel P. Berrange - 1.6.1.0-1 +- Update to 1.6.1.0 release + +* Fri Feb 6 2015 Daniel P. Berrange - 1.6.0.4-1 +- Update to 1.6.0.4 release + +* Fri Dec 19 2014 Daniel P. Berrange - 1.6.0.3-1 +- Update to 1.6.0.3 release + +* Wed Nov 26 2014 Rex Dieter 1.6.0.1-2 +- rebuild (openexr), s|qt-devel|qt4-devel|, tighten subpkg deps + +* Fri Oct 3 2014 Daniel P. Berrange - 1.6.0.1-1 +- Update to 1.6.0.1 release + +* Mon Aug 25 2014 Daniel P. Berrange - 1.6.0.0-1 +- Update to 1.6.0.0 release + +* Sat Aug 16 2014 Fedora Release Engineering - 1.5.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Jul 23 2014 Daniel P. Berrange - 1.5.9.4-1 +- Initial Fedora package after review (rhbz #1061801) diff --git a/new-snapshot.sh b/new-snapshot.sh index b9b9c73..cf0afd7 100755 --- a/new-snapshot.sh +++ b/new-snapshot.sh @@ -40,8 +40,7 @@ function print_hash() { } archive_it zart https://github.com/c-koi/zart . -#archive_it gmic-qt https://github.com/c-koi/gmic-qt . -archive_it gmic-qt https://github.com/GreycLab/gmic-qt.git . +archive_it gmic-qt https://github.com/c-koi/gmic-qt . archive_it gmic-community https://github.com/dtschump/gmic-community libcgmic print_hash zart diff --git a/sources b/sources index bae85e9..48c7647 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.6.tar.gz) = 500cc5f860b9e4791858f36785913871677ce125e0359693ffaaee68234ce2808ff94b1153f131042795c8888366a280430ad2647769b03c9ac2ae803b540ff9 -SHA512 (gmic-community-20251227git7e21d80b.tar.gz) = 8f472a79b609b1e6562587df77126f5fe0a2837960a34df16fe2376a7b20ac208fa094720d8c539cb23d04b1039b20b1bf3c546312fcc0cb2e666624c7adaeb6 -SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 +SHA512 (gmic_3.1.6.tar.gz) = 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 +SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 +SHA512 (gmic-community-20221112git98b7617.tar.gz) = bbf6a7e02d18aece04cefafd41c337b211c1441d5655f821463d928ad18cfaa5533d880d836d4c53630732e6181de986b8087bbfc34c422d82fcf95837abb83d