From 74d58cd618f17ffeb081e48dc5c26613870f032f Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 25 Jan 2019 15:37:43 +0100 Subject: [PATCH 001/136] frsh rebuild --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 1da3523..9c6ac1d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.4.5 -Release: 1%{?dist} +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 @@ -155,6 +155,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_film_cluts.gmz %changelog +* Fri Jan 25 2019 josef radinger - 2.4.5-2 +- frsh rebuild + * Mon Jan 21 2019 josef radinger - 2.4.5-1 - bump version - create %%{_sysconfdir}/bash_completion.d and move the file From c3c1dd85a95dcfee5816874ba32b5044e68df112 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 28 May 2019 20:25:35 +0200 Subject: [PATCH 002/136] new version --- gmic.spec | 11 +++++++---- sources | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index d06ab83..c378d59 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20190418git51f9d2d -%global gmic_qt_version 20190418git507a40e -%global gmic_community_version 20190418git31faaa2 +%global zart_version 20190528git6e98a35 +%global gmic_qt_version 20190528gitf2badba +%global gmic_community_version 20190528gitbba31ea Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.5.7 +Version: 2.6.4 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* Tue May 28 2019 josef radinger - 2.6.4-1 +- bump version + * Thu Apr 18 2019 josef radinger - 2.5.7-1 - bump version diff --git a/sources b/sources index 1d9a8d6..1b00e28 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20190418git31faaa2.tar.gz) = 16ab43d1855ec7c12e8e9eb41b17271428669388135e7ffc7e06ea2761f9f940400fbeb9f909826b091c371a806ed7e0eec683a7aee2b55fd0938f71b5c0b56f -SHA512 (gmic-qt-20190418git507a40e.tar.gz) = 03b7b7108f4551ab1928cd4c71d6fbee53608cba9432d4d11915ca6315a2ca2d226949855c3ba321fe3e0b2293e7b2cfcf6686c066b8318720f6527d396e9a0d -SHA512 (zart-20190418git51f9d2d.tar.gz) = b9405fe8a9700b73abe89fd80c4e45426abbf3fcde5ed3dd8201e2535cdcd3eac5475d40b6c6e34260fd7e47257e78ce2f757fbfb0d4952182114550531180c3 -SHA512 (gmic_2.5.7.tar.gz) = cab58245050e47b12b2759a4e928aa30739eccfff6eb07ae60e848e706997317f32111b31cbb0b179c331215875aa2a37e2b133925a24de5ab9903882ad70ba8 +SHA512 (gmic-community-20190528gitbba31ea.tar.gz) = 11910431731d666e64cada77c1b5c1a2356c4c69e8ec64bbdfd429aaf15bbc4ffe43bc11d51c8101bf4b4c668234e22e5c7394e05327935e2ffd9f57a6f4bdb4 +SHA512 (gmic-qt-20190528gitf2badba.tar.gz) = 5a62c7587590d2c45b5956a263e1ab1e5bae5d8fda540ad9e06c36beb899f168a05b6b16888b39d29879d51d361e019deb432421bf2751542f34461c21b72445 +SHA512 (zart-20190528git6e98a35.tar.gz) = 0bb0758e116e6b4e08060f8680604854f9be311618f2dd020fc32592823f48cb18327f304d34261804481e79e089b4a5461b7c4f0930aea0d17bc466443027b7 +SHA512 (gmic_2.6.4.tar.gz) = 017216281c7c53780bccab7fbeadb96249ce8b3318bfd6e727ed93cef27364e2ef4bd8dc622cd9688107788bc6b2e06a61ae04a80e1dce6f499f4b3f7e430229 From eb96c2539bc6e6402e4d4bfcf38ae31aa47dcb49 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 19 Jun 2019 20:17:57 +0200 Subject: [PATCH 003/136] bump version --- gmic.spec | 11 +++++++---- sources | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index c378d59..b75ab5c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20190528git6e98a35 -%global gmic_qt_version 20190528gitf2badba -%global gmic_community_version 20190528gitbba31ea +%global zart_version 20190619git6e98a35 +%global gmic_qt_version 20190619gitee32003 +%global gmic_community_version 20190619gitaa2bfc3 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.6.4 +Version: 2.6.6 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* Wed Jun 19 2019 josef radinger - 2.6.6-1 +- bump version + * Tue May 28 2019 josef radinger - 2.6.4-1 - bump version diff --git a/sources b/sources index 1b00e28..9826711 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20190528gitbba31ea.tar.gz) = 11910431731d666e64cada77c1b5c1a2356c4c69e8ec64bbdfd429aaf15bbc4ffe43bc11d51c8101bf4b4c668234e22e5c7394e05327935e2ffd9f57a6f4bdb4 -SHA512 (gmic-qt-20190528gitf2badba.tar.gz) = 5a62c7587590d2c45b5956a263e1ab1e5bae5d8fda540ad9e06c36beb899f168a05b6b16888b39d29879d51d361e019deb432421bf2751542f34461c21b72445 -SHA512 (zart-20190528git6e98a35.tar.gz) = 0bb0758e116e6b4e08060f8680604854f9be311618f2dd020fc32592823f48cb18327f304d34261804481e79e089b4a5461b7c4f0930aea0d17bc466443027b7 -SHA512 (gmic_2.6.4.tar.gz) = 017216281c7c53780bccab7fbeadb96249ce8b3318bfd6e727ed93cef27364e2ef4bd8dc622cd9688107788bc6b2e06a61ae04a80e1dce6f499f4b3f7e430229 +SHA512 (gmic-community-20190619gitaa2bfc3.tar.gz) = bb2f52e5fb70c714db437dc3a75188c74df9e0428e7900a482b380c57b3078d3fb80c0bcd21969e9bcbc004789daf1a74e14adeaa9d31c5c4688c42f98fa78b1 +SHA512 (gmic-qt-20190619gitee32003.tar.gz) = 06f20112d3d52a65ad0063f55e00b40a8b223ef71fad3b1d7175bc139a36d21103edb8576c2b947478b9e3d61c496c1b1860d045df5a8191258d3d66fc59dd69 +SHA512 (zart-20190619git6e98a35.tar.gz) = 0bb0758e116e6b4e08060f8680604854f9be311618f2dd020fc32592823f48cb18327f304d34261804481e79e089b4a5461b7c4f0930aea0d17bc466443027b7 +SHA512 (gmic_2.6.6.tar.gz) = a36effb678889eb6c3feea340293a9cb82b6abe00d698e54fc927528698624233c1ea33177ea1f3f2ae8a53ede0eccf3036f58c761060d46e987cb6036a839ce From 99060afb654d050daf85bd4890b7085a307fd189 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:59:53 +0000 Subject: [PATCH 004/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index b75ab5c..a24c6c1 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.6.6 -Release: 1%{?dist} +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 @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From e8aff559dc0359f67875340080ad87956b95c68a Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 15 Aug 2019 15:07:35 +0200 Subject: [PATCH 005/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index a24c6c1..b0bfd77 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20190619git6e98a35 -%global gmic_qt_version 20190619gitee32003 -%global gmic_community_version 20190619gitaa2bfc3 +%global zart_version 20190815git9d67c0d +%global gmic_qt_version 20190815gitee32003 +%global gmic_community_version 20190815git91e4cf7 Summary: GREYC's Magic for Image Computing -Name: gmic -Version: 2.6.6 +Name: gmic +Version: 2.7.0 Release: 2%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 diff --git a/sources b/sources index 9826711..34b3279 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20190619gitaa2bfc3.tar.gz) = bb2f52e5fb70c714db437dc3a75188c74df9e0428e7900a482b380c57b3078d3fb80c0bcd21969e9bcbc004789daf1a74e14adeaa9d31c5c4688c42f98fa78b1 -SHA512 (gmic-qt-20190619gitee32003.tar.gz) = 06f20112d3d52a65ad0063f55e00b40a8b223ef71fad3b1d7175bc139a36d21103edb8576c2b947478b9e3d61c496c1b1860d045df5a8191258d3d66fc59dd69 -SHA512 (zart-20190619git6e98a35.tar.gz) = 0bb0758e116e6b4e08060f8680604854f9be311618f2dd020fc32592823f48cb18327f304d34261804481e79e089b4a5461b7c4f0930aea0d17bc466443027b7 -SHA512 (gmic_2.6.6.tar.gz) = a36effb678889eb6c3feea340293a9cb82b6abe00d698e54fc927528698624233c1ea33177ea1f3f2ae8a53ede0eccf3036f58c761060d46e987cb6036a839ce +SHA512 (gmic_2.7.0.tar.gz) = 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4 +SHA512 (gmic-community-20190815git91e4cf7.tar.gz) = 8ef15ad9975719109cdf88cc3186842a94bb5d8d9571ed9ef153533784ca5dbf3f1183973d14885186dcf3dc9430604252290d82200675819f5408f67cb373bf +SHA512 (gmic-qt-20190815gitee32003.tar.gz) = 06f20112d3d52a65ad0063f55e00b40a8b223ef71fad3b1d7175bc139a36d21103edb8576c2b947478b9e3d61c496c1b1860d045df5a8191258d3d66fc59dd69 +SHA512 (zart-20190815git9d67c0d.tar.gz) = 0a292e31dd1ba27054b77940438e1783ef715a512a2d266ab62a952d18e04dd08f3d22a8af76d764e89e6573b00f83bb8ca77211868913d2ef6f83c1550a39c5 From 82823a999a6a6cea1eaa5abebeea8a627a186b64 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 Sep 2019 07:43:10 +0900 Subject: [PATCH 006/136] Rebuild for opencv (with vtk disabled) --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index b0bfd77..235afe5 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 103c83a99346a40a560d61dac7d13094d489994b Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 15 Oct 2019 15:40:08 +0200 Subject: [PATCH 007/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 235afe5..9e9028f 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20190815git9d67c0d -%global gmic_qt_version 20190815gitee32003 -%global gmic_community_version 20190815git91e4cf7 +%global zart_version 20191015gitc6e28cd +%global gmic_qt_version 20191015git3575305 +%global gmic_community_version 20191015git58fa555 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.7.0 -Release: 3%{?dist} +Version: 2.7.4 +Release: 1%{?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 @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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) diff --git a/sources b/sources index 34b3279..6edb053 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_2.7.0.tar.gz) = 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4 -SHA512 (gmic-community-20190815git91e4cf7.tar.gz) = 8ef15ad9975719109cdf88cc3186842a94bb5d8d9571ed9ef153533784ca5dbf3f1183973d14885186dcf3dc9430604252290d82200675819f5408f67cb373bf -SHA512 (gmic-qt-20190815gitee32003.tar.gz) = 06f20112d3d52a65ad0063f55e00b40a8b223ef71fad3b1d7175bc139a36d21103edb8576c2b947478b9e3d61c496c1b1860d045df5a8191258d3d66fc59dd69 -SHA512 (zart-20190815git9d67c0d.tar.gz) = 0a292e31dd1ba27054b77940438e1783ef715a512a2d266ab62a952d18e04dd08f3d22a8af76d764e89e6573b00f83bb8ca77211868913d2ef6f83c1550a39c5 +SHA512 (gmic-community-20191015git58fa555.tar.gz) = e627456b9fd26064f3dd3ae4d1cd4774d03bdca8031ca573f9fd2c1f17f121f3adfad1de93a60ad5e0cf9c1d59384ba8dc73be3edfa4baa5216ff61c2f8fd68f +SHA512 (gmic-qt-20191015git3575305.tar.gz) = e3fa7bfa4492fee2e8a1f1918fe20498ba466d2b2190f7c06b8c1e68d943da604f50c7b35ed581f3649ea56575051784e06061adb2be117c24cf5e0bf0cacd29 +SHA512 (zart-20191015gitc6e28cd.tar.gz) = d79451f950c1a8306523c8baa5b8dbcd16e5d0a7f9c694d5d2333dce0056767d3ef5c06c2e23b5022e68fa44e0db64fdcdee5d66e29be30bcac66ce7140e0a05 +SHA512 (gmic_2.7.4.tar.gz) = 1ab6d502e8969c16b46fe01c82a627d319e3b2a06a76f4e8279eae315c2b87628d04a7bdbadcf5696ce99ee349242fd1037451f79308df09c15677b2f93a3d2a From f4f3a23b92866eb22a0eac3cda1006d30d177a71 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 18 Oct 2019 20:15:06 +0200 Subject: [PATCH 008/136] build against opencv 4.1.2 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 9e9028f..d1ff41d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.7.4 -Release: 1%{?dist} +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 @@ -156,6 +156,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From f0e0acfd3b97d3fddcc0365155e037149aa965e6 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 18 Oct 2019 20:27:13 +0200 Subject: [PATCH 009/136] patch against opencv 4.1.2 --- gmic.spec | 10 ++++++++-- gmic_opencv.patch | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gmic_opencv.patch diff --git a/gmic.spec b/gmic.spec index d1ff41d..07d904c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.7.4 -Release: 2%{?dist} +Release: 3%{?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 @@ -41,7 +41,9 @@ BuildRequires: libcurl-devel BuildRequires: gcc-c++ # The C library binding was mistakenly put in a -static # package despite being a shared library -Obsoletes: gmic-static <= 2.1.8 +Obsoletes: gmic-static <= 2.1.8 + +Patch1: gmic_opencv.patch %description G'MIC is an open and full-featured framework for image processing, providing @@ -75,6 +77,7 @@ Provides a plugin for using G'MIC from GIMP %prep %setup -q -a 1 -a 2 -a 3 +%patch1 -p1 -b.opencv %build export CCACHE_DISABLE=1 @@ -156,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 diff --git a/gmic_opencv.patch b/gmic_opencv.patch new file mode 100644 index 0000000..4ab07b5 --- /dev/null +++ b/gmic_opencv.patch @@ -0,0 +1,20 @@ +--- gmic-2.7.4/zart/src/ImageConverter.cpp.orig 2019-10-15 22:17:36.043062873 +0200 ++++ gmic-2.7.4/zart/src/ImageConverter.cpp 2019-10-15 22:19:36.252242400 +0200 +@@ -70,7 +70,7 @@ + + cv::Mat tmp(in->cols, in->rows, in->depth()); + +- cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); ++ cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); + + const unsigned int w3 = 3 * tmp.cols; + unsigned char * src = reinterpret_cast(tmp.ptr()); +@@ -106,7 +106,7 @@ + dst += step; + } + } +- cvtColor(**out, **out, CV_BGR2RGB); ++ cvtColor(**out, **out, cv::COLOR_BGR2RGB); + } + + void ImageConverter::convert(const cimg_library::CImg & in, QImage * out) From 11267bead7fec353aa5e27ad7591ead7159a0606 Mon Sep 17 00:00:00 2001 From: kwizart Date: Sun, 29 Dec 2019 11:21:24 +0100 Subject: [PATCH 010/136] Rebuilt for opencv4 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 07d904c..8f8178d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.7.4 -Release: 3%{?dist} +Release: 4%{?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 @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 590393b2f972dc7749bf4a777ffc1b546b292278 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 15 Jan 2020 22:25:34 +0100 Subject: [PATCH 011/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 8f8178d..2d4fdc9 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20191015gitc6e28cd -%global gmic_qt_version 20191015git3575305 -%global gmic_community_version 20191015git58fa555 +%global zart_version 20200115git099554f +%global gmic_qt_version 20200115git4666d2e +%global gmic_community_version 20200115git2c64357 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.7.4 -Release: 4%{?dist} +Version: 2.8.2 +Release: 1%{?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 @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 diff --git a/sources b/sources index 6edb053..dd1c141 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20191015git58fa555.tar.gz) = e627456b9fd26064f3dd3ae4d1cd4774d03bdca8031ca573f9fd2c1f17f121f3adfad1de93a60ad5e0cf9c1d59384ba8dc73be3edfa4baa5216ff61c2f8fd68f -SHA512 (gmic-qt-20191015git3575305.tar.gz) = e3fa7bfa4492fee2e8a1f1918fe20498ba466d2b2190f7c06b8c1e68d943da604f50c7b35ed581f3649ea56575051784e06061adb2be117c24cf5e0bf0cacd29 -SHA512 (zart-20191015gitc6e28cd.tar.gz) = d79451f950c1a8306523c8baa5b8dbcd16e5d0a7f9c694d5d2333dce0056767d3ef5c06c2e23b5022e68fa44e0db64fdcdee5d66e29be30bcac66ce7140e0a05 -SHA512 (gmic_2.7.4.tar.gz) = 1ab6d502e8969c16b46fe01c82a627d319e3b2a06a76f4e8279eae315c2b87628d04a7bdbadcf5696ce99ee349242fd1037451f79308df09c15677b2f93a3d2a +SHA512 (gmic-community-20200115git2c64357.tar.gz) = b4217e2d8965b8ffedd2b568c76f6569c1c3b77b39930db5e57dc30bcb5888283226caa2683d121aac1833924b13ad0eef9ff19a9ff45650cbd4e78e8ced34be +SHA512 (gmic-qt-20200115git4666d2e.tar.gz) = 21987c2f921af4885730967b4b9aafe4076785dd496c3ceae2d0b1efcb4d23225a06a237c16fb143f71aed2091734ef2de18b263405ab34399889c5a1c632cac +SHA512 (zart-20200115git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357 +SHA512 (gmic_2.8.2.tar.gz) = 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a From b5d0f3edabb41570c288517838f224066aa58eb7 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 24 Jan 2020 20:24:57 +0100 Subject: [PATCH 012/136] new version --- sources | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sources b/sources index dd1c141..d8f8ce7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20200115git2c64357.tar.gz) = b4217e2d8965b8ffedd2b568c76f6569c1c3b77b39930db5e57dc30bcb5888283226caa2683d121aac1833924b13ad0eef9ff19a9ff45650cbd4e78e8ced34be -SHA512 (gmic-qt-20200115git4666d2e.tar.gz) = 21987c2f921af4885730967b4b9aafe4076785dd496c3ceae2d0b1efcb4d23225a06a237c16fb143f71aed2091734ef2de18b263405ab34399889c5a1c632cac -SHA512 (zart-20200115git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357 -SHA512 (gmic_2.8.2.tar.gz) = 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a +SHA512 (gmic_2.8.3.tar.gz) = cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd +SHA512 (gmic-community-20200124git09ffcc5.tar.gz) = d3b84f6a18853cdfe740ce7151b22e90c540ff8cfdfbe348e6ae4464018a817c56a633a7f00a71b16b3aa0e27a1d87d49e69edf1edfe2a120807b5367205c19a +SHA512 (gmic-qt-20200124git168e4cc.tar.gz) = 23943fe573cf9ce337725b14204cc930adba17daec01829ace655ee5ae91b9144fde93074f8930f84083ee803ea070dd946a58de44b24d225ffa64da89d45837 +SHA512 (zart-20200124git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357 From 4fb1e41e3eadf11d4693d4b44ebdef0d99fb2420 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 25 Jan 2020 11:46:48 +0100 Subject: [PATCH 013/136] new version --- gmic.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index 2d4fdc9..30ab169 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20200115git099554f -%global gmic_qt_version 20200115git4666d2e -%global gmic_community_version 20200115git2c64357 +%global zart_version 20200124git099554f +%global gmic_qt_version 20200124git168e4cc +%global gmic_community_version 20200124git09ffcc5 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* Fri Jan 24 2020 josef radinger - 2.8.3-1 +- bump version + * Wed Jan 15 2020 josef radinger - 2.8.2-1 - bump version From c75829e61f6d699020dffa9565cc950a7b1f90e2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Jan 2020 12:04:05 +0100 Subject: [PATCH 014/136] Rebuilt --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 30ab169..bd65c12 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.8.3 -Release: 1%{?dist} +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 @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From a0397e186293334fc1eac024182ce05c63353355 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 22:30:34 +0000 Subject: [PATCH 015/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index bd65c12..323175e 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.8.3 -Release: 2%{?dist} +Release: 3%{?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 @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From db5383e19480bded7aae0c3958cbdb6357569e8d Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 13 Feb 2020 20:09:48 +0100 Subject: [PATCH 016/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 323175e..98f1ffa 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20200124git099554f -%global gmic_qt_version 20200124git168e4cc -%global gmic_community_version 20200124git09ffcc5 +%global zart_version 20200213git099554f +%global gmic_qt_version 20200213git168e4cc +%global gmic_community_version 20200213git871e999 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.8.3 -Release: 3%{?dist} +Version: 2.8.4 +Release: 1%{?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 @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 diff --git a/sources b/sources index d8f8ce7..61777d9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_2.8.3.tar.gz) = cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd -SHA512 (gmic-community-20200124git09ffcc5.tar.gz) = d3b84f6a18853cdfe740ce7151b22e90c540ff8cfdfbe348e6ae4464018a817c56a633a7f00a71b16b3aa0e27a1d87d49e69edf1edfe2a120807b5367205c19a -SHA512 (gmic-qt-20200124git168e4cc.tar.gz) = 23943fe573cf9ce337725b14204cc930adba17daec01829ace655ee5ae91b9144fde93074f8930f84083ee803ea070dd946a58de44b24d225ffa64da89d45837 -SHA512 (zart-20200124git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357 +SHA512 (gmic-community-20200213git871e999.tar.gz) = 093873e8cb6bcaf3a0d1cf96bed9d08b5f4b826f9a0530029e9a8438bbe81329cff7d0cd38341f17891862cccf05ab537e94364d9d8a8806563711103f8a8aab +SHA512 (gmic-qt-20200213git168e4cc.tar.gz) = 23943fe573cf9ce337725b14204cc930adba17daec01829ace655ee5ae91b9144fde93074f8930f84083ee803ea070dd946a58de44b24d225ffa64da89d45837 +SHA512 (zart-20200213git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357 +SHA512 (gmic_2.8.4.tar.gz) = 7e6de83493c6fd970c3752f8638e4562fcd5233bebd926a8e439fbe04742604c27555f47aa4751ab869dbf0c759bc4abc3bc6c1d095bfe1faf00fe769e5c3a6d From a8f9e2d08f847b464f3f1d4c84270e54a160fd54 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 30 Mar 2020 20:17:52 +0200 Subject: [PATCH 017/136] bump version --- gmic.spec | 11 +++++++---- sources | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index 98f1ffa..6bf4d5c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20200213git099554f -%global gmic_qt_version 20200213git168e4cc -%global gmic_community_version 20200213git871e999 +%global zart_version 20200330git7470fdd +%global gmic_qt_version 20200330gitc04c336 +%global gmic_community_version 20200330git087f484 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.8.4 +Version: 2.9.0 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* Mon Mar 30 2020 josef radinger - 2.9.0-1 +- bump version + * Thu Feb 13 2020 josef radinger - 2.8.4-1 - bump version diff --git a/sources b/sources index 61777d9..eebc07e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20200213git871e999.tar.gz) = 093873e8cb6bcaf3a0d1cf96bed9d08b5f4b826f9a0530029e9a8438bbe81329cff7d0cd38341f17891862cccf05ab537e94364d9d8a8806563711103f8a8aab -SHA512 (gmic-qt-20200213git168e4cc.tar.gz) = 23943fe573cf9ce337725b14204cc930adba17daec01829ace655ee5ae91b9144fde93074f8930f84083ee803ea070dd946a58de44b24d225ffa64da89d45837 -SHA512 (zart-20200213git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357 -SHA512 (gmic_2.8.4.tar.gz) = 7e6de83493c6fd970c3752f8638e4562fcd5233bebd926a8e439fbe04742604c27555f47aa4751ab869dbf0c759bc4abc3bc6c1d095bfe1faf00fe769e5c3a6d +SHA512 (gmic-community-20200330git087f484.tar.gz) = 3a7f4d2cd9833cad7565a47de04378cba88e0ff66cd19996637b4a29f96ed85576d2a4a8c673443847e14033b2498609481684cc78997169798cc4163b77e69b +SHA512 (gmic-qt-20200330gitc04c336.tar.gz) = de9671260afe31f15e11cfc6b499d43ef6e9dee3eb7f3957cb382b4acf069a48bf28f1a884fa61050023e6db162b4046ae5d9192a60ee0171902e22bb59ae37f +SHA512 (zart-20200330git7470fdd.tar.gz) = eaa9f68b9137e901824a0afc7abaf343c9a10bd06b1514a00773f1f53e8ce29df7f3253e95be481ad1b5c48cf49e50bf81284152350435a7465a0b0d3850b9a6 +SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d From de58e8142fbfe24422e46f12a6c6d87f35f767db Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 30 Mar 2020 21:25:27 +0200 Subject: [PATCH 018/136] fix gmic_opencv.patch --- gmic_opencv.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic_opencv.patch b/gmic_opencv.patch index 4ab07b5..f98c029 100644 --- a/gmic_opencv.patch +++ b/gmic_opencv.patch @@ -1,15 +1,15 @@ ---- gmic-2.7.4/zart/src/ImageConverter.cpp.orig 2019-10-15 22:17:36.043062873 +0200 -+++ gmic-2.7.4/zart/src/ImageConverter.cpp 2019-10-15 22:19:36.252242400 +0200 +--- gmic-2.9.0/zart/src/ImageConverter.cpp.orig 2020-03-30 17:06:35.000000000 +0200 ++++ gmic-2.9.0/zart/src/ImageConverter.cpp 2020-03-30 21:19:39.589129422 +0200 @@ -70,7 +70,7 @@ - cv::Mat tmp(in->cols, in->rows, in->depth()); + cv::Mat tmp(in->cols, in->rows, in->type()); - cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); + cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); const unsigned int w3 = 3 * tmp.cols; unsigned char * src = reinterpret_cast(tmp.ptr()); -@@ -106,7 +106,7 @@ +@@ -113,7 +113,7 @@ dst += step; } } From 614d1cc2a2fd781e61ebebeba89e1e39edf81cd7 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 30 Mar 2020 21:26:27 +0200 Subject: [PATCH 019/136] fix gmic_opencv.patch --- gmic.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gmic.spec b/gmic.spec index 6bf4d5c..2693ee1 100644 --- a/gmic.spec +++ b/gmic.spec @@ -161,6 +161,7 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %changelog * 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 From 2373e2a6894aa07687c979805f9ef8683ca4b6fa Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 2 Apr 2020 19:58:43 +0200 Subject: [PATCH 020/136] disable mtune for s390x, armv7hl and ppc64le --- Makefile_arch.patch | 12 ++++++++++++ gmic.spec | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Makefile_arch.patch diff --git a/Makefile_arch.patch b/Makefile_arch.patch new file mode 100644 index 0000000..04f7ff2 --- /dev/null +++ b/Makefile_arch.patch @@ -0,0 +1,12 @@ +--- gmic-2.9.0/src/Makefile.orig 2020-03-28 14:25:12.000000000 +0100 ++++ gmic-2.9.0/src/Makefile 2020-04-02 19:52:54.033777691 +0200 +@@ -193,7 +193,8 @@ + # Enable optimizations for 'cli'. + OPT_CLI_CFLAGS = -Ofast + ifdef IS_GCC +-OPT_CLI_CFLAGS = -Ofast -mtune=generic -flto ++#OPT_CLI_CFLAGS = -Ofast -mtune=generic -flto ++OPT_CLI_CFLAGS = -Ofast -flto + OPT_CLI_LIBS = -flto + endif + ifdef icpc diff --git a/gmic.spec b/gmic.spec index 2693ee1..77796e6 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.0 -Release: 1%{?dist} +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 @@ -159,6 +159,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 996ad94577c817e9abc08d162b027d461f99c113 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 2 Apr 2020 20:00:11 +0200 Subject: [PATCH 021/136] disable mtune for s390x, armv7hl and ppc64le --- gmic.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gmic.spec b/gmic.spec index 77796e6..8fcbfe1 100644 --- a/gmic.spec +++ b/gmic.spec @@ -44,6 +44,8 @@ BuildRequires: gcc-c++ Obsoletes: gmic-static <= 2.1.8 Patch1: gmic_opencv.patch +Patch2: Makefile_arch.patch + %description G'MIC is an open and full-featured framework for image processing, providing @@ -79,6 +81,10 @@ Provides a plugin for using G'MIC from GIMP %setup -q -a 1 -a 2 -a 3 %patch1 -p1 -b.opencv +%ifarch %{arm} s390x ppc64le +%patch2 -p1 -b.arch +%endif + %build export CCACHE_DISABLE=1 cd src From d5408c1209b91a68ffa8d22b8244df74f0537834 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 2 Apr 2020 20:27:22 +0200 Subject: [PATCH 022/136] enable mtune on aarch64 --- gmic.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index 8fcbfe1..4b0447a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -81,7 +81,7 @@ Provides a plugin for using G'MIC from GIMP %setup -q -a 1 -a 2 -a 3 %patch1 -p1 -b.opencv -%ifarch %{arm} s390x ppc64le +%ifarch armv7hl s390x ppc64le %patch2 -p1 -b.arch %endif @@ -165,6 +165,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 30bce4b0ceb1e498e1d1b25c95efbab1596d8047 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 4 Jun 2020 17:47:47 +0200 Subject: [PATCH 023/136] Rebuilt --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 4b0447a..cc8545f 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.0 -Release: 3%{?dist} +Release: 4%{?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 @@ -165,6 +165,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From f4f344b1397652cec211a4b5bce81a443e64d791 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 12 Jun 2020 09:18:01 +0200 Subject: [PATCH 024/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index cc8545f..da2098d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20200330git7470fdd -%global gmic_qt_version 20200330gitc04c336 -%global gmic_community_version 20200330git087f484 +%global zart_version 20200612gitd3a2931 +%global gmic_qt_version 20200612gitd40db0f +%global gmic_community_version 20200612git19211e0 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.0 -Release: 4%{?dist} +Version: 2.9.1 +Release: 1%{?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 @@ -165,6 +165,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* Fri Jun 12 2020 josef radinger - 2.9.1-1 +- bump version + * Thu Jun 04 2020 Nicolas Chauvet - 2.9.0-4 - Rebuilt for OpenCV 4.3 diff --git a/sources b/sources index eebc07e..9dda3bf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20200330git087f484.tar.gz) = 3a7f4d2cd9833cad7565a47de04378cba88e0ff66cd19996637b4a29f96ed85576d2a4a8c673443847e14033b2498609481684cc78997169798cc4163b77e69b -SHA512 (gmic-qt-20200330gitc04c336.tar.gz) = de9671260afe31f15e11cfc6b499d43ef6e9dee3eb7f3957cb382b4acf069a48bf28f1a884fa61050023e6db162b4046ae5d9192a60ee0171902e22bb59ae37f -SHA512 (zart-20200330git7470fdd.tar.gz) = eaa9f68b9137e901824a0afc7abaf343c9a10bd06b1514a00773f1f53e8ce29df7f3253e95be481ad1b5c48cf49e50bf81284152350435a7465a0b0d3850b9a6 -SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d +SHA512 (gmic_2.9.1.tar.gz) = dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b +SHA512 (gmic-community-20200612git19211e0.tar.gz) = 8eeeeba246a83915efc5c6d68356ac2c277eaab16f625e795cbfe4521bf458d47e2d96180d17a688dd86806f79bf73afe40c0599ade264a2fc0327c7b1fa576e +SHA512 (gmic-qt-20200612gitd40db0f.tar.gz) = fd55e6da7c4a2931716a3037b5b4cf94bb88d83689922af4eeb80fbe5730c2715e2d138f719c99454e9cd4cacb83cf18db88c4648fb37e39044ebf54d7005576 +SHA512 (zart-20200612gitd3a2931.tar.gz) = 35bede9006250a3cbba4d92e9b791857d7236bda4393bf817729471d0bd4c4e050ea5e3cb9558aaf1a0b5887aa7b05c614d2be898678e7e8f644d704ec5366ff From db18bfc091c38e7d336e850a01c6606f08347995 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 12 Jun 2020 09:26:01 +0200 Subject: [PATCH 025/136] remove patch1 --- gmic.spec | 3 +-- gmic_opencv.patch | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 gmic_opencv.patch diff --git a/gmic.spec b/gmic.spec index da2098d..e8f51a0 100644 --- a/gmic.spec +++ b/gmic.spec @@ -43,7 +43,6 @@ BuildRequires: gcc-c++ # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 -Patch1: gmic_opencv.patch Patch2: Makefile_arch.patch @@ -79,7 +78,6 @@ Provides a plugin for using G'MIC from GIMP %prep %setup -q -a 1 -a 2 -a 3 -%patch1 -p1 -b.opencv %ifarch armv7hl s390x ppc64le %patch2 -p1 -b.arch @@ -167,6 +165,7 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %changelog * 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 diff --git a/gmic_opencv.patch b/gmic_opencv.patch deleted file mode 100644 index f98c029..0000000 --- a/gmic_opencv.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gmic-2.9.0/zart/src/ImageConverter.cpp.orig 2020-03-30 17:06:35.000000000 +0200 -+++ gmic-2.9.0/zart/src/ImageConverter.cpp 2020-03-30 21:19:39.589129422 +0200 -@@ -70,7 +70,7 @@ - - cv::Mat tmp(in->cols, in->rows, in->type()); - -- cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); -+ cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); - - const unsigned int w3 = 3 * tmp.cols; - unsigned char * src = reinterpret_cast(tmp.ptr()); -@@ -113,7 +113,7 @@ - dst += step; - } - } -- cvtColor(**out, **out, CV_BGR2RGB); -+ cvtColor(**out, **out, cv::COLOR_BGR2RGB); - } - - void ImageConverter::convert(const cimg_library::CImg & in, QImage * out) From ed59ea7db0c37017aaffe212f9337926c02cd5df Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 12 Jun 2020 09:36:32 +0200 Subject: [PATCH 026/136] update patch2 (for arch64) --- Makefile_arch.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile_arch.patch b/Makefile_arch.patch index 04f7ff2..9e13f57 100644 --- a/Makefile_arch.patch +++ b/Makefile_arch.patch @@ -1,12 +1,11 @@ ---- gmic-2.9.0/src/Makefile.orig 2020-03-28 14:25:12.000000000 +0100 -+++ gmic-2.9.0/src/Makefile 2020-04-02 19:52:54.033777691 +0200 -@@ -193,7 +193,8 @@ - # Enable optimizations for 'cli'. +--- 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 = -Ofast ifdef IS_GCC --OPT_CLI_CFLAGS = -Ofast -mtune=generic -flto -+#OPT_CLI_CFLAGS = -Ofast -mtune=generic -flto -+OPT_CLI_CFLAGS = -Ofast -flto - OPT_CLI_LIBS = -flto +-OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO) ++OPT_CLI_CFLAGS = -Ofast $(FLTO) + OPT_CLI_LIBS = $(FLTO) endif ifdef icpc From e9ebc2af1b3ede8eecb3a4c7b368d1769f5242f2 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 12 Jun 2020 10:11:20 +0200 Subject: [PATCH 027/136] rebuild --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index e8f51a0..6affd07 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.1 -Release: 1%{?dist} +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 @@ -163,6 +163,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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) From 1e4a4e78af8f804ab67ce405f07dd0fe40032676 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:27:11 +0000 Subject: [PATCH 028/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 6affd07..96b0382 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -163,6 +163,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From c97f1a2b261fc18584ce81a964969d1ccdf8f06b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 02:08:02 +0000 Subject: [PATCH 029/136] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 96b0382..628ce4c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -163,6 +163,10 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From adad66fcd3480d3db663eacbc6dc91cba575956d Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 8 Sep 2020 20:03:30 +0200 Subject: [PATCH 030/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 628ce4c..f798708 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20200612gitd3a2931 -%global gmic_qt_version 20200612gitd40db0f -%global gmic_community_version 20200612git19211e0 +%global zart_version 20200908git9705abe +%global gmic_qt_version 20200908git97e2c23 +%global gmic_community_version 20200908gitc1a2c27 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.1 -Release: 4%{?dist} +Version: 2.9.2 +Release: 1%{?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 @@ -163,6 +163,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 diff --git a/sources b/sources index 9dda3bf..9012526 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_2.9.1.tar.gz) = dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b -SHA512 (gmic-community-20200612git19211e0.tar.gz) = 8eeeeba246a83915efc5c6d68356ac2c277eaab16f625e795cbfe4521bf458d47e2d96180d17a688dd86806f79bf73afe40c0599ade264a2fc0327c7b1fa576e -SHA512 (gmic-qt-20200612gitd40db0f.tar.gz) = fd55e6da7c4a2931716a3037b5b4cf94bb88d83689922af4eeb80fbe5730c2715e2d138f719c99454e9cd4cacb83cf18db88c4648fb37e39044ebf54d7005576 -SHA512 (zart-20200612gitd3a2931.tar.gz) = 35bede9006250a3cbba4d92e9b791857d7236bda4393bf817729471d0bd4c4e050ea5e3cb9558aaf1a0b5887aa7b05c614d2be898678e7e8f644d704ec5366ff +SHA512 (gmic_2.9.2.tar.gz) = be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796 +SHA512 (gmic-community-20200908gitc1a2c27.tar.gz) = 460b6e3cb32cd48c2c32efe30d4784a848befb35696de6123f8baee8d1e94e6735258f9d9e1069950bedae787e25e61b67bcdc13c5eba5fdd4ea271c6c7cdf29 +SHA512 (gmic-qt-20200908git97e2c23.tar.gz) = 979cd7b2934f17e8b95a7fabe461d6687c53b5eda3435cffed13f47654a76d6feead2f0c22b719a706049231b99db133fcc57017358637698ac2d8dc1fa28db6 +SHA512 (zart-20200908git9705abe.tar.gz) = f5451f08d8ef6e4f3a02ef1033634d84e15c80216de1250724f0e651f52b3736cfe5745540db6568c7ac0b2837d2cb5c153cfe3cfdd14f72dcf1f79c8575eac2 From 73b158a883d077c3bbd2fa032039ddbe19e19110 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 8 Sep 2020 21:27:15 +0200 Subject: [PATCH 031/136] add desktop-files --- gmic.spec | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index f798708..c1ec0d8 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.2 -Release: 1%{?dist} +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 @@ -39,6 +39,7 @@ BuildRequires: ilmbase-devel BuildRequires: qt5-qtbase-devel BuildRequires: libcurl-devel BuildRequires: gcc-c++ +BuildRequires: desktop-file-utils # The C library binding was mistakenly put in a -static # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 @@ -131,6 +132,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgmic.so.2 ln -s libgmic.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libgmic.so.2 ln -s libcgmic.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libcgmic.so.2 +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mv $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/gmic $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic rm -rf $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/ @@ -140,6 +144,18 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %ldconfig_scriptlets +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files %doc README %license COPYING COPYING-gmic-qt COPYING-libcgmic @@ -151,6 +167,12 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{_libdir}/libcgmic.so.* %{_mandir}/man1/%{name}.1.gz %{_mandir}/fr/man1/%{name}.1.gz +%{_datadir}/applications/gmic_qt.desktop +%{_datadir}/applications/zart.desktop +%{_datadir}/icons/hicolor/48x48/apps/gmic_qt.png +%{_datadir}/icons/hicolor/48x48/apps/zart.png +%{_datadir}/icons/hicolor/scalable/apps/gmic_qt.svg +%{_datadir}/icons/hicolor/scalable/apps/zart.svg %files devel %{_prefix}/include/gmic.h @@ -165,6 +187,7 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %changelog * Tue Sep 08 2020 josef radinger - 2.9.2-1 - bump version +- we now have desktop-files * Sat Aug 01 2020 Fedora Release Engineering - 2.9.1-4 - Second attempt - Rebuilt for From 40681d93904a428179018255fe29125f469c97a5 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 8 Sep 2020 21:32:25 +0200 Subject: [PATCH 032/136] fix release and changelog --- gmic.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index c1ec0d8..c08f2e6 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -185,9 +185,11 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 -- we now have desktop-files * Sat Aug 01 2020 Fedora Release Engineering - 2.9.1-4 - Second attempt - Rebuilt for From c5f320746380209954750bbb7171a60f50865b44 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 22 Oct 2020 13:29:06 +0200 Subject: [PATCH 033/136] Rebuilt for OpenCV --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index c08f2e6..45d73a2 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.2 -Release: 3%{?dist} +Release: 4%{?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 @@ -185,6 +185,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From f9ddfe6de762b1c9ac8e85d83b742c13d1f1a908 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 19 Nov 2020 20:11:41 +0100 Subject: [PATCH 034/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index c08f2e6..bd48009 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20200908git9705abe -%global gmic_qt_version 20200908git97e2c23 -%global gmic_community_version 20200908gitc1a2c27 +%global zart_version 20201119git5f454ff +%global gmic_qt_version 20201119git6ebe0aa +%global gmic_community_version 20201119gitf758d5f Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.2 -Release: 3%{?dist} +Version: 2.9.3 +Release: 1%{?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 @@ -185,6 +185,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* Thu Nov 19 2020 josef radinger - 2.9.3-1 +- bump version + * Tue Sep 08 2020 josef radinger - 2.9.2-3 - we now have desktop-files diff --git a/sources b/sources index 9012526..e5dfac2 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_2.9.2.tar.gz) = be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796 -SHA512 (gmic-community-20200908gitc1a2c27.tar.gz) = 460b6e3cb32cd48c2c32efe30d4784a848befb35696de6123f8baee8d1e94e6735258f9d9e1069950bedae787e25e61b67bcdc13c5eba5fdd4ea271c6c7cdf29 -SHA512 (gmic-qt-20200908git97e2c23.tar.gz) = 979cd7b2934f17e8b95a7fabe461d6687c53b5eda3435cffed13f47654a76d6feead2f0c22b719a706049231b99db133fcc57017358637698ac2d8dc1fa28db6 -SHA512 (zart-20200908git9705abe.tar.gz) = f5451f08d8ef6e4f3a02ef1033634d84e15c80216de1250724f0e651f52b3736cfe5745540db6568c7ac0b2837d2cb5c153cfe3cfdd14f72dcf1f79c8575eac2 +SHA512 (gmic-community-20201119gitf758d5f.tar.gz) = e021c028036acc199612ad3c517a459f85e593ebbe46dcb251f78183557b0217311cfb9c653f99e40d47e8b4ed8daac11812dc13177dc0ae68a3696fc8bdd3f8 +SHA512 (gmic-qt-20201119git6ebe0aa.tar.gz) = 5e2572e1dcbd95310021c885fec8a977947c86ed22a707116c7429efa8919aea0c486d092c5966adb9dda69a728812168b240af0beefad2c54cb560a86c068ae +SHA512 (zart-20201119git5f454ff.tar.gz) = 99fc0f8bc0f400c5815b27018e7f6bb5133be3c8929873afcef52d8df4fdefd37ef5a28056c5c9570bda59cbaed062205b0afb389589e7331bc8073aae37edb2 +SHA512 (gmic_2.9.3.tar.gz) = e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff From f57f878c3290c39c14c104f3e2729dc30ca51ec2 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 24 Nov 2020 19:04:25 +0100 Subject: [PATCH 035/136] new version --- sources | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sources b/sources index e5dfac2..4b97f9a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20201119gitf758d5f.tar.gz) = e021c028036acc199612ad3c517a459f85e593ebbe46dcb251f78183557b0217311cfb9c653f99e40d47e8b4ed8daac11812dc13177dc0ae68a3696fc8bdd3f8 -SHA512 (gmic-qt-20201119git6ebe0aa.tar.gz) = 5e2572e1dcbd95310021c885fec8a977947c86ed22a707116c7429efa8919aea0c486d092c5966adb9dda69a728812168b240af0beefad2c54cb560a86c068ae -SHA512 (zart-20201119git5f454ff.tar.gz) = 99fc0f8bc0f400c5815b27018e7f6bb5133be3c8929873afcef52d8df4fdefd37ef5a28056c5c9570bda59cbaed062205b0afb389589e7331bc8073aae37edb2 -SHA512 (gmic_2.9.3.tar.gz) = e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff +SHA512 (gmic-community-20201124gitad31a2d.tar.gz) = ad39266c632aab62d8fdb931a94a4ab2cc08f5b8d5e2da05f25f7be0b85b6abafe8fb31bde3e25101c5234b87f4d458859a3a64d9d5d20b8d88d4d529b65be16 +SHA512 (gmic-qt-20201124git6ebe0aa.tar.gz) = 5e2572e1dcbd95310021c885fec8a977947c86ed22a707116c7429efa8919aea0c486d092c5966adb9dda69a728812168b240af0beefad2c54cb560a86c068ae +SHA512 (zart-20201124git5f454ff.tar.gz) = 99fc0f8bc0f400c5815b27018e7f6bb5133be3c8929873afcef52d8df4fdefd37ef5a28056c5c9570bda59cbaed062205b0afb389589e7331bc8073aae37edb2 +SHA512 (gmic_2.9.4.tar.gz) = 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73 From 01dc9ac17726f1d157a87df14afe4dabdcf78278 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 24 Nov 2020 19:08:13 +0100 Subject: [PATCH 036/136] new version --- gmic.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index 14eb121..aba04a9 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20201119git5f454ff -%global gmic_qt_version 20201119git6ebe0aa -%global gmic_community_version 20201119gitf758d5f +%global zart_version 20201124git5f454ff +%global gmic_qt_version 20201124git6ebe0aa +%global gmic_community_version 20201124gitad31a2d Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.3 +Version: 2.9.4 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -185,6 +185,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* Tue Nov 24 2020 josef radinger - 2.9.4-1 +- bump version + * Thu Nov 19 2020 josef radinger - 2.9.3-1 - bump version From 52aee41d410dbad6311d7cd79657d3a6746eddba Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 23:39:38 +0000 Subject: [PATCH 037/136] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gmic.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gmic.spec b/gmic.spec index aba04a9..2c8167c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -40,6 +40,7 @@ BuildRequires: qt5-qtbase-devel BuildRequires: libcurl-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils +BuildRequires: make # The C library binding was mistakenly put in a -static # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 From bc96e5fbefc3cd1bc366824afb2fae1483ba9d4e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 1 Jan 2021 16:18:53 -0600 Subject: [PATCH 038/136] Rebuild for OpenEXR 2.5.3. --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 2c8167c..32236e4 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.4 -Release: 1%{?dist} +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 @@ -186,6 +186,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 9baa21b0d27c2fd9915a2c85b82b72e809ea8e20 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 5 Jan 2021 15:44:37 +0100 Subject: [PATCH 039/136] remove stray stash-file --- gmic.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 32236e4..80f1755 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.4 -Release: 2%{?dist} +Release: 3%{?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 @@ -85,6 +85,9 @@ Provides a plugin for using G'MIC from GIMP %patch2 -p1 -b.arch %endif +# remove stash-file (thanks Wolfgang Lieff ) +rm -f zart/.qmake.stash + %build export CCACHE_DISABLE=1 cd src @@ -186,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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. From a6fd994c5d315f14cc0c49336d7d0aa013afac3b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 12 Jan 2021 11:59:41 +0900 Subject: [PATCH 040/136] Once make this package available on buildable arch --- gmic.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 80f1755..73b2788 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.4 -Release: 3%{?dist} +Release: 4%{?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 @@ -47,6 +47,12 @@ Obsoletes: gmic-static <= 2.1.8 Patch2: Makefile_arch.patch +# Once make gmic available on buildable arch +# https://bugzilla.redhat.com/show_bug.cgi?id=1912016 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98514 +# Once build on buildable arch, again remote the following line +ExcludeArch: %ix86 armv7hl + %description G'MIC is an open and full-featured framework for image processing, providing @@ -189,6 +195,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 422e9a35ac15a2c5b4a84852c1851546f58b6e2a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 12 Jan 2021 15:32:24 +0900 Subject: [PATCH 041/136] Again try to build on all archs --- gmic.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gmic.spec b/gmic.spec index 73b2788..434c229 100644 --- a/gmic.spec +++ b/gmic.spec @@ -47,12 +47,6 @@ Obsoletes: gmic-static <= 2.1.8 Patch2: Makefile_arch.patch -# Once make gmic available on buildable arch -# https://bugzilla.redhat.com/show_bug.cgi?id=1912016 -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98514 -# Once build on buildable arch, again remote the following line -ExcludeArch: %ix86 armv7hl - %description G'MIC is an open and full-featured framework for image processing, providing @@ -195,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 743a253c5672cb4fa5689e11f0412de71b3e87d2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 12 Jan 2021 15:34:29 +0900 Subject: [PATCH 042/136] bump release --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 434c229..c7022e9 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.4 -Release: 4%{?dist} +Release: 5%{?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 From a849004add6cd202ffba3f04cdd7937666f98d8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:28:10 +0000 Subject: [PATCH 043/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index c7022e9..118a748 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.4 -Release: 5%{?dist} +Release: 6%{?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 @@ -189,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From d81280dc3de30d46c6402699cf3f86e63a05b2b5 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 11 Feb 2021 08:50:26 +0100 Subject: [PATCH 044/136] bump version --- gmic.spec | 13 ++++++++----- sources | 5 +---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 118a748..fbd345e 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20201124git5f454ff -%global gmic_qt_version 20201124git6ebe0aa -%global gmic_community_version 20201124gitad31a2d +%global zart_version 20210211git939cf38 +%global gmic_qt_version 20210211gitd5eea06 +%global gmic_community_version 20210211gita8e0cb5 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.4 -Release: 6%{?dist} +Version: 2.9.6 +Release: 1%{?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 @@ -189,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 diff --git a/sources b/sources index 4b97f9a..2578356 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (gmic-community-20201124gitad31a2d.tar.gz) = ad39266c632aab62d8fdb931a94a4ab2cc08f5b8d5e2da05f25f7be0b85b6abafe8fb31bde3e25101c5234b87f4d458859a3a64d9d5d20b8d88d4d529b65be16 -SHA512 (gmic-qt-20201124git6ebe0aa.tar.gz) = 5e2572e1dcbd95310021c885fec8a977947c86ed22a707116c7429efa8919aea0c486d092c5966adb9dda69a728812168b240af0beefad2c54cb560a86c068ae -SHA512 (zart-20201124git5f454ff.tar.gz) = 99fc0f8bc0f400c5815b27018e7f6bb5133be3c8929873afcef52d8df4fdefd37ef5a28056c5c9570bda59cbaed062205b0afb389589e7331bc8073aae37edb2 -SHA512 (gmic_2.9.4.tar.gz) = 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73 +SHA512 (gmic_2.9.6.tar.gz) = 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2 From 91616fd4d5b9595c8a4b1c3a0c16f1df58d49b5e Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 11 Feb 2021 08:54:38 +0100 Subject: [PATCH 045/136] bump version --- sources | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources b/sources index 2578356..060f7d2 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ SHA512 (gmic_2.9.6.tar.gz) = 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2 +SHA512 (gmic-community-20210211gita8e0cb5.tar.gz) = 86aaf0eb967a908dca1f097e2ae5aa17ae646a9c6852d0f85543dbfe787a825d2738444a6138b20d5a20c242a2e96ba82e2e85e2a14dc94bbf17caf5744e3f93 +SHA512 (gmic-qt-20210211gitd5eea06.tar.gz) = 91518c33d4ff6f3b30f8c533b6ee50a779383a3fe2c6418ccc24a953651701da9fd7722bb1a30d69ac754617c86cb373e2f0a13b93352b1dac3235118f652d6b +SHA512 (zart-20210211git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 From d12197dd5e1ddad086dfdec9c3abee986aed6811 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 9 Apr 2021 18:35:05 +0200 Subject: [PATCH 046/136] bump version --- gmic.spec | 11 +++++++---- sources | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index fbd345e..4cb8226 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20210211git939cf38 -%global gmic_qt_version 20210211gitd5eea06 -%global gmic_community_version 20210211gita8e0cb5 +%global zart_version 20210409git939cf38 +%global gmic_qt_version 20210409git56a0658 +%global gmic_community_version 20210409git1dd8115 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.6 +Version: 2.9.7 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -189,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* Fri Apr 09 2021 josef radinger - 2.9.7-1 +- bump version + * Thu Feb 11 2021 josef radinger - 2.9.6-1 - bump version diff --git a/sources b/sources index 060f7d2..fec6daf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_2.9.6.tar.gz) = 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2 -SHA512 (gmic-community-20210211gita8e0cb5.tar.gz) = 86aaf0eb967a908dca1f097e2ae5aa17ae646a9c6852d0f85543dbfe787a825d2738444a6138b20d5a20c242a2e96ba82e2e85e2a14dc94bbf17caf5744e3f93 -SHA512 (gmic-qt-20210211gitd5eea06.tar.gz) = 91518c33d4ff6f3b30f8c533b6ee50a779383a3fe2c6418ccc24a953651701da9fd7722bb1a30d69ac754617c86cb373e2f0a13b93352b1dac3235118f652d6b -SHA512 (zart-20210211git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic-community-20210409git1dd8115.tar.gz) = 459a273378d71c5c722f9beab9b681dc968e46c29ecf0428e989ae83b2680e45c346c6e84eec3a68e7fabb24d9b548943f6499d9bdf4c259102a85079ab49a6d +SHA512 (gmic-qt-20210409git56a0658.tar.gz) = 8c2fd4df2b5411cf25b520c4a9fa126ee66c526f23adb9b08b60273f034f53181740fd75d408022d741c357eb2f20804e89c9327d325d53c7e94ae64d959ce26 +SHA512 (zart-20210409git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic_2.9.7.tar.gz) = d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730 From e195487ff1d9b2545b09c83a408e2113b91be025 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 20 Jul 2021 13:32:47 +0200 Subject: [PATCH 047/136] bump version --- gmic.spec | 11 +++++++---- sources | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index 4cb8226..869484d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20210409git939cf38 -%global gmic_qt_version 20210409git56a0658 -%global gmic_community_version 20210409git1dd8115 +%global zart_version 20210720git939cf38 +%global gmic_qt_version 20210720git2885531 +%global gmic_community_version 20210720git06dab61 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.7 +Version: 2.9.8 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -189,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* Tue Jul 20 2021 josef radinger - 2.9.8-1 +- bump version + * Fri Apr 09 2021 josef radinger - 2.9.7-1 - bump version diff --git a/sources b/sources index fec6daf..6b9b5af 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20210409git1dd8115.tar.gz) = 459a273378d71c5c722f9beab9b681dc968e46c29ecf0428e989ae83b2680e45c346c6e84eec3a68e7fabb24d9b548943f6499d9bdf4c259102a85079ab49a6d -SHA512 (gmic-qt-20210409git56a0658.tar.gz) = 8c2fd4df2b5411cf25b520c4a9fa126ee66c526f23adb9b08b60273f034f53181740fd75d408022d741c357eb2f20804e89c9327d325d53c7e94ae64d959ce26 -SHA512 (zart-20210409git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 -SHA512 (gmic_2.9.7.tar.gz) = d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730 +SHA512 (gmic-community-20210720git06dab61.tar.gz) = 68234ed9334df39726aea43b2622956ef10b9355208b47bb3caca977b3497850bcd2a67054d26c3f3785e4bdb1a7eac34fa5270fcc1fc789b5e946b825a99675 +SHA512 (gmic-qt-20210720git2885531.tar.gz) = 3757c34b7b092dcb1846788f65af008d1df0bb45da1bcb80896bce8e9ad2f47eed7030e1708dfb9f1b32bb8c369cb865961264a819b5d4bd7297cd07e9d55605 +SHA512 (zart-20210720git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic_2.9.8.tar.gz) = 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3 From 5e7f19fb9347c1e8d44a3e371e188b37d4ab9fec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 02:01:38 +0000 Subject: [PATCH 048/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 869484d..c2292f6 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.8 -Release: 1%{?dist} +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 @@ -189,6 +189,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 80dc95d4ac2fd201978dc2509b380fb2efd306be Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 31 Jul 2021 10:54:44 -0500 Subject: [PATCH 049/136] Rebuild with OpenEXR/Imath 3. --- gmic-openexr3.patch | 31 +++++++++++++++++++++++++++++++ gmic.spec | 15 ++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gmic-openexr3.patch diff --git a/gmic-openexr3.patch b/gmic-openexr3.patch new file mode 100644 index 0000000..7b8c138 --- /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-2.9.7.orig/src/Makefile ++++ gmic-2.9.7/src/Makefile +@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs + + # Enable native support of EXR image files, using the OpenEXR library. + # (http://www.openexr.com/) +-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR +-OPENEXR_LIBS = -lIlmImf -lHalf ++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath ++OPENEXR_LIBS = -lOpenEXR -lImath + + # Enable Fast Fourier Transforms, using the FFTW3 library. + # (http://www.fftw.org/) diff --git a/gmic.spec b/gmic.spec index c2292f6..d92bdd0 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.8 -Release: 2%{?dist} +Release: 3%{?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 @@ -29,7 +29,12 @@ BuildRequires: libtiff-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: fftw-devel +%if 0%{?fedora} > 34 +BuildRequires: openexr-devel +BuildRequires: imath-devel +%else BuildRequires: OpenEXR-devel +%endif BuildRequires: zlib-devel BuildRequires: gimp-devel-tools BuildRequires: hdf5-devel @@ -45,6 +50,7 @@ BuildRequires: make # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 +Patch0: gmic-openexr3.patch Patch2: Makefile_arch.patch @@ -81,6 +87,10 @@ Provides a plugin for using G'MIC from GIMP %prep %setup -q -a 1 -a 2 -a 3 +%if 0%{?fedora} > 34 +%patch0 -p1 +%endif + %ifarch armv7hl s390x ppc64le %patch2 -p1 -b.arch %endif @@ -189,6 +199,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 44348b07cf22aed61943075473ff1e3f24499d40 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 31 Jul 2021 16:57:24 -0500 Subject: [PATCH 050/136] Move ilmbase into OpenEXR conditional as it has been absorbed into OpenEXR as of 2.5. --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index d92bdd0..4ba9bb3 100644 --- a/gmic.spec +++ b/gmic.spec @@ -34,13 +34,13 @@ BuildRequires: openexr-devel BuildRequires: imath-devel %else BuildRequires: OpenEXR-devel +BuildRequires: ilmbase-devel %endif BuildRequires: zlib-devel BuildRequires: gimp-devel-tools BuildRequires: hdf5-devel BuildRequires: opencv-devel BuildRequires: GraphicsMagick-c++-devel -BuildRequires: ilmbase-devel BuildRequires: qt5-qtbase-devel BuildRequires: libcurl-devel BuildRequires: gcc-c++ From d5c8623057735f54230597c971d192e70e6ed973 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 20 Aug 2021 21:41:46 -0500 Subject: [PATCH 051/136] Rebuild for OpenEXR/Imath 3.1. --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 4ba9bb3..72d31fd 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.8 -Release: 3%{?dist} +Release: 4%{?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 @@ -199,6 +199,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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. From dad3fa712bce12112b21a0f8cc3fa142f961a9bb Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 6 Sep 2021 22:19:07 +0200 Subject: [PATCH 052/136] bump version --- gmic.spec | 13 ++++++++----- sources | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 72d31fd..616a420 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20210720git939cf38 -%global gmic_qt_version 20210720git2885531 -%global gmic_community_version 20210720git06dab61 +%global zart_version 20210906git939cf38 +%global gmic_qt_version 20210906git1c181e0 +%global gmic_community_version 20210906git38af865 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.8 -Release: 4%{?dist} +Version: 2.9.9 +Release: 1%{?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 @@ -199,6 +199,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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. diff --git a/sources b/sources index 6b9b5af..6573d13 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20210720git06dab61.tar.gz) = 68234ed9334df39726aea43b2622956ef10b9355208b47bb3caca977b3497850bcd2a67054d26c3f3785e4bdb1a7eac34fa5270fcc1fc789b5e946b825a99675 -SHA512 (gmic-qt-20210720git2885531.tar.gz) = 3757c34b7b092dcb1846788f65af008d1df0bb45da1bcb80896bce8e9ad2f47eed7030e1708dfb9f1b32bb8c369cb865961264a819b5d4bd7297cd07e9d55605 -SHA512 (zart-20210720git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 -SHA512 (gmic_2.9.8.tar.gz) = 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3 +SHA512 (gmic-community-20210906git38af865.tar.gz) = 821f75061e8364fe818f2da610e80b5b64ac40b7f7baa41230d54bbf7c8757c98deeb7f16e71e682b40fa24e5711be82d03a7ef086fc7355b63f1c51c31ef930 +SHA512 (gmic-qt-20210906git1c181e0.tar.gz) = 1e498d7f3e2989eb05a7bce86287d6d12c13fcd7064b7598ef2db20cc893fb1ff339ccfddc3e68642fb32c020eceb2a700426e9cf98c93f8c877d692a793f707 +SHA512 (zart-20210906git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic_2.9.9.tar.gz) = fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64 From 711d2b47b1498ffde583dee0179661f71c7ad526 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Nov 2021 08:42:20 -0700 Subject: [PATCH 053/136] Rebuild for hdf5 1.12.1 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 616a420..2d0f180 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 2.9.9 -Release: 1%{?dist} +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 @@ -199,6 +199,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* 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 From 6d0c92a364b08ef9d12fdc997536fd72aed00701 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 11 Dec 2021 14:22:32 +0100 Subject: [PATCH 054/136] bump version --- gmic.spec | 11 +++++++---- sources | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index 616a420..1e7bf18 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20210906git939cf38 -%global gmic_qt_version 20210906git1c181e0 -%global gmic_community_version 20210906git38af865 +%global zart_version 20211211git939cf38 +%global gmic_qt_version 20211211git8362bda +%global gmic_community_version 20211211git986f39e Summary: GREYC's Magic for Image Computing Name: gmic -Version: 2.9.9 +Version: 3.0.0 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -199,6 +199,9 @@ fi %{gimpplugindir}/gmic_cluts.gmz %changelog +* Sat Dec 11 2021 josef radinger -3.0.0-1 +- bump version + * Mon Sep 06 2021 josef radinger - 2.9.9-1 - bump version diff --git a/sources b/sources index 6573d13..9ff0385 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20210906git38af865.tar.gz) = 821f75061e8364fe818f2da610e80b5b64ac40b7f7baa41230d54bbf7c8757c98deeb7f16e71e682b40fa24e5711be82d03a7ef086fc7355b63f1c51c31ef930 -SHA512 (gmic-qt-20210906git1c181e0.tar.gz) = 1e498d7f3e2989eb05a7bce86287d6d12c13fcd7064b7598ef2db20cc893fb1ff339ccfddc3e68642fb32c020eceb2a700426e9cf98c93f8c877d692a793f707 -SHA512 (zart-20210906git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 -SHA512 (gmic_2.9.9.tar.gz) = fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64 +SHA512 (gmic_3.0.0.tar.gz) = 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c +SHA512 (gmic-community-20211211git986f39e.tar.gz) = c703abfd2ca647619d2ebace9cd60b8643cf82e7c467d3c3326d90feaf3cacc67af612e884675768a10365569f2d05b116233ca9de3afb4fbe72e8e741449f44 +SHA512 (gmic-qt-20211211git8362bda.tar.gz) = 70d284e60dda53a02eb641c998039f5b5d807c432222b7062fa02dffa4b4c9e3580a5c4fa99b83415b13423250aee1cd9aa58680b8ea6a2b829d95a0e20679bd +SHA512 (zart-20211211git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 From c0eb560b8f765f5eeab9540e5e207d4e605e4d85 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 11 Dec 2021 15:41:22 +0100 Subject: [PATCH 055/136] fix gmic-openexr3.patch --- gmic-openexr3.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gmic-openexr3.patch b/gmic-openexr3.patch index 7b8c138..6cde4fe 100644 --- a/gmic-openexr3.patch +++ b/gmic-openexr3.patch @@ -16,16 +16,16 @@ Index: gmic-2.9.7/cmake/FindCImg.cmake list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr") Index: gmic-2.9.7/src/Makefile =================================================================== ---- gmic-2.9.7.orig/src/Makefile -+++ gmic-2.9.7/src/Makefile -@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs +--- 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 -I$(USR)/$(INCLUDE)/OpenEXR --OPENEXR_LIBS = -lIlmImf -lHalf -+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath -+OPENEXR_LIBS = -lOpenEXR -lImath +-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/) From 61da73dfc920481eea0d35067a58c5d3eb61cf33 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 14 Jan 2022 12:00:31 +0100 Subject: [PATCH 056/136] bump version --- gmic.spec | 13 +++++++++---- sources | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index 18c98e2..2dcfc23 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20211211git939cf38 -%global gmic_qt_version 20211211git8362bda -%global gmic_community_version 20211211git986f39e +%global zart_version 20220114git939cf38 +%global gmic_qt_version 20220114gitaabb16b +%global gmic_community_version 20220114gitbf88a09 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -197,8 +197,13 @@ fi %files gimp %{gimpplugindir}/gmic_gimp_qt %{gimpplugindir}/gmic_cluts.gmz +%{gimpplugindir}/gmic_denoise_cnn.gmz %changelog +* 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 diff --git a/sources b/sources index 9ff0385..be98c47 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.0.0.tar.gz) = 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c -SHA512 (gmic-community-20211211git986f39e.tar.gz) = c703abfd2ca647619d2ebace9cd60b8643cf82e7c467d3c3326d90feaf3cacc67af612e884675768a10365569f2d05b116233ca9de3afb4fbe72e8e741449f44 -SHA512 (gmic-qt-20211211git8362bda.tar.gz) = 70d284e60dda53a02eb641c998039f5b5d807c432222b7062fa02dffa4b4c9e3580a5c4fa99b83415b13423250aee1cd9aa58680b8ea6a2b829d95a0e20679bd -SHA512 (zart-20211211git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic-community-20220114gitbf88a09.tar.gz) = 7eb6cf5689de45ffad32089a0974418be69c001ee7a2bf40702206ebc1d11f54a364d625e53f7c15371a5c38b4e3a46ffb0e9d2ba2c2d0cf37d1efd9b9556977 +SHA512 (gmic-qt-20220114gitaabb16b.tar.gz) = e788ed411ecf59edb8adbeb7d96a8a215d25ac6043f867027161e5fcc0be6f720bf19ec098cb0f99049bce52a38faca663ebe7a47872fe8d936dbdaededa0039 +SHA512 (zart-20220114git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic_3.0.1.tar.gz) = 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a From 1762b6d525fac5ba297e5b4f1de59d11f3c98397 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 17 Jan 2022 08:14:13 +0100 Subject: [PATCH 057/136] fix arch --- Makefile_arch.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile_arch.patch b/Makefile_arch.patch index 9e13f57..ddbd038 100644 --- a/Makefile_arch.patch +++ b/Makefile_arch.patch @@ -2,7 +2,7 @@ +++ gmic-2.9.1/src/Makefile 2020-06-12 09:33:42.374067915 +0200 @@ -194,7 +194,7 @@ FLTO = -flto - OPT_CLI_CFLAGS = -Ofast + OPT_CLI_CFLAGS = ifdef IS_GCC -OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO) +OPT_CLI_CFLAGS = -Ofast $(FLTO) From 71e3646342f79f15eb55a0b87f76cff88c045f5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 06:25:28 +0000 Subject: [PATCH 058/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 2dcfc23..177dc4b 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.0.1 -Release: 1%{?dist} +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 @@ -200,6 +200,9 @@ fi %{gimpplugindir}/gmic_denoise_cnn.gmz %changelog +* 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 From 9120c6ca7ea68f9e6d99ce26cad333c27eaae2b3 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 26 Jan 2022 07:34:16 +0100 Subject: [PATCH 059/136] bump version --- gmic.spec | 11 +++++++---- sources | 5 +---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index 177dc4b..e442f33 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,13 +3,13 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20220114git939cf38 -%global gmic_qt_version 20220114gitaabb16b -%global gmic_community_version 20220114gitbf88a09 +%global zart_version 20220126git939cf38 +%global gmic_qt_version 20220126gitaabb16b +%global gmic_community_version 20220126git9c16dbb Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.0.1 +Version: 3.0.2 Release: 2%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -200,6 +200,9 @@ fi %{gimpplugindir}/gmic_denoise_cnn.gmz %changelog +* 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 diff --git a/sources b/sources index be98c47..c80d2da 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (gmic-community-20220114gitbf88a09.tar.gz) = 7eb6cf5689de45ffad32089a0974418be69c001ee7a2bf40702206ebc1d11f54a364d625e53f7c15371a5c38b4e3a46ffb0e9d2ba2c2d0cf37d1efd9b9556977 -SHA512 (gmic-qt-20220114gitaabb16b.tar.gz) = e788ed411ecf59edb8adbeb7d96a8a215d25ac6043f867027161e5fcc0be6f720bf19ec098cb0f99049bce52a38faca663ebe7a47872fe8d936dbdaededa0039 -SHA512 (zart-20220114git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 -SHA512 (gmic_3.0.1.tar.gz) = 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a +SHA512 (gmic_3.0.2.tar.gz) = 15a2c31b5a10bd700aa66b46e4d0c553ae685668fb1fd4db97052ca578bfea85d0b5829d0593f71d3ac4b97b9b88810ee751f44cb11901067d9fe2217b4ca2b5 From 4fa146aa180456eea5b2067bfb6c02df3d326e59 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 16 Feb 2022 14:49:35 -0500 Subject: [PATCH 060/136] Update sources file --- sources | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources b/sources index c80d2da..5e5bf04 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ SHA512 (gmic_3.0.2.tar.gz) = 15a2c31b5a10bd700aa66b46e4d0c553ae685668fb1fd4db97052ca578bfea85d0b5829d0593f71d3ac4b97b9b88810ee751f44cb11901067d9fe2217b4ca2b5 +SHA512 (gmic-community-20220126git9c16dbb.tar.gz) = d92aaadcd9ff1016d17acd96dae3d2729155744086ec0fb08c210a6e2f0296369eb0ee58b0762af80704607167aefea8aada87bfba8dbde6478b256d0921efe6 +SHA512 (gmic-qt-20220126gitaabb16b.tar.gz) = e788ed411ecf59edb8adbeb7d96a8a215d25ac6043f867027161e5fcc0be6f720bf19ec098cb0f99049bce52a38faca663ebe7a47872fe8d936dbdaededa0039 +SHA512 (zart-20220126git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 From 42e2339acc1f5dcadac9d1af942fe36ada557db5 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 29 Apr 2022 21:41:24 +0200 Subject: [PATCH 061/136] bump version --- gmic.spec | 15 +++++++++------ sources | 5 +---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gmic.spec b/gmic.spec index e442f33..5a903f2 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,14 +3,14 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20220126git939cf38 -%global gmic_qt_version 20220126gitaabb16b -%global gmic_community_version 20220126git9c16dbb +%global zart_version 20220429gitac29dcb +%global gmic_qt_version 20220429git6d69f1c +%global gmic_community_version 20220429git7b85db6 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.1.0 +Release: 1%{?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 @@ -200,7 +200,10 @@ fi %{gimpplugindir}/gmic_denoise_cnn.gmz %changelog -* Wed Jan 26 2022 josef radinger -3.0.2-1 +* Thu Apr 28 2022 josef radinger - 3.1.0-1 +- bump version + +* Wed Jan 26 2022 josef radinger - 3.0.2-1 - bump version * Thu Jan 20 2022 Fedora Release Engineering - 3.0.1-2 diff --git a/sources b/sources index 5e5bf04..9c5582f 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (gmic_3.0.2.tar.gz) = 15a2c31b5a10bd700aa66b46e4d0c553ae685668fb1fd4db97052ca578bfea85d0b5829d0593f71d3ac4b97b9b88810ee751f44cb11901067d9fe2217b4ca2b5 -SHA512 (gmic-community-20220126git9c16dbb.tar.gz) = d92aaadcd9ff1016d17acd96dae3d2729155744086ec0fb08c210a6e2f0296369eb0ee58b0762af80704607167aefea8aada87bfba8dbde6478b256d0921efe6 -SHA512 (gmic-qt-20220126gitaabb16b.tar.gz) = e788ed411ecf59edb8adbeb7d96a8a215d25ac6043f867027161e5fcc0be6f720bf19ec098cb0f99049bce52a38faca663ebe7a47872fe8d936dbdaededa0039 -SHA512 (zart-20220126git939cf38.tar.gz) = bfa111fd73c1899d71ab055227f9c2c078d7ad017fed438ac68005680154fb6bb68f5daa0d63fa4710976d81fca22cba4445e0346ecdd065169aee9867afbaa8 +SHA512 (gmic_3.1.0.tar.gz) = 0dd1a524901f044cf4c964b62d110168a396f68af8aed367f341a72fd06e60a9f02ab80f3e294bf6ae4243ba0acc0897d6f97f100beb890dab3ba385bf0b9976 From 0e7a930aee6585ecf3a1db5f671b0119dd05c0fd Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 29 Apr 2022 21:49:27 +0200 Subject: [PATCH 062/136] bump version --- sources | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources b/sources index 9c5582f..df1a516 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (gmic_3.1.0.tar.gz) = 0dd1a524901f044cf4c964b62d110168a396f68af8aed367f341a72fd06e60a9f02ab80f3e294bf6ae4243ba0acc0897d6f97f100beb890dab3ba385bf0b9976 +SHA512 (gmic-community-20220429git7b85db6.tar.gz) = fcacfe8d0f5b8550aee58e88145e11f800c2e920919b1f61a60ff8ead8ce0f59386d40f7885e362de312a6c8d6c6588777a0a8cdecb49dc77f52325989ef2c3a +SHA512 (gmic-qt-20220429git6d69f1c.tar.gz) = 1a4f2685dd22f14e59f4b1b953f2107ce004eb8448e6162de19b33c2b70724bc27fdc364cd65502b59f3eebf280c7eb6bbf63b5529b30dab9460be49def7aadf +SHA512 (zart-20220429gitac29dcb.tar.gz) = c39851839ca48bc6f988a2b11579afb1e5ce13f6b3e52547148bcc18344795af77fef2b5a83ab7ee29632746e195f98fdfbd816bb5ff4bc4a66a66ed579a2ae5 From 1d037a22a379754a6b22288162df68e363cea7c8 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 29 Apr 2022 21:52:19 +0200 Subject: [PATCH 063/136] bump version --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index df1a516..2a477e0 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (gmic-community-20220429git7b85db6.tar.gz) = fcacfe8d0f5b8550aee58e88145e11f800c2e920919b1f61a60ff8ead8ce0f59386d40f7885e362de312a6c8d6c6588777a0a8cdecb49dc77f52325989ef2c3a SHA512 (gmic-qt-20220429git6d69f1c.tar.gz) = 1a4f2685dd22f14e59f4b1b953f2107ce004eb8448e6162de19b33c2b70724bc27fdc364cd65502b59f3eebf280c7eb6bbf63b5529b30dab9460be49def7aadf SHA512 (zart-20220429gitac29dcb.tar.gz) = c39851839ca48bc6f988a2b11579afb1e5ce13f6b3e52547148bcc18344795af77fef2b5a83ab7ee29632746e195f98fdfbd816bb5ff4bc4a66a66ed579a2ae5 +SHA512 (gmic_3.1.0.tar.gz) = 0dd1a524901f044cf4c964b62d110168a396f68af8aed367f341a72fd06e60a9f02ab80f3e294bf6ae4243ba0acc0897d6f97f100beb890dab3ba385bf0b9976 From ecbcce29053f401db9eb9076ff30343930052548 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 5 May 2022 09:32:13 +0200 Subject: [PATCH 064/136] bump version --- gmic.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gmic.spec b/gmic.spec index 5a903f2..356f14f 100644 --- a/gmic.spec +++ b/gmic.spec @@ -87,9 +87,9 @@ Provides a plugin for using G'MIC from GIMP %prep %setup -q -a 1 -a 2 -a 3 -%if 0%{?fedora} > 34 -%patch0 -p1 -%endif +#%if 0%{?fedora} > 34 +#%patch0 -p1 +#%endif %ifarch armv7hl s390x ppc64le %patch2 -p1 -b.arch @@ -202,6 +202,7 @@ fi %changelog * Thu Apr 28 2022 josef radinger - 3.1.0-1 - bump version +- disable patch0 * Wed Jan 26 2022 josef radinger - 3.0.2-1 - bump version From 795619f0e8371e29dbcf80981e627bec0becdc1d Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 5 May 2022 09:53:48 +0200 Subject: [PATCH 065/136] bump version --- gmic.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gmic.spec b/gmic.spec index 356f14f..3c65d54 100644 --- a/gmic.spec +++ b/gmic.spec @@ -91,9 +91,9 @@ Provides a plugin for using G'MIC from GIMP #%patch0 -p1 #%endif -%ifarch armv7hl s390x ppc64le -%patch2 -p1 -b.arch -%endif +#%ifarch armv7hl s390x ppc64le +#%patch2 -p1 -b.arch +#%endif # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -203,6 +203,7 @@ fi * Thu Apr 28 2022 josef radinger - 3.1.0-1 - bump version - disable patch0 +- disable patch2 * Wed Jan 26 2022 josef radinger - 3.0.2-1 - bump version From 58605f4f29a047e971112cbc1714ffd296929533 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 5 May 2022 20:46:21 +0200 Subject: [PATCH 066/136] remove rpaths --- gmic.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gmic.spec b/gmic.spec index 3c65d54..f7812d4 100644 --- a/gmic.spec +++ b/gmic.spec @@ -46,6 +46,8 @@ BuildRequires: libcurl-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: make +BuildRequires: chrpath + # The C library binding was mistakenly put in a -static # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 @@ -156,6 +158,11 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/ # Sourced files shouldn't be executable 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.* +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.* + %ldconfig_scriptlets %post @@ -204,6 +211,7 @@ fi - bump version - disable patch0 - disable patch2 +- BuildRequires: chrpath * Wed Jan 26 2022 josef radinger - 3.0.2-1 - bump version From 9c6b1b1534a9bc79015ca61386a5d8679b70dfab Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 6 May 2022 15:03:33 +0200 Subject: [PATCH 067/136] remove rpaths --- gmic.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index f7812d4..873805c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -160,8 +160,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.* -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.* +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.310 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.310 %ldconfig_scriptlets From 0ed7f8345d349253338bf700aaccc03be4720a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 21 Jun 2022 02:15:37 +0100 Subject: [PATCH 068/136] Rebuilt for opencv 4.6.0 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 873805c..6a47abf 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.0 -Release: 1%{?dist} +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 @@ -207,6 +207,9 @@ fi %{gimpplugindir}/gmic_denoise_cnn.gmz %changelog +* 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 From d0341885f8cac289e87e5a6300155f4e5fb362d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:40:17 +0000 Subject: [PATCH 069/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 6a47abf..41d9f1e 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -207,6 +207,9 @@ fi %{gimpplugindir}/gmic_denoise_cnn.gmz %changelog +* 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 From 6d782a6e7588f5e14ddcfe10a8be204570abe32d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 Sep 2022 10:57:55 +0200 Subject: [PATCH 070/136] Clean up multilib path install With upstream https://github.com/GreycLab/gmic/pull/412 backported, we can just pass PREFIX and LIB to Makefile and it installs everything in the correct location. --- gmic-prefix-fixes.patch | 321 ++++++++++++++++++++++++++++++++++++++++ gmic.spec | 20 +-- 2 files changed, 332 insertions(+), 9 deletions(-) create mode 100644 gmic-prefix-fixes.patch diff --git a/gmic-prefix-fixes.patch b/gmic-prefix-fixes.patch new file mode 100644 index 0000000..50aba70 --- /dev/null +++ b/gmic-prefix-fixes.patch @@ -0,0 +1,321 @@ +From 27655a3200c07546c74e3c56a315188678b13d26 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 3 Sep 2022 20:18:14 +0200 +Subject: [PATCH 1/3] Makefile: Rename USR variable to PREFIX + +Call it prefix as this is what almost all other build systems use for +choosing the install location. +--- + src/Makefile | 126 +++++++++++++++++++++++++-------------------------- + 1 file changed, 63 insertions(+), 63 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 2b09aef5..ff98dfbe 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -80,7 +80,7 @@ + + # Try to auto-detect target OS. + OS = $(shell uname) +-USR = /usr ++PREFIX = /usr + LIB = lib + BIN = bin + INCLUDE = include +@@ -120,12 +120,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 +134,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 +181,13 @@ PRERELEASE = $(shell date +%y%m%d) + 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 +264,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 +317,12 @@ OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_hi + + # 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 +439,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) \ +@@ -810,35 +810,35 @@ 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 \ +@@ -851,43 +851,43 @@ install: + fi; \ + 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 + +-- +2.37.2 + + +From 6a5f47813e4a8d789b5eadd8969c1b1d1ffe902f Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 3 Sep 2022 20:20:30 +0200 +Subject: [PATCH 2/3] Makefile: Make a few variables configurable + +This makes it easier for downstreams to choose where they want to put +the files, such as libs going into /usr/lib64 in Fedora, or use the /app +prefix for flatpaks. +--- + src/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index ff98dfbe..62aea93b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -80,10 +80,10 @@ + + # Try to auto-detect target OS. + OS = $(shell uname) +-PREFIX = /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 +-- +2.37.2 + + +From 5dd4ccf624552ef582f46af159f5c13d0cf43be5 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 3 Sep 2022 20:36:28 +0200 +Subject: [PATCH 3/3] Makefile: Avoid hardcoding bash-completion paths + +Instead, use pkg-config to query the bash-completion path, which +both makes the makefile simpler and also helps get the path right in +more cases. +--- + src/Makefile | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 62aea93b..32da0424 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -88,6 +88,7 @@ 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) +@@ -841,14 +842,8 @@ install: + 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)$(PREFIX)/share/applications; \ +-- +2.37.2 + diff --git a/gmic.spec b/gmic.spec index 41d9f1e..478f926 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.0 -Release: 3%{?dist} +Release: 4%{?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 @@ -54,6 +54,9 @@ Obsoletes: gmic-static <= 2.1.8 Patch0: gmic-openexr3.patch Patch2: Makefile_arch.patch +# Backported from upstream +# https://github.com/GreycLab/gmic/pull/412 +Patch3: gmic-prefix-fixes.patch %description @@ -97,6 +100,8 @@ Provides a plugin for using G'MIC from GIMP #%patch2 -p1 -b.arch #%endif +%patch3 -p1 -F1 -b.prefix-fixes + # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -116,7 +121,7 @@ mv CImg.h CImg.h.bak cp /usr/include/CImg.h CImg.h %endif -make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 cli lib libc +make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 PREFIX=%{_prefix} LIB=%{_lib} cli lib libc cd ../gmic-qt %{qmake_qt5} CONFIG+=release GMIC_PATH=../src HOST=gimp gmic_qt.pro && %{make_build} @@ -134,13 +139,7 @@ iconv -f iso8859-1 -t utf-8 COPYING > COPYING.conv && mv -f COPYING.conv COPYING iconv -f iso8859-1 -t utf-8 COPYING-libcgmic > COPYING-libcgmic.conv && mv -f COPYING-libcgmic.conv COPYING-libcgmic cd src -make DESTDIR=$RPM_BUILD_ROOT install - -# Makefile is not multilib aware -if test "%{_prefix}/lib" != "%{_libdir}" -then - mv $RPM_BUILD_ROOT/%{_prefix}/lib/* $RPM_BUILD_ROOT/%{_libdir}/ -fi +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install # Makefile creates too many intermediate symlinks for the library rm -f $RPM_BUILD_ROOT/%{_libdir}/libgmic.so.2 @@ -207,6 +206,9 @@ fi %{gimpplugindir}/gmic_denoise_cnn.gmz %changelog +* 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 From 12ed2d9cb7dccb05ce9371375843c7bc06956221 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 9 Oct 2022 11:08:05 +0200 Subject: [PATCH 071/136] Split out gmic-libs to a subpackage This makes it possible for darktable to only pull in gmic-libs, reducing the dependency set. --- gmic.spec | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index 478f926..40da0a8 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -48,6 +48,8 @@ BuildRequires: desktop-file-utils BuildRequires: make BuildRequires: chrpath +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 @@ -66,13 +68,16 @@ generic image datasets, from 1d scalar signals to 3d+t sequences of multi-spectral volumetric images. %package devel -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Summary: Development files for G'MIC %package gimp Requires: %{name}%{?_isa} = %{version}-%{release} Summary: G'MIC plugin for GIMP +%package libs +Summary: G'MIC shared libraries + %description devel G'MIC is an open and full-featured framework for image processing, providing several different user interfaces to convert/manipulate/filter/visualize @@ -89,6 +94,14 @@ multi-spectral volumetric images. Provides a plugin for using G'MIC from GIMP +%description libs +G'MIC is an open and full-featured framework for image processing, providing +several different user interfaces to convert/manipulate/filter/visualize +generic image datasets, from 1d scalar signals to 3d+t sequences of +multi-spectral volumetric images. + +Provides G'MIC shared libraries + %prep %setup -q -a 1 -a 2 -a 3 @@ -162,7 +175,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gmic chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.310 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.310 -%ldconfig_scriptlets +%ldconfig_scriptlets libs %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -183,8 +196,6 @@ fi %{_bindir}/gmic_qt %{_bindir}/zart %{_sysconfdir}/bash_completion.d/gmic -%{_libdir}/libgmic.so.* -%{_libdir}/libcgmic.so.* %{_mandir}/man1/%{name}.1.gz %{_mandir}/fr/man1/%{name}.1.gz %{_datadir}/applications/gmic_qt.desktop @@ -205,7 +216,15 @@ fi %{gimpplugindir}/gmic_cluts.gmz %{gimpplugindir}/gmic_denoise_cnn.gmz +%files libs +%license COPYING COPYING-libcgmic +%{_libdir}/libgmic.so.3* +%{_libdir}/libcgmic.so.3* + %changelog +* 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 From 6ce25e1c2c584e669b385840d22a9e3c6ce5e730 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 9 Oct 2022 14:36:38 +0200 Subject: [PATCH 072/136] Drop an old, no longer needed hack Drop manual symlink creation as the build system does it just fine these days. --- gmic.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gmic.spec b/gmic.spec index 40da0a8..6db3ae9 100644 --- a/gmic.spec +++ b/gmic.spec @@ -154,12 +154,6 @@ iconv -f iso8859-1 -t utf-8 COPYING-libcgmic > COPYING-libcgmic.conv && mv -f CO cd src make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install -# Makefile creates too many intermediate symlinks for the library -rm -f $RPM_BUILD_ROOT/%{_libdir}/libgmic.so.2 -rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgmic.so.2 -ln -s libgmic.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libgmic.so.2 -ln -s libcgmic.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libcgmic.so.2 - desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop From deaa41f72c10aa3cc3f1221eace1d43ca964b6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 8 Nov 2022 12:57:40 +0000 Subject: [PATCH 073/136] Update to 3.1.6 --- gmic-prefix-fixes.patch | 150 ++++++++++------------------------------ gmic.spec | 34 +++++---- new-snapshot.sh | 5 +- sources | 7 +- 4 files changed, 63 insertions(+), 133 deletions(-) diff --git a/gmic-prefix-fixes.patch b/gmic-prefix-fixes.patch index 50aba70..761a889 100644 --- a/gmic-prefix-fixes.patch +++ b/gmic-prefix-fixes.patch @@ -1,28 +1,26 @@ -From 27655a3200c07546c74e3c56a315188678b13d26 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 3 Sep 2022 20:18:14 +0200 -Subject: [PATCH 1/3] Makefile: Rename USR variable to PREFIX - -Call it prefix as this is what almost all other build systems use for -choosing the install location. ---- - src/Makefile | 126 +++++++++++++++++++++++++-------------------------- - 1 file changed, 63 insertions(+), 63 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 2b09aef5..ff98dfbe 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -80,7 +80,7 @@ +--- ./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 -+PREFIX = /usr - LIB = lib - BIN = bin - INCLUDE = include -@@ -120,12 +120,12 @@ endif +-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 @@ -37,7 +35,7 @@ index 2b09aef5..ff98dfbe 100644 endif ifeq ($(OS),NetBSD) -@@ -134,15 +134,15 @@ endif +@@ -134,15 +135,15 @@ endif ifneq (,$(findstring MINGW,$(OS))) OS = Windows @@ -56,8 +54,8 @@ index 2b09aef5..ff98dfbe 100644 endif WGET = curl -k -L --silent -o endif -@@ -181,13 +181,13 @@ PRERELEASE = $(shell date +%y%m%d) - PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\"" +@@ -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) @@ -72,7 +70,7 @@ index 2b09aef5..ff98dfbe 100644 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 +264,7 @@ endif +@@ -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) @@ -81,7 +79,7 @@ index 2b09aef5..ff98dfbe 100644 # Enable image display, using GDI32 (Windows). GDI32_CFLAGS = -Dcimg_display=2 -@@ -317,12 +317,12 @@ OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_hi +@@ -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++/) @@ -96,7 +94,7 @@ index 2b09aef5..ff98dfbe 100644 OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) # Enable Fast Fourier Transforms, using the FFTW3 library. -@@ -439,7 +439,7 @@ cli_shared: +@@ -439,7 +440,7 @@ cli_shared: # CLI (static). #-------------- @@ -105,7 +103,7 @@ index 2b09aef5..ff98dfbe 100644 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) \ -@@ -810,35 +810,35 @@ man: +@@ -818,84 +819,78 @@ man: # Install / uninstall / clean. #----------------------------- install: @@ -160,9 +158,16 @@ index 2b09aef5..ff98dfbe 100644 + 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 \ -@@ -851,43 +851,43 @@ install: - fi; \ +- 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; \ @@ -236,86 +241,3 @@ index 2b09aef5..ff98dfbe 100644 distclean: clean --- -2.37.2 - - -From 6a5f47813e4a8d789b5eadd8969c1b1d1ffe902f Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 3 Sep 2022 20:20:30 +0200 -Subject: [PATCH 2/3] Makefile: Make a few variables configurable - -This makes it easier for downstreams to choose where they want to put -the files, such as libs going into /usr/lib64 in Fedora, or use the /app -prefix for flatpaks. ---- - src/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index ff98dfbe..62aea93b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -80,10 +80,10 @@ - - # Try to auto-detect target OS. - OS = $(shell uname) --PREFIX = /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 --- -2.37.2 - - -From 5dd4ccf624552ef582f46af159f5c13d0cf43be5 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 3 Sep 2022 20:36:28 +0200 -Subject: [PATCH 3/3] Makefile: Avoid hardcoding bash-completion paths - -Instead, use pkg-config to query the bash-completion path, which -both makes the makefile simpler and also helps get the path right in -more cases. ---- - src/Makefile | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 62aea93b..32da0424 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -88,6 +88,7 @@ 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) -@@ -841,14 +842,8 @@ install: - 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)$(PREFIX)/share/applications; \ --- -2.37.2 - diff --git a/gmic.spec b/gmic.spec index 6db3ae9..b6376e1 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,19 +3,19 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20220429gitac29dcb -%global gmic_qt_version 20220429git6d69f1c -%global gmic_community_version 20220429git7b85db6 +%global zart_version 20220629git34ebf6c +%global gmic_qt_version 20221107git52691b4 +%global gmic_community_version 20221107gitdbf451b Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.1.0 -Release: 5%{?dist} +Version: 3.1.6 +Release: 1%{?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 or CeCILL-C) and GPLv3+ @@ -46,6 +46,7 @@ BuildRequires: libcurl-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: make +#BuildRequires: cmake BuildRequires: chrpath Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -54,8 +55,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 -Patch0: gmic-openexr3.patch -Patch2: Makefile_arch.patch +#Patch0: gmic-openexr3.patch +#Patch2: Makefile_arch.patch # Backported from upstream # https://github.com/GreycLab/gmic/pull/412 Patch3: gmic-prefix-fixes.patch @@ -103,7 +104,7 @@ multi-spectral volumetric images. Provides G'MIC shared libraries %prep -%setup -q -a 1 -a 2 -a 3 +%setup -q -a 1 -a 3 #%if 0%{?fedora} > 34 #%patch0 -p1 @@ -119,7 +120,8 @@ Provides G'MIC shared libraries rm -f zart/.qmake.stash %build -export CCACHE_DISABLE=1 +# ccache can be used only in local builds, koji and copr don't use it +#export CCACHE_DISABLE=1 cd src ln -fs ../gmic-community/libcgmic/gmic_libc.cpp . @@ -139,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} @@ -166,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.310 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.310 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.316 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.316 %ldconfig_scriptlets libs @@ -216,6 +223,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 diff --git a/new-snapshot.sh b/new-snapshot.sh index 712bcf7..cf0afd7 100755 --- a/new-snapshot.sh +++ b/new-snapshot.sh @@ -16,9 +16,8 @@ function archive_it() { git clone $uri fi - DATE=`date +"%Y%m%d"` - cd $name + DATE=$(git log -1 --format=%cd --date=short | tr -d \-) HASH=`git rev-parse --short HEAD` FILE=${name}-${DATE}git${HASH}.tar.gz @@ -33,7 +32,7 @@ function print_hash() { cd $name HASH=`git rev-parse --short HEAD` - today=`date +"%Y%m%d"` + today=$(git log -1 --format=%cd --date=short | tr -d \-) macro=`echo $name | sed -e 's/-/_/g'` echo "%global ${macro}_version ${today}git${HASH}" diff --git a/sources b/sources index 2a477e0..c485a6e 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (gmic-community-20220429git7b85db6.tar.gz) = fcacfe8d0f5b8550aee58e88145e11f800c2e920919b1f61a60ff8ead8ce0f59386d40f7885e362de312a6c8d6c6588777a0a8cdecb49dc77f52325989ef2c3a -SHA512 (gmic-qt-20220429git6d69f1c.tar.gz) = 1a4f2685dd22f14e59f4b1b953f2107ce004eb8448e6162de19b33c2b70724bc27fdc364cd65502b59f3eebf280c7eb6bbf63b5529b30dab9460be49def7aadf -SHA512 (zart-20220429gitac29dcb.tar.gz) = c39851839ca48bc6f988a2b11579afb1e5ce13f6b3e52547148bcc18344795af77fef2b5a83ab7ee29632746e195f98fdfbd816bb5ff4bc4a66a66ed579a2ae5 -SHA512 (gmic_3.1.0.tar.gz) = 0dd1a524901f044cf4c964b62d110168a396f68af8aed367f341a72fd06e60a9f02ab80f3e294bf6ae4243ba0acc0897d6f97f100beb890dab3ba385bf0b9976 +SHA512 (gmic-community-20221107gitdbf451b.tar.gz) = 3647f5186104a8c60df690939292da8a60684ea84c2ff5e97781257ff19c3d317b3d8248d4ee48aabab36d2fa6e984835e28d41d8ba24786039d60ebdce9add0 +SHA512 (zart-20220629git34ebf6c.tar.gz) = e5b4b5df77191aa3462a4e3dec93426b71b24af5e5393a793de5ef56d68f9950521e802ca4a924cf7f0aa0acd7634c5cc3b0b9c14ae146257562c415583fc9f0 +SHA512 (gmic-3.1.6-1.fc38.src.rpm) = 27781a9cd2dc5ffd2d0eb6c8cd468e5a1f011e8d1cf27e185293375a096485e2fc8d4546621ba0f7f42c40b3a3cd60b5852428aec4dda620ea9f2c756cc811ee From b92153fd5c8f20940514b7ac7480b9b5370c484c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 13 Nov 2022 13:30:45 +0000 Subject: [PATCH 074/136] fix sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c485a6e..2cb5dcf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmic-community-20221107gitdbf451b.tar.gz) = 3647f5186104a8c60df690939292da8a60684ea84c2ff5e97781257ff19c3d317b3d8248d4ee48aabab36d2fa6e984835e28d41d8ba24786039d60ebdce9add0 SHA512 (zart-20220629git34ebf6c.tar.gz) = e5b4b5df77191aa3462a4e3dec93426b71b24af5e5393a793de5ef56d68f9950521e802ca4a924cf7f0aa0acd7634c5cc3b0b9c14ae146257562c415583fc9f0 -SHA512 (gmic-3.1.6-1.fc38.src.rpm) = 27781a9cd2dc5ffd2d0eb6c8cd468e5a1f011e8d1cf27e185293375a096485e2fc8d4546621ba0f7f42c40b3a3cd60b5852428aec4dda620ea9f2c756cc811ee +SHA512 (gmic_3.1.6.tar.gz) = 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 From 065026bacd435fd684507bf77299789b2e6e7aa9 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 13 Nov 2022 21:32:28 +0100 Subject: [PATCH 075/136] 3.1.6 --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2cb5dcf..48c7647 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (gmic-community-20221107gitdbf451b.tar.gz) = 3647f5186104a8c60df690939292da8a60684ea84c2ff5e97781257ff19c3d317b3d8248d4ee48aabab36d2fa6e984835e28d41d8ba24786039d60ebdce9add0 -SHA512 (zart-20220629git34ebf6c.tar.gz) = e5b4b5df77191aa3462a4e3dec93426b71b24af5e5393a793de5ef56d68f9950521e802ca4a924cf7f0aa0acd7634c5cc3b0b9c14ae146257562c415583fc9f0 SHA512 (gmic_3.1.6.tar.gz) = 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 +SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 +SHA512 (gmic-community-20221112git98b7617.tar.gz) = bbf6a7e02d18aece04cefafd41c337b211c1441d5655f821463d928ad18cfaa5533d880d836d4c53630732e6181de986b8087bbfc34c422d82fcf95837abb83d From d578427735523282baf7abb70d9729aa6063d62b Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 13 Nov 2022 21:34:46 +0100 Subject: [PATCH 076/136] 3.1.6 --- gmic.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gmic.spec b/gmic.spec index b6376e1..ffe1f3b 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,13 +4,13 @@ # As generated by new-snapshot.sh script %global zart_version 20220629git34ebf6c -%global gmic_qt_version 20221107git52691b4 -%global gmic_community_version 20221107gitdbf451b +%global gmic_qt_version 20221109git44b0ed3 +%global gmic_community_version 20221112git98b7617 Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.6 -Release: 1%{?dist} +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 @@ -223,6 +223,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From 8d0001f753fe72e0b79b5756b9bb9315585e52d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 16 Jan 2023 01:43:21 +0000 Subject: [PATCH 077/136] Rebuild for opencv 4.7.0 --- gmic-prefix-fixes.patch | 141 ++++++++++++++++++++++++++++++---------- gmic.spec | 5 +- 2 files changed, 109 insertions(+), 37 deletions(-) diff --git a/gmic-prefix-fixes.patch b/gmic-prefix-fixes.patch index 761a889..2eedc7b 100644 --- a/gmic-prefix-fixes.patch +++ b/gmic-prefix-fixes.patch @@ -1,26 +1,28 @@ ---- ./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 @@ +From 7ad9c03f1a6933ad0125105f62ffbe2e5d4ca584 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 3 Sep 2022 20:18:14 +0200 +Subject: [PATCH 1/3] Makefile: Rename USR variable to PREFIX + +Call it prefix as this is what almost all other build systems use for +choosing the install location. +--- + src/Makefile | 126 +++++++++++++++++++++++++-------------------------- + 1 file changed, 63 insertions(+), 63 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 69f0ebb61..f62ce47aa 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -80,7 +80,7 @@ # 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 ++PREFIX = /usr + LIB = lib + BIN = bin + INCLUDE = include +@@ -120,12 +120,12 @@ endif ifeq ($(OS),FreeBSD) OS = Unix @@ -35,7 +37,7 @@ endif ifeq ($(OS),NetBSD) -@@ -134,15 +135,15 @@ endif +@@ -134,15 +134,15 @@ endif ifneq (,$(findstring MINGW,$(OS))) OS = Windows @@ -54,8 +56,8 @@ 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)\\\"" +@@ -181,13 +181,13 @@ PRERELEASE = $(shell date +%y%m%d) + 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) @@ -70,7 +72,7 @@ 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 +@@ -264,7 +264,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) @@ -79,7 +81,7 @@ # Enable image display, using GDI32 (Windows). GDI32_CFLAGS = -Dcimg_display=2 -@@ -317,12 +318,12 @@ OPENCV_LIBS = $(shell pkg-config opencv +@@ -317,12 +317,12 @@ OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_hi # Enable support of most classical image file formats, using the GraphicsMagick++ library. # (http://www.graphicsmagick.org/Magick++/) @@ -94,7 +96,7 @@ OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) # Enable Fast Fourier Transforms, using the FFTW3 library. -@@ -439,7 +440,7 @@ cli_shared: +@@ -439,7 +439,7 @@ cli_shared: # CLI (static). #-------------- @@ -103,7 +105,7 @@ 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: +@@ -818,35 +818,35 @@ man: # Install / uninstall / clean. #----------------------------- install: @@ -158,16 +160,9 @@ + 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; \ + if [ -d /usr/share/bash-completion/completions ]; then \ +@@ -859,43 +859,43 @@ install: + fi; \ fi @if [ -f ../zart/zart ]; then \ - mkdir -p $(DESTDIR)$(USR)/share/applications; \ @@ -241,3 +236,77 @@ distclean: clean + +From b859429e113c97dccc79f0102e2d7d37715da747 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 3 Sep 2022 20:20:30 +0200 +Subject: [PATCH 2/3] Makefile: Make a few variables configurable + +This makes it easier for downstreams to choose where they want to put +the files, such as libs going into /usr/lib64 in Fedora, or use the /app +prefix for flatpaks. +--- + src/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index f62ce47aa..7d8b1d395 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -80,10 +80,10 @@ + + # Try to auto-detect target OS. + OS = $(shell uname) +-PREFIX = /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 + +From 0cd05ab2379c3cefcffc4f94f85cabf122da1be4 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 3 Sep 2022 20:36:28 +0200 +Subject: [PATCH 3/3] Makefile: Avoid hardcoding bash-completion paths + +Instead, use pkg-config to query the bash-completion path, which +both makes the makefile simpler and also helps get the path right in +more cases. +--- + src/Makefile | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 7d8b1d395..126d1e143 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -88,6 +88,7 @@ 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) +@@ -849,14 +850,8 @@ install: + 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)$(PREFIX)/share/applications; \ diff --git a/gmic.spec b/gmic.spec index ffe1f3b..f701458 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.6 -Release: 2%{?dist} +Release: 3%{?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 @@ -223,6 +223,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From e18a0d20af738fc745b850f913018b12f0ddf65f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:18:52 +0000 Subject: [PATCH 078/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index f701458..c16be57 100644 --- a/gmic.spec +++ b/gmic.spec @@ -10,7 +10,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.1.6 -Release: 3%{?dist} +Release: 4%{?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 @@ -223,6 +223,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From b3c2e4a4a3f2c823e9c65b1ac402dee136031d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 26 Apr 2023 14:20:15 +0100 Subject: [PATCH 079/136] Convert license to SPDX format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index c16be57..d508ebd 100644 --- a/gmic.spec +++ b/gmic.spec @@ -18,7 +18,7 @@ Source1: zart-%{zart_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 or CeCILL-C) and GPLv3+ +License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ %if %{use_system_cimg} BuildRequires: CImg-devel == 1:%{version} From 9a009391ab0a58fff03e5f22f46f4ce448f1ad94 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 22 May 2023 19:26:36 +0200 Subject: [PATCH 080/136] bump version --- gmic.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index ffe1f3b..b4b8a23 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,13 +4,13 @@ # As generated by new-snapshot.sh script %global zart_version 20220629git34ebf6c -%global gmic_qt_version 20221109git44b0ed3 -%global gmic_community_version 20221112git98b7617 +%global gmic_qt_version 20230503git111f461 +%global gmic_community_version 20230521git76db69d3 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.1.6 -Release: 2%{?dist} +Version: 3.2.4 +Release: 1%{?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 @@ -223,6 +223,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Mon May 22 2023 josef radinger - 3.2.4-1 +- bump version + * Sun Nov 13 2022 josef radinger - 3.1.6-2 - build From b24019b878ecd8f57cc63872ffba421d5f2c932f Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 22 May 2023 19:38:38 +0200 Subject: [PATCH 081/136] bump version --- sources | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 48c7647..8348c5f 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -SHA512 (gmic_3.1.6.tar.gz) = 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 -SHA512 (gmic-community-20221112git98b7617.tar.gz) = bbf6a7e02d18aece04cefafd41c337b211c1441d5655f821463d928ad18cfaa5533d880d836d4c53630732e6181de986b8087bbfc34c422d82fcf95837abb83d +SHA512 (gmic-qt-20230503git111f461.tar.gz) = 474767345b631b6fdf63d18f6a62eb75e23ad3ba4b364b8d95d2666e862c61e6117d090ce111a22fe54b4be58526f3378ac8467485415e4b3c139b6366e7292b +SHA512 (gmic-community-20230522gitd6b730f1.tar.gz) = a02df6ded872fa183fc49ce879d7c2ec9b3cad9d9462ddb7ce84c20fe5a50d246dc682b06703115d0d26051f526295ab988c33b433876841445a0057c1f3be47 +SHA512 (gmic_3.2.4.tar.gz) = 0a261d6242b485d7661919c14680f25d7b15d175619d8115077808c5502edb4ed313f37b3b6c6981709751d49bc7df40332aaefc03e626303135a827a5d41daf From 5de9e6a53e9b290e08043d70a2e99e852f375905 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 22 May 2023 20:00:39 +0200 Subject: [PATCH 082/136] bump version --- gmic.spec | 2 +- sources | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gmic.spec b/gmic.spec index deeafd5..5ba51fb 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,7 +5,7 @@ # As generated by new-snapshot.sh script %global zart_version 20220629git34ebf6c %global gmic_qt_version 20230503git111f461 -%global gmic_community_version 20230521git76db69d3 +%global gmic_community_version 20230522gitd6b730f1 Summary: GREYC's Magic for Image Computing Name: gmic diff --git a/sources b/sources index 8348c5f..d87511a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 -SHA512 (gmic-qt-20230503git111f461.tar.gz) = 474767345b631b6fdf63d18f6a62eb75e23ad3ba4b364b8d95d2666e862c61e6117d090ce111a22fe54b4be58526f3378ac8467485415e4b3c139b6366e7292b SHA512 (gmic-community-20230522gitd6b730f1.tar.gz) = a02df6ded872fa183fc49ce879d7c2ec9b3cad9d9462ddb7ce84c20fe5a50d246dc682b06703115d0d26051f526295ab988c33b433876841445a0057c1f3be47 +SHA512 (gmic-qt-20230503git111f461.tar.gz) = 474767345b631b6fdf63d18f6a62eb75e23ad3ba4b364b8d95d2666e862c61e6117d090ce111a22fe54b4be58526f3378ac8467485415e4b3c139b6366e7292b +SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 SHA512 (gmic_3.2.4.tar.gz) = 0a261d6242b485d7661919c14680f25d7b15d175619d8115077808c5502edb4ed313f37b3b6c6981709751d49bc7df40332aaefc03e626303135a827a5d41daf From 0b24defdb372b214778650db1eaa9fb70dafe7d3 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 22 May 2023 20:30:46 +0200 Subject: [PATCH 083/136] bump version --- gmic.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index 5ba51fb..d27bbd8 100644 --- a/gmic.spec +++ b/gmic.spec @@ -59,7 +59,7 @@ Obsoletes: gmic-static <= 2.1.8 #Patch2: Makefile_arch.patch # Backported from upstream # https://github.com/GreycLab/gmic/pull/412 -Patch3: gmic-prefix-fixes.patch +#Patch3: gmic-prefix-fixes.patch %description @@ -114,7 +114,7 @@ Provides G'MIC shared libraries #%patch2 -p1 -b.arch #%endif -%patch3 -p1 -F1 -b.prefix-fixes +#%patch3 -p1 -F1 -b.prefix-fixes # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -225,6 +225,7 @@ fi %changelog * Mon May 22 2023 josef radinger - 3.2.4-1 - bump version +- remove Patch3 * Thu Jan 19 2023 Fedora Release Engineering - 3.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 00a9bc792f95f8cdca6aab62d43c8b7fdf66cef7 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 24 May 2023 21:59:46 +0200 Subject: [PATCH 084/136] bump version --- gmic.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index d27bbd8..7be8b9a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -173,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.316 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.316 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.324 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.324 %ldconfig_scriptlets libs @@ -226,6 +226,7 @@ fi * 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 From d3434966675499ba8ff89b40172d4c24e656f4ff Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 30 May 2023 13:36:07 +0200 Subject: [PATCH 085/136] bump version --- gmic.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index 7be8b9a..a8a7658 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,11 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20220629git34ebf6c %global gmic_qt_version 20230503git111f461 -%global gmic_community_version 20230522gitd6b730f1 +%global gmic_community_version 20230530gitf90cf6ae Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.2.4 +Version: 3.2.5 Release: 1%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart @@ -223,6 +223,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 diff --git a/sources b/sources index d87511a..30e6754 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20230522gitd6b730f1.tar.gz) = a02df6ded872fa183fc49ce879d7c2ec9b3cad9d9462ddb7ce84c20fe5a50d246dc682b06703115d0d26051f526295ab988c33b433876841445a0057c1f3be47 -SHA512 (gmic-qt-20230503git111f461.tar.gz) = 474767345b631b6fdf63d18f6a62eb75e23ad3ba4b364b8d95d2666e862c61e6117d090ce111a22fe54b4be58526f3378ac8467485415e4b3c139b6366e7292b +SHA512 (gmic_3.2.5.tar.gz) = e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27 SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 -SHA512 (gmic_3.2.4.tar.gz) = 0a261d6242b485d7661919c14680f25d7b15d175619d8115077808c5502edb4ed313f37b3b6c6981709751d49bc7df40332aaefc03e626303135a827a5d41daf +SHA512 (gmic-community-20230530gitf90cf6ae.tar.gz) = 0784a1684d9b87a2930ea25ffa7155862ba83534a8c0e0c975f5ddfe9da2298c43a25d62c504afcf73f4670a3504fe7cd6bb86390c85c9c9eb044eb34feb56a3 +SHA512 (gmic-qt-20230503git111f461.tar.gz) = 474767345b631b6fdf63d18f6a62eb75e23ad3ba4b364b8d95d2666e862c61e6117d090ce111a22fe54b4be58526f3378ac8467485415e4b3c139b6366e7292b From d885b2773853b19087f8704ce43b4a0b973fe9ce Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 30 May 2023 13:40:10 +0200 Subject: [PATCH 086/136] bump version --- gmic.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index a8a7658..9b10108 100644 --- a/gmic.spec +++ b/gmic.spec @@ -173,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.324 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.324 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.325 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.325 %ldconfig_scriptlets libs From 7117d2e1ae05429a4ca2b83d5e395d73bb1cf0d9 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 26 Jun 2023 20:34:42 +0200 Subject: [PATCH 087/136] bump version --- gmic.spec | 17 +++++++++++------ sources | 6 +++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gmic.spec b/gmic.spec index 9b10108..569e5c3 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,18 +4,20 @@ # As generated by new-snapshot.sh script %global zart_version 20220629git34ebf6c -%global gmic_qt_version 20230503git111f461 -%global gmic_community_version 20230530gitf90cf6ae +%global gmic_qt_version 20230622git5a9e8ad +%global gmic_community_version 20230626git33f15570 + +%global shortver 326 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.2.5 +Version: 3.2.6 Release: 1%{?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 @@ -173,8 +175,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.325 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.325 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.%{shortver} +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.%{shortver} %ldconfig_scriptlets libs @@ -223,6 +225,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Mon Jun 26 2023 josef radinger - 3.2.6-1 +- bump version + * Tue May 30 2023 josef radinger - 3.2.5-1 - bump version diff --git a/sources b/sources index 30e6754..1dae09a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.2.5.tar.gz) = e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27 +SHA512 (gmic_3.2.6.tar.gz) = 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395 SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 -SHA512 (gmic-community-20230530gitf90cf6ae.tar.gz) = 0784a1684d9b87a2930ea25ffa7155862ba83534a8c0e0c975f5ddfe9da2298c43a25d62c504afcf73f4670a3504fe7cd6bb86390c85c9c9eb044eb34feb56a3 -SHA512 (gmic-qt-20230503git111f461.tar.gz) = 474767345b631b6fdf63d18f6a62eb75e23ad3ba4b364b8d95d2666e862c61e6117d090ce111a22fe54b4be58526f3378ac8467485415e4b3c139b6366e7292b +SHA512 (gmic-community-20230626git33f15570.tar.gz) = d2c14ed41aaf6f431d714759b6188bd4bdf3a73fac633ff739aa1aae9cacb36d716bde49b34bd26bfd32bc0222a7b731ccfcc5bb464001347dfd6d936b14505e +SHA512 (gmic-qt-20230622git5a9e8ad.tar.gz) = 34f2b1842758b8dec3ee7118d1dd364e03908fee7e4b88382ffdaa6420986628803251de121dd76a228989cdfeb2411aae07a6f57d14540fef16648e092a7b99 From 323914dd976a2c7205a063d2e4b7ea6f9f0b3cb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:26:35 +0000 Subject: [PATCH 088/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 569e5c3..9dcf122 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.2.6 -Release: 1%{?dist} +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 @@ -225,6 +225,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From a7e77a6bd10546f8e2d530c3d517bd786d1703d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 7 Aug 2023 03:57:31 +0100 Subject: [PATCH 089/136] Rebuild for opencv 4.8.0 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 9dcf122..d1b2962 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.2.6 -Release: 2%{?dist} +Release: 3%{?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 @@ -225,6 +225,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From fbcecc346f59dca2364678af0ab443434fa2e67a Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 9 Oct 2023 10:07:44 +0200 Subject: [PATCH 090/136] bump version --- gmic.spec | 13 ++++++++----- sources | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index d1b2962..acdf1ae 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,15 +4,15 @@ # As generated by new-snapshot.sh script %global zart_version 20220629git34ebf6c -%global gmic_qt_version 20230622git5a9e8ad -%global gmic_community_version 20230626git33f15570 +%global gmic_qt_version 20230911git7022c70 +%global gmic_community_version 20231002git3c822eac -%global shortver 326 +%global shortver 331 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.2.6 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?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 @@ -225,6 +225,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 diff --git a/sources b/sources index 1dae09a..8c978fd 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.2.6.tar.gz) = 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395 +SHA512 (gmic_3.3.1.tar.gz) = b31c3eac083e280203eb4651a22ed4d49d1b46e8a5a81400bb8cbb9bdd87cb1226f9017b7a1e52d493fbed38a580238c6242b033162213c32316d852ad0f90c5 +SHA512 (gmic-community-20231002git3c822eac.tar.gz) = 0572a72b40466ed3a4c92a147cc2cb659996afdfb645895bd8496727e7f27b1ff49bf3e45ae1aff23c6acc0bd11f5cc4d9e4d96b7714e97b2bacbcb7c9313e5c +SHA512 (gmic-qt-20230911git7022c70.tar.gz) = 97804c29caea9e3ed1e15520aae0f4c212a24a0d9366e0bb933905ddbb339a826f210c36da34958cd3f461a0ee7929776d3ebdada73ea484de206cf96863ad22 SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 -SHA512 (gmic-community-20230626git33f15570.tar.gz) = d2c14ed41aaf6f431d714759b6188bd4bdf3a73fac633ff739aa1aae9cacb36d716bde49b34bd26bfd32bc0222a7b731ccfcc5bb464001347dfd6d936b14505e -SHA512 (gmic-qt-20230622git5a9e8ad.tar.gz) = 34f2b1842758b8dec3ee7118d1dd364e03908fee7e4b88382ffdaa6420986628803251de121dd76a228989cdfeb2411aae07a6f57d14540fef16648e092a7b99 From ce4a85c7260d0a45808624f7ee3d92006f3117b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:46:13 +0000 Subject: [PATCH 091/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index acdf1ae..5d00dca 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.3.1 -Release: 1%{?dist} +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 @@ -225,6 +225,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From 8c477a8cd737422afca3ecbe468601cbe8802b94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 15:20:18 +0000 Subject: [PATCH 092/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 5d00dca..898c3e7 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -225,6 +225,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From 1640bec8f098077da231eee11f314e7c3b807a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 30 Jan 2024 10:38:08 +0000 Subject: [PATCH 093/136] Add missing entry in file list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- gmic.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gmic.spec b/gmic.spec index 898c3e7..4b376b5 100644 --- a/gmic.spec +++ b/gmic.spec @@ -217,6 +217,7 @@ fi %files gimp %{gimpplugindir}/gmic_gimp_qt %{gimpplugindir}/gmic_cluts.gmz +%{gimpplugindir}/gmic_fonts.gmz %{gimpplugindir}/gmic_denoise_cnn.gmz %files libs From 652d6084c6a733f67849cfecdf5bdcfb3be9bc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 5 Feb 2024 22:39:54 +0000 Subject: [PATCH 094/136] Rebuild for opencv 4.9.0 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 4b376b5..3afb0e3 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -226,6 +226,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From 58f3edeee20332dd59e8654367bd7d3889c3d5ca Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 24 Apr 2024 08:31:12 -0400 Subject: [PATCH 095/136] Rebuilt for openexr 3.2.4 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 3afb0e3..39fa292 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?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 @@ -226,6 +226,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From 672ffc23069b835aa1c44ae81a5d8725797e0107 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 6 May 2024 19:21:00 -0400 Subject: [PATCH 096/136] Fix flatpak build PKG_CONFIG_PATH needs to be set before gimptool can find the gimp-2.0 pkg-config data. --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 39fa292..693ec8d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,4 +1,4 @@ -%global gimpplugindir %(gimptool --gimpplugindir)/plug-ins +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins %global use_system_cimg 1 From 32094af6084fcaea52645e2040465c79e90c7332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 31 May 2024 16:36:56 +0100 Subject: [PATCH 097/136] Update gmic to 3.3.6 (#2083488) --- gmic.spec | 26 ++++++++++++++++---------- sources | 8 ++++---- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/gmic.spec b/gmic.spec index 693ec8d..11f42f5 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,16 +3,15 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20220629git34ebf6c -%global gmic_qt_version 20230911git7022c70 -%global gmic_community_version 20231002git3c822eac - -%global shortver 331 +%global zart_version 20231127gitd014169 +%global gmic_qt_version 20240430gita5a635f +%global gmic_community_version 20240526git476e05d3 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.3.1 -Release: 5%{?dist} +Version: 3.3.6 +%global shortver %(foo=%{version}; echo ${foo//./}) +Release: 1%{?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 @@ -216,9 +215,10 @@ fi %files gimp %{gimpplugindir}/gmic_gimp_qt -%{gimpplugindir}/gmic_cluts.gmz -%{gimpplugindir}/gmic_fonts.gmz -%{gimpplugindir}/gmic_denoise_cnn.gmz +%{_datadir}/gmic/gmic_cluts.gmz +%{_datadir}/gmic/gmic_denoise_cnn.gmz +%{_datadir}/gmic/gmic_fonts.gmz +%{_datadir}/gmic/gmic_lightleaks.gmz %files libs %license COPYING COPYING-libcgmic @@ -226,6 +226,12 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 diff --git a/sources b/sources index 8c978fd..5243c0a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.3.1.tar.gz) = b31c3eac083e280203eb4651a22ed4d49d1b46e8a5a81400bb8cbb9bdd87cb1226f9017b7a1e52d493fbed38a580238c6242b033162213c32316d852ad0f90c5 -SHA512 (gmic-community-20231002git3c822eac.tar.gz) = 0572a72b40466ed3a4c92a147cc2cb659996afdfb645895bd8496727e7f27b1ff49bf3e45ae1aff23c6acc0bd11f5cc4d9e4d96b7714e97b2bacbcb7c9313e5c -SHA512 (gmic-qt-20230911git7022c70.tar.gz) = 97804c29caea9e3ed1e15520aae0f4c212a24a0d9366e0bb933905ddbb339a826f210c36da34958cd3f461a0ee7929776d3ebdada73ea484de206cf96863ad22 -SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 +SHA512 (gmic_3.3.6.tar.gz) = 6a079adf1a91c87852d9c6a204f29cd7580bc3b03d2fd46cfd41fc075fb27481990571818ae64774d5b4f738ef0b37e2734319b4a34543f4da7f21e85324115f +SHA512 (zart-20231127gitd014169.tar.gz) = f4d06a0abae33921544e0dc5308f25504cb2612fb794c83d287aa0cd547db64903445b693545b96e7ef876b36b4f96104e08095a8eaaf766980810b1c5b68e8c +SHA512 (gmic-qt-20240430gita5a635f.tar.gz) = 0d834afd620f00f2453ffff326000169de4b9d7295bad03c633baedaab3a57e742e69ba311fe58760dcc89d002b2f2e201e585df61f561f69fa551af69101a78 +SHA512 (gmic-community-20240526git476e05d3.tar.gz) = 0f6652c4c146ce1c9377684a311eb52178091bf86a37b2f336ef5dc19fea91a0220fae6958e24cfaeb7d84fa6a577e7518c3a7737e69076e03ff35d392244bc7 From 89d01d7001fd71430ab77c3f49602da436d56041 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 26 Jun 2024 08:43:12 +0200 Subject: [PATCH 098/136] bump version --- gmic.spec | 18 ++++++++++++------ sources | 8 ++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gmic.spec b/gmic.spec index 693ec8d..af6ca1c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -3,16 +3,16 @@ %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20220629git34ebf6c -%global gmic_qt_version 20230911git7022c70 -%global gmic_community_version 20231002git3c822eac +%global zart_version 20231127gitd014169 +%global gmic_qt_version 20240603gitfd72746 +%global gmic_community_version 20240623git5f99800b -%global shortver 331 +%global shortver 340 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.3.1 -Release: 5%{?dist} +Version: 3.4.0 +Release: 1%{?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 @@ -226,6 +226,12 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Mon Jun 24 2024 josef radinger - 3.4.0-1 +- bump version + +* Fri May 24 2024 josef radinger - 3.3.6-1 +- bump version + * Wed Apr 24 2024 Benjamin A. Beasley - 3.3.1-5 - Rebuilt for openexr 3.2.4 diff --git a/sources b/sources index 8c978fd..180c6b9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.3.1.tar.gz) = b31c3eac083e280203eb4651a22ed4d49d1b46e8a5a81400bb8cbb9bdd87cb1226f9017b7a1e52d493fbed38a580238c6242b033162213c32316d852ad0f90c5 -SHA512 (gmic-community-20231002git3c822eac.tar.gz) = 0572a72b40466ed3a4c92a147cc2cb659996afdfb645895bd8496727e7f27b1ff49bf3e45ae1aff23c6acc0bd11f5cc4d9e4d96b7714e97b2bacbcb7c9313e5c -SHA512 (gmic-qt-20230911git7022c70.tar.gz) = 97804c29caea9e3ed1e15520aae0f4c212a24a0d9366e0bb933905ddbb339a826f210c36da34958cd3f461a0ee7929776d3ebdada73ea484de206cf96863ad22 -SHA512 (zart-20220629git34ebf6c.tar.gz) = bcfd6419baaf901f4fd7617155f9f6962d835952fcdcef9eabcaf79b4111866faaf028c1ca071d19ceb20d57d35915af7d218804d5983f9882a253fa75ce90d6 +SHA512 (gmic_3.4.0.tar.gz) = bcff0e09850bd41e2696d4e411a9b637ef734b29bf311f8b1cf6153fd30fa39d007c3dd56f8ae44deba57326dc788dae9aaf24b0a826fddd1436fd4c13dec3a5 +SHA512 (gmic-community-20240623git5f99800b.tar.gz) = 9ecbdecc3ce9de27f3f791cc9567b9c1751d625bb3aedae42a771e6eba3602ac4e2256f6d3438d334130b622b47a6d4fa41b690259d18b53e622763aef7c8bea +SHA512 (gmic-qt-20240603gitfd72746.tar.gz) = 252abc8d3c35f087e95d9610dfed0b99a02a69ab44284b66a4565c5b60ea9954a557a493d43e40e48c4c7e36f63bbda03deb7180eb1be0b3e56ba17ff16ceafa +SHA512 (zart-20231127gitd014169.tar.gz) = 4d776f87116ea857f382180d85a88bc2a9dc11e58419ab0006bbd20cd31f8f9996a27ea931d5cde0bb12f0d318f93d0f21cdfa32e6f0a34c087a9ca56445e876 From 142582fe1c898c712d23850dcc2ac0758f9f8f43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:49:41 +0000 Subject: [PATCH 099/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 12a1cd0..d453b02 100644 --- a/gmic.spec +++ b/gmic.spec @@ -11,7 +11,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.4.0 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 1%{?dist} +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 @@ -226,6 +226,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From e59d9cf1aee731512f5c8e9f89af472d6debfbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 25 Jul 2024 23:42:01 +0100 Subject: [PATCH 100/136] Rebuild for opencv 4.10.0 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index d453b02..cc8cd8d 100644 --- a/gmic.spec +++ b/gmic.spec @@ -11,7 +11,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.4.0 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 2%{?dist} +Release: 3%{?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 @@ -226,6 +226,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From cb6b75822fad571c900fe94c3fe27fc55eef82b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 28 Aug 2024 18:27:17 +0100 Subject: [PATCH 101/136] Drop unused patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- Makefile_arch.patch | 11 -- gmic-openexr3.patch | 31 ---- gmic-prefix-fixes.patch | 312 ---------------------------------------- gmic.spec | 17 --- 4 files changed, 371 deletions(-) delete mode 100644 Makefile_arch.patch delete mode 100644 gmic-openexr3.patch delete mode 100644 gmic-prefix-fixes.patch diff --git a/Makefile_arch.patch b/Makefile_arch.patch deleted file mode 100644 index ddbd038..0000000 --- a/Makefile_arch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/gmic-openexr3.patch b/gmic-openexr3.patch deleted file mode 100644 index 6cde4fe..0000000 --- a/gmic-openexr3.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 2eedc7b..0000000 --- a/gmic-prefix-fixes.patch +++ /dev/null @@ -1,312 +0,0 @@ -From 7ad9c03f1a6933ad0125105f62ffbe2e5d4ca584 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 3 Sep 2022 20:18:14 +0200 -Subject: [PATCH 1/3] Makefile: Rename USR variable to PREFIX - -Call it prefix as this is what almost all other build systems use for -choosing the install location. ---- - src/Makefile | 126 +++++++++++++++++++++++++-------------------------- - 1 file changed, 63 insertions(+), 63 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 69f0ebb61..f62ce47aa 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -80,7 +80,7 @@ - - # Try to auto-detect target OS. - OS = $(shell uname) --USR = /usr -+PREFIX = /usr - LIB = lib - BIN = bin - INCLUDE = include -@@ -120,12 +120,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 +134,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 +181,13 @@ PRERELEASE = $(shell date +%y%m%d) - 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 +264,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 +317,12 @@ OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_hi - - # 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 +439,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,35 +818,35 @@ 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 \ -@@ -859,43 +859,43 @@ install: - fi; \ - 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 - - -From b859429e113c97dccc79f0102e2d7d37715da747 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 3 Sep 2022 20:20:30 +0200 -Subject: [PATCH 2/3] Makefile: Make a few variables configurable - -This makes it easier for downstreams to choose where they want to put -the files, such as libs going into /usr/lib64 in Fedora, or use the /app -prefix for flatpaks. ---- - src/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index f62ce47aa..7d8b1d395 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -80,10 +80,10 @@ - - # Try to auto-detect target OS. - OS = $(shell uname) --PREFIX = /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 - -From 0cd05ab2379c3cefcffc4f94f85cabf122da1be4 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 3 Sep 2022 20:36:28 +0200 -Subject: [PATCH 3/3] Makefile: Avoid hardcoding bash-completion paths - -Instead, use pkg-config to query the bash-completion path, which -both makes the makefile simpler and also helps get the path right in -more cases. ---- - src/Makefile | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 7d8b1d395..126d1e143 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -88,6 +88,7 @@ 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) -@@ -849,14 +850,8 @@ install: - 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)$(PREFIX)/share/applications; \ diff --git a/gmic.spec b/gmic.spec index cc8cd8d..d57f5ff 100644 --- a/gmic.spec +++ b/gmic.spec @@ -56,13 +56,6 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} # package despite being a shared library Obsoletes: gmic-static <= 2.1.8 -#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 several different user interfaces to convert/manipulate/filter/visualize @@ -107,16 +100,6 @@ Provides G'MIC shared libraries %prep %setup -q -a 1 -a 3 -#%if 0%{?fedora} > 34 -#%patch0 -p1 -#%endif - -#%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 From f3991c80f537d173cc85f431cef8188e34011224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 28 Aug 2024 18:28:02 +0100 Subject: [PATCH 102/136] Drop unused cmake commands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no reason to keep this stuff commented out, when it can be found in git history if it ever needs resurrecting. Signed-off-by: Daniel P. Berrangé --- gmic.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gmic.spec b/gmic.spec index d57f5ff..27f070f 100644 --- a/gmic.spec +++ b/gmic.spec @@ -47,7 +47,6 @@ BuildRequires: libcurl-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: make -#BuildRequires: cmake BuildRequires: chrpath Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -125,11 +124,6 @@ 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} From bc67164fc549a0d49e91706f51532eea71668543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 28 Aug 2024 18:25:43 +0100 Subject: [PATCH 103/136] Use the standalone gmic-qt source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The update to 3.1.6 stopped using the gmic-qt source tarball since gmic contained the same content. While that might the case periodically, it is preferrable to use the upstream gmic-qt source which is a known good copy. Signed-off-by: Daniel P. Berrangé --- gmic.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gmic.spec b/gmic.spec index 27f070f..4d57d52 100644 --- a/gmic.spec +++ b/gmic.spec @@ -43,6 +43,7 @@ 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 @@ -99,6 +100,11 @@ 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} + # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash From d4197a081c57110edcdf0c69bc60324a6c873425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 29 Aug 2024 09:44:25 +0100 Subject: [PATCH 104/136] Add virtual provides for bundled packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Any bundled software is required to have a virtual provides present. Signed-off-by: Daniel P. Berrangé --- gmic.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gmic.spec b/gmic.spec index 4d57d52..5163af4 100644 --- a/gmic.spec +++ b/gmic.spec @@ -50,6 +50,10 @@ BuildRequires: desktop-file-utils BuildRequires: make 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 From 6c3c485f7eaa4499803fba5276fa2b1d94d66aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 28 Aug 2024 18:06:53 +0100 Subject: [PATCH 105/136] Update to latest versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- gmic.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index 5163af4..56148da 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,14 +4,14 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 -%global gmic_qt_version 20240603gitfd72746 -%global gmic_community_version 20240623git5f99800b +%global gmic_qt_version 20240627git366fcc2 +%global gmic_community_version 20240810git52f372f2 Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.4.0 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 3%{?dist} +Release: 4%{?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 @@ -213,6 +213,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Thu Aug 29 2024 Daniel P. Berrangé - 3.4.0-4 +- Update to new versions + * Thu Jul 25 2024 Sérgio Basto - 3.4.0-3 - Rebuild for opencv 4.10.0 diff --git a/sources b/sources index 180c6b9..bcb92d3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (gmic_3.4.0.tar.gz) = bcff0e09850bd41e2696d4e411a9b637ef734b29bf311f8b1cf6153fd30fa39d007c3dd56f8ae44deba57326dc788dae9aaf24b0a826fddd1436fd4c13dec3a5 -SHA512 (gmic-community-20240623git5f99800b.tar.gz) = 9ecbdecc3ce9de27f3f791cc9567b9c1751d625bb3aedae42a771e6eba3602ac4e2256f6d3438d334130b622b47a6d4fa41b690259d18b53e622763aef7c8bea -SHA512 (gmic-qt-20240603gitfd72746.tar.gz) = 252abc8d3c35f087e95d9610dfed0b99a02a69ab44284b66a4565c5b60ea9954a557a493d43e40e48c4c7e36f63bbda03deb7180eb1be0b3e56ba17ff16ceafa +SHA512 (gmic-community-20240810git52f372f2.tar.gz) = 0887979a379956eb96465f99b5ba8ca1ffc520b540ff232ffbec45ef3d6c5360d2438977325fd6dd5a874fde50272575cecc5db1f5dec0f68d8a7785b5fe7e78 +SHA512 (gmic-qt-20240627git366fcc2.tar.gz) = 8ab2a9180149c453affbd4ba6442aabe2c4dcb70c918f44ee9bcc5f4c9cc189922e624124aa73763bbf46a895e7655b3a3c9c62dddeab91a26c0edfbb80ad2ad SHA512 (zart-20231127gitd014169.tar.gz) = 4d776f87116ea857f382180d85a88bc2a9dc11e58419ab0006bbd20cd31f8f9996a27ea931d5cde0bb12f0d318f93d0f21cdfa32e6f0a34c087a9ca56445e876 From 427bd7d16cb621eb7c165e3860f0aba18c97c8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 28 Aug 2024 18:06:53 +0100 Subject: [PATCH 106/136] Fix compat with latest gimp 2.99.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This uses pending patches proposed at: https://github.com/c-koi/gmic-qt/pull/208 NB, not yet functionally tested, only compile tested. Signed-off-by: Daniel P. Berrangé --- ...e-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch | 133 ++++++++++++++++++ ...Gimp-stop-open-coding-version-checks.patch | 70 +++++++++ ...vert-to-new-GimpProcedureConfig-APIs.patch | 116 +++++++++++++++ gmic.spec | 18 ++- 4 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch create mode 100644 0002-Host-Gimp-stop-open-coding-version-checks.patch create mode 100644 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch diff --git a/0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch b/0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch new file mode 100644 index 0000000..fcd52b6 --- /dev/null +++ b/0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch @@ -0,0 +1,133 @@ +From 4e14b8ca39b29c0d5d0a0070d306de0b11fa8a8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Thu, 29 Aug 2024 10:11:16 +0100 +Subject: [PATCH 1/3] Host/Gimp: replace GIMP_VERSION_LTE with + GIMP_CHECK_VERSION +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The GIMP_VERSION_LTE macro is a re-invention of GIMP_CHECK_VERSION, +but with semantics inverted. It is easy to replace with use of the +standard macro, giving more consistency across the file. + +Signed-off-by: Daniel P. Berrangé +--- + src/Host/Gimp/host_gimp.cpp | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp +index 166ff0c..5924773 100644 +--- a/src/Host/Gimp/host_gimp.cpp ++++ b/src/Host/Gimp/host_gimp.cpp +@@ -45,8 +45,6 @@ + * of the GTK version of the gmic plug-in for GIMP by David Tschumperl\'e. + */ + +-#define GIMP_VERSION_LTE(MAJOR, MINOR) (GIMP_MAJOR_VERSION < MAJOR) || ((GIMP_MAJOR_VERSION == MAJOR) && (GIMP_MINOR_VERSION <= MINOR)) +- + #define _gimp_image_get_item_position gimp_image_get_item_position + + #if (GIMP_MAJOR_VERSION == 2) && (GIMP_MINOR_VERSION <= 7) && (GIMP_MICRO_VERSION <= 14) +@@ -71,7 +69,7 @@ + #define _gimp_drawable_get_offsets gimp_drawable_offsets + #endif + +-#if GIMP_VERSION_LTE(2, 98) ++#if !GIMP_CHECK_VERSION(2, 99, 0) + #define _GimpImagePtr int + #define _GimpLayerPtr int + #define _GimpItemPtr int +@@ -142,7 +140,7 @@ namespace GmicQtHost + { + const QString ApplicationName = QString("GIMP %1.%2").arg(GIMP_MAJOR_VERSION).arg(GIMP_MINOR_VERSION); + const char * const ApplicationShortname = GMIC_QT_XSTRINGIFY(GMIC_HOST); +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + const bool DarkThemeIsDefault = false; + #else + const bool DarkThemeIsDefault = true; +@@ -439,7 +437,7 @@ void showMessage(const char * message) + + void applyColorProfile(gmic_library::gmic_image & image) + { +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + unused(image); + // SWAP RED<->GREEN CHANNELS : FOR TESTING PURPOSE ONLY! + // cimg_forXY(image,x,y) { +@@ -675,7 +673,7 @@ void getCroppedImages(gmic_list & images, gmic_list & imageNames, d + QString name = QString("mode(%1),opacity(%2),pos(%3,%4),name(%5)").arg(blendingMode2String(blendMode)).arg(opacity).arg(xPos).arg(yPos).arg(noParenthesisName); + QByteArray ba = name.toUtf8(); + gmic_image::string(ba.constData()).move_to(imageNames[l]); +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + GimpDrawable * drawable = gimp_drawable_get(inputLayers[l]); + GimpPixelRgn region; + gimp_pixel_rgn_init(®ion, drawable, ix, iy, iw, ih, false, false); +@@ -773,7 +771,7 @@ void outputImages(gmic_list & images, const gmic_list & i + gmic_library::gmic_image & img = images[p]; + GmicQt::calibrateImage(img, inputLayerDimensions(p, 3), false); + if (gimp_drawable_mask_intersect(_GIMP_DRAWABLE(inputLayers[p]), &rgn_x, &rgn_y, &rgn_width, &rgn_height)) { +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + GimpDrawable * drawable = gimp_drawable_get(inputLayers[p]); + GimpPixelRgn region; + gimp_pixel_rgn_init(®ion, drawable, rgn_x, rgn_y, rgn_width, rgn_height, true, true); +@@ -799,7 +797,7 @@ void outputImages(gmic_list & images, const gmic_list & i + if (!is_selection) { + gimp_layer_set_offsets(inputLayers[p], layer_posx, layer_posy); + } else { +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + gimp_layer_translate(inputLayers[p], 0, 0); + #else + gimp_item_transform_translate(_GIMP_ITEM(inputLayers[p]), 0, 0); +@@ -854,7 +852,7 @@ void outputImages(gmic_list & images, const gmic_list & i + } + gimp_image_insert_layer(gmic_qt_gimp_image_id, layer_id, _GIMP_NULL_LAYER, layer_pos + p); + +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + GimpDrawable * drawable = gimp_drawable_get(layer_id); + GimpPixelRgn region; + gimp_pixel_rgn_init(®ion, drawable, 0, 0, drawable->width, drawable->height, true, true); +@@ -937,7 +935,7 @@ void outputImages(gmic_list & images, const gmic_list & i + } + gimp_image_insert_layer(gmic_qt_gimp_image_id, layer_id, _GIMP_NULL_LAYER, p); + +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + GimpDrawable * drawable = gimp_drawable_get(layer_id); + GimpPixelRgn region; + gimp_pixel_rgn_init(®ion, drawable, 0, 0, drawable->width, drawable->height, true, true); +@@ -994,7 +992,7 @@ void outputImages(gmic_list & images, const gmic_list & i + const unsigned int max_width = (unsigned int)bottom_right.x; + const unsigned int max_height = (unsigned int)bottom_right.y; + if (_GIMP_LAYER_IS_NOT_NULL(active_layer_id)) { +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + _GimpImagePtr nimage_id = gimp_image_new(max_width, max_height, max_spectrum <= 2 ? GIMP_GRAY : GIMP_RGB); + #else + _GimpImagePtr nimage_id = gimp_image_new_with_precision(max_width, max_height, max_spectrum <= 2 ? GIMP_GRAY : GIMP_RGB, gimp_image_get_precision(gmic_qt_gimp_image_id)); +@@ -1029,7 +1027,7 @@ void outputImages(gmic_list & images, const gmic_list & i + } + gimp_image_insert_layer(nimage_id, layer_id, _GIMP_NULL_LAYER, p); + +-#if GIMP_VERSION_LTE(2, 8) ++#if !GIMP_CHECK_VERSION(2, 9, 0) + GimpDrawable * drawable = gimp_drawable_get(layer_id); + GimpPixelRgn region; + gimp_pixel_rgn_init(®ion, drawable, 0, 0, drawable->width, drawable->height, true, true); +@@ -1061,7 +1059,7 @@ void outputImages(gmic_list & images, const gmic_list & i + + } // namespace GmicQtHost + +-#if GIMP_VERSION_LTE(2, 98) ++#if !GIMP_CHECK_VERSION(2, 99, 0) + /* + * 'Run' function, required by the GIMP plug-in API. + */ +-- +2.45.2 + diff --git a/0002-Host-Gimp-stop-open-coding-version-checks.patch b/0002-Host-Gimp-stop-open-coding-version-checks.patch new file mode 100644 index 0000000..124d058 --- /dev/null +++ b/0002-Host-Gimp-stop-open-coding-version-checks.patch @@ -0,0 +1,70 @@ +From 3150434e86fb946a56e414d521a5d515d02b7cc1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Thu, 29 Aug 2024 10:15:32 +0100 +Subject: [PATCH 2/3] Host/Gimp: stop open coding version checks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use the GIMP_CHECK_VERSION macro instead of open coding version +checks, giving more consistency across the file. This also has +a theoretical correctness benefit in handling the unlikely case +where the major version is 1. + +Signed-off-by: Daniel P. Berrangé +--- + src/Host/Gimp/host_gimp.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp +index 5924773..6a4f088 100644 +--- a/src/Host/Gimp/host_gimp.cpp ++++ b/src/Host/Gimp/host_gimp.cpp +@@ -47,7 +47,7 @@ + + #define _gimp_image_get_item_position gimp_image_get_item_position + +-#if (GIMP_MAJOR_VERSION == 2) && (GIMP_MINOR_VERSION <= 7) && (GIMP_MICRO_VERSION <= 14) ++#if !GIMP_CHECK_VERSION(2, 7, 15) + #define _gimp_item_get_visible gimp_drawable_get_visible + #else + #define _gimp_item_get_visible gimp_item_get_visible +@@ -114,7 +114,7 @@ GType gmic_qt_get_type(void) G_GNUC_CONST; + static GList * gmic_qt_query(GimpPlugIn * plug_in); + static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gchar * name); + +-#if (GIMP_MAJOR_VERSION <= 2) && (GIMP_MINOR_VERSION <= 99) && (GIMP_MICRO_VERSION < 6) ++#if !GIMP_CHECK_VERSION(2, 99, 6) + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data); + #else + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data); +@@ -155,7 +155,7 @@ _GimpImagePtr gmic_qt_gimp_image_id; + gmic_library::gmic_image inputLayerDimensions; + std::vector<_GimpLayerPtr> inputLayers; + +-#if (GIMP_MAJOR_VERSION >= 3 || GIMP_MINOR_VERSION > 8) && !defined(GIMP_NORMAL_MODE) ++#if GIMP_CHECK_VERSION(2, 9, 0) && !defined(GIMP_NORMAL_MODE) + typedef GimpLayerMode GimpLayerModeEffects; + #define GIMP_NORMAL_MODE GIMP_LAYER_MODE_NORMAL + const QMap BlendingModesMap = {{QString("alpha"), GIMP_LAYER_MODE_NORMAL}, +@@ -1065,7 +1065,7 @@ void outputImages(gmic_list & images, const gmic_list & i + */ + void gmic_qt_run(const gchar * /* name */, gint /* nparams */, const GimpParam * param, gint * nreturn_vals, GimpParam ** return_vals) + { +-#if (GIMP_MAJOR_VERSION == 2 && GIMP_MINOR_VERSION > 8) || (GIMP_MAJOR_VERSION >= 3) ++#if GIMP_CHECK_VERSION(2, 9, 0) + gegl_init(nullptr, nullptr); + gimp_plugin_enable_precision(); + #endif +@@ -1156,7 +1156,7 @@ static GList * gmic_qt_query(GimpPlugIn * plug_in) + /* + * 'Run' function, required by the GIMP plug-in API. + */ +-#if (GIMP_MAJOR_VERSION <= 2) && (GIMP_MINOR_VERSION <= 99) && (GIMP_MICRO_VERSION < 6) ++#if !GIMP_CHECK_VERSION(2, 99, 7) + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data) + #else + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data) +-- +2.45.2 + diff --git a/0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch b/0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch new file mode 100644 index 0000000..a2cf04d --- /dev/null +++ b/0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch @@ -0,0 +1,116 @@ +From f24fed64181f81f7e8a4d02da59b182a891a122a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Wed, 28 Aug 2024 17:37:09 +0100 +Subject: [PATCH 3/3] Host/Gimp: convert to new GimpProcedureConfig APIs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The plugin run function now receives a GimpProcedureConfig object +since 2.99.19, instead of a GimpValueArray. Parameters for the +plugin are named GObject properties on this config object which +can be fetched with g_object_get. + +Fixes: https://github.com/c-koi/gmic-qt/issues/207 +Signed-off-by: Daniel P. Berrangé +--- + src/Host/Gimp/host_gimp.cpp | 50 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp +index 6a4f088..d9bc5c8 100644 +--- a/src/Host/Gimp/host_gimp.cpp ++++ b/src/Host/Gimp/host_gimp.cpp +@@ -117,7 +117,11 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha + #if !GIMP_CHECK_VERSION(2, 99, 6) + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data); + #else ++#if !GIMP_CHECK_VERSION(2, 99, 19) + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data); ++#else ++static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, GimpProcedureConfig *config, gpointer run_data); ++#endif + #endif + + G_DEFINE_TYPE(GmicQtPlugin, gmic_qt, GIMP_TYPE_PLUG_IN) +@@ -1159,7 +1163,11 @@ static GList * gmic_qt_query(GimpPlugIn * plug_in) + #if !GIMP_CHECK_VERSION(2, 99, 7) + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data) + #else ++#if !GIMP_CHECK_VERSION(2, 99, 19) + static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data) ++#else ++static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, GimpProcedureConfig *config, gpointer run_data) ++#endif + #endif + { + gegl_init(NULL, NULL); +@@ -1185,9 +1193,24 @@ static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_m + break; + case GIMP_RUN_NONINTERACTIVE: + gmic_qt_gimp_image_id = image; ++#if !GIMP_CHECK_VERSION(2, 99, 19) + pluginParameters.command = g_value_get_string(gimp_value_array_index(args, 2)); + pluginParameters.inputMode = static_cast(g_value_get_int(gimp_value_array_index(args, 0)) + (int)GmicQt::InputMode::NoInput); + pluginParameters.outputMode = static_cast(g_value_get_int(gimp_value_array_index(args, 1)) + (int)GmicQt::OutputMode::InPlace); ++#else ++ char *command; ++ int inputMode; ++ int outputMode; ++ g_object_get(config, ++ "command", &command, ++ "input", &inputMode, ++ "output", &outputMode, ++ NULL); ++ pluginParameters.command = command; ++ pluginParameters.inputMode = (GmicQt::InputMode)inputMode; ++ pluginParameters.outputMode = (GmicQt::OutputMode)outputMode; ++ g_free(command); ++#endif + GmicQt::run(GmicQt::UserInterfaceMode::Silent, // + pluginParameters, // + std::list(), // +@@ -1222,6 +1245,32 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha + "S\303\251bastien Fourey", // copyright + "2017"); // date + ++#if GIMP_CHECK_VERSION(2, 99, 19) ++ gimp_procedure_add_int_argument(procedure, ++ "input", // name ++ "input", // nick ++ "Input layers mode, when non-interactive (0=none, 1=active, 2=all, 3=active & below, 4=active & above, 5=all visibles, 6=all invisibles)", // blurb ++ 0, // min ++ 6, // max ++ 0, // default ++ G_PARAM_READWRITE); // flags ++ ++ gimp_procedure_add_int_argument(procedure, ++ "output", // name ++ "output", // nick ++ "Output mode, when non-interactive (0=in place,1=new layers,2=new active layers,3=new image)", // blurb ++ 0, // min ++ 3, // max ++ 0, // default ++ G_PARAM_READWRITE); // flags ++ ++ gimp_procedure_add_string_argument(procedure, ++ "command", // name ++ "command", // nick ++ "G'MIC command string, when non-interactive", // blurb ++ "", // default ++ G_PARAM_READWRITE); // flags ++#else + GIMP_PROC_ARG_INT(procedure, + "input", // name + "input", // nick +@@ -1246,6 +1295,7 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha + "G'MIC command string, when non-interactive", // blurb + "", // default + G_PARAM_READWRITE); // flags ++#endif + } + + return procedure; +-- +2.45.2 + diff --git a/gmic.spec b/gmic.spec index 56148da..48d57a4 100644 --- a/gmic.spec +++ b/gmic.spec @@ -19,6 +19,12 @@ Source1: zart-%{zart_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 + +# Taken from https://github.com/c-koi/gmic-qt/pull/208 +Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch +Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch +Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch + License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ %if %{use_system_cimg} @@ -109,6 +115,11 @@ Provides G'MIC shared libraries rm -rf gmic-qt tar zxvf %{SOURCE2} +cd gmic-qt +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 + # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -132,7 +143,7 @@ cp /usr/include/CImg.h CImg.h make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 PREFIX=%{_prefix} LIB=%{_lib} cli lib libc 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=gimp3 gmic_qt.pro && %{make_build} %{qmake_qt5} CONFIG+=release GMIC_PATH=../src HOST=none gmic_qt.pro && %{make_build} cd ../zart @@ -147,7 +158,9 @@ iconv -f iso8859-1 -t utf-8 COPYING > COPYING.conv && mv -f COPYING.conv COPYING iconv -f iso8859-1 -t utf-8 COPYING-libcgmic > COPYING-libcgmic.conv && mv -f COPYING-libcgmic.conv COPYING-libcgmic cd src -make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install +# Makefile hardcodes gimptool-2.0 for setting PLUGIN var, so +# override for gimp-3 compat until upstream fixes its rules +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} PLUGIN=%{gimpplugindir} install desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop @@ -215,6 +228,7 @@ fi %changelog * 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 From 376b0f63e65d9b4cfe54d6ad692e1147176f9b95 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 12 Sep 2024 12:53:31 +0200 Subject: [PATCH 107/136] bump version --- gmic.spec | 10 +++++++--- sources | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gmic.spec b/gmic.spec index 48d57a4..8f54756 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,12 +4,13 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 -%global gmic_qt_version 20240627git366fcc2 -%global gmic_community_version 20240810git52f372f2 +%global gmic_qt_version 20240903gitaa4a6f4 +%global gmic_community_version 20240909git70157cd5 + Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.4.0 +Version: 3.4.2 %global shortver %(foo=%{version}; echo ${foo//./}) Release: 4%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz @@ -226,6 +227,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Thu Sep 12 2024 josef radinger - 3.4.2-1 +- bump version + * Thu Aug 29 2024 Daniel P. Berrangé - 3.4.0-4 - Update to new versions - Fix GIMP 2.99.19 compat diff --git a/sources b/sources index bcb92d3..782e519 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.4.0.tar.gz) = bcff0e09850bd41e2696d4e411a9b637ef734b29bf311f8b1cf6153fd30fa39d007c3dd56f8ae44deba57326dc788dae9aaf24b0a826fddd1436fd4c13dec3a5 -SHA512 (gmic-community-20240810git52f372f2.tar.gz) = 0887979a379956eb96465f99b5ba8ca1ffc520b540ff232ffbec45ef3d6c5360d2438977325fd6dd5a874fde50272575cecc5db1f5dec0f68d8a7785b5fe7e78 -SHA512 (gmic-qt-20240627git366fcc2.tar.gz) = 8ab2a9180149c453affbd4ba6442aabe2c4dcb70c918f44ee9bcc5f4c9cc189922e624124aa73763bbf46a895e7655b3a3c9c62dddeab91a26c0edfbb80ad2ad -SHA512 (zart-20231127gitd014169.tar.gz) = 4d776f87116ea857f382180d85a88bc2a9dc11e58419ab0006bbd20cd31f8f9996a27ea931d5cde0bb12f0d318f93d0f21cdfa32e6f0a34c087a9ca56445e876 +SHA512 (gmic_3.4.2.tar.gz) = b3151c8f4d1046ec08c9e874fb293acf23fc1d9fcf0b81d79529fe8ee4f58cc7b96778d2ef03fe09cab40d4628883652a88db64146b0972b47afff0f4bfad878 +SHA512 (zart-20231127gitd014169.tar.gz) = e41050512a17e5a6840e3b2c09ec2ad3367979ca0c8cf9d52a803d43c73b3dde75a98e558e95afbdf97e557bba46cdf046f29168f8748244312e73e457c35af0 +SHA512 (gmic-qt-20240903gitaa4a6f4.tar.gz) = 87e025db715764dfc96cce09b2f0077c8e0e35f6398162f595a30e1b2bcf0555a848708acd2a02099a1c478c5e20d5e2df96c1369a21773289d858b27e3b89d4 +SHA512 (gmic-community-20240909git70157cd5.tar.gz) = 6c18911298f3ec6d4edb8e2a48c9e5779bb2217bbaa2168476a811580f6ddda749be6b3ea5647365e929fbf1764cdd3d3e4cd2fd43b16fd52ac8262c08d590f2 From 79955ea00ae289ce70f22443bcc235515a52af13 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 12 Sep 2024 14:20:58 +0200 Subject: [PATCH 108/136] fix patches --- gmic.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index 8f54756..ff17100 100644 --- a/gmic.spec +++ b/gmic.spec @@ -22,8 +22,8 @@ Source2: gmic-qt-%{gmic_qt_version}.tar.gz Source3: gmic-community-%{gmic_community_version}.tar.gz # Taken from https://github.com/c-koi/gmic-qt/pull/208 -Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch -Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch +#Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch +#Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later @@ -229,6 +229,8 @@ fi %changelog * 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 From 059926f209a56179d44aa62014e3f1b316f678dd Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 12 Sep 2024 14:32:39 +0200 Subject: [PATCH 109/136] fix --- gmic.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gmic.spec b/gmic.spec index ff17100..9bf606f 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.4.2 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 4%{?dist} +Release: 5%{?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 @@ -117,8 +117,8 @@ rm -rf gmic-qt tar zxvf %{SOURCE2} cd gmic-qt -%patch 1 -p1 -%patch 2 -p1 +#%patch 1 -p1 +#%patch 2 -p1 %patch 3 -p1 # remove stash-file (thanks Wolfgang Lieff ) @@ -227,6 +227,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Thu Sep 12 2024 josef radinger - 3.4.2-5 +- missed the release being still on -4 + * 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 From e7b12554424ae96ec79af21d5375ffea6b602fa8 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 14 Sep 2024 21:15:04 +0200 Subject: [PATCH 110/136] remove patch3 --- gmic.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gmic.spec b/gmic.spec index 9bf606f..9e82414 100644 --- a/gmic.spec +++ b/gmic.spec @@ -24,7 +24,7 @@ Source3: gmic-community-%{gmic_community_version}.tar.gz # Taken from https://github.com/c-koi/gmic-qt/pull/208 #Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch #Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch -Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch +#Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ @@ -119,7 +119,7 @@ tar zxvf %{SOURCE2} cd gmic-qt #%patch 1 -p1 #%patch 2 -p1 -%patch 3 -p1 +#%patch 3 -p1 # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -229,6 +229,8 @@ fi %changelog * 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 From f0c311c2aab5afb8beed46fc06855ffb5dfac460 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 14 Oct 2024 09:42:53 +0200 Subject: [PATCH 111/136] bump version --- gmic.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index 9e82414..d89bcfa 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,14 +5,14 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20240903gitaa4a6f4 -%global gmic_community_version 20240909git70157cd5 +%global gmic_community_version 20241013git29117687 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.4.2 +Version: 3.4.3 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 5%{?dist} +Release: 1%{?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 @@ -227,6 +227,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 diff --git a/sources b/sources index 782e519..e7d3cff 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.4.2.tar.gz) = b3151c8f4d1046ec08c9e874fb293acf23fc1d9fcf0b81d79529fe8ee4f58cc7b96778d2ef03fe09cab40d4628883652a88db64146b0972b47afff0f4bfad878 SHA512 (zart-20231127gitd014169.tar.gz) = e41050512a17e5a6840e3b2c09ec2ad3367979ca0c8cf9d52a803d43c73b3dde75a98e558e95afbdf97e557bba46cdf046f29168f8748244312e73e457c35af0 SHA512 (gmic-qt-20240903gitaa4a6f4.tar.gz) = 87e025db715764dfc96cce09b2f0077c8e0e35f6398162f595a30e1b2bcf0555a848708acd2a02099a1c478c5e20d5e2df96c1369a21773289d858b27e3b89d4 -SHA512 (gmic-community-20240909git70157cd5.tar.gz) = 6c18911298f3ec6d4edb8e2a48c9e5779bb2217bbaa2168476a811580f6ddda749be6b3ea5647365e929fbf1764cdd3d3e4cd2fd43b16fd52ac8262c08d590f2 +SHA512 (gmic-community-20241013git29117687.tar.gz) = 45289e4e996522e6ebe3df46cb0693c045b24d9f97d13acf94de4da153ef4d4a1adb5d2db81ae479ac02969fc635d62284bcff6802c200f8416746db07ffd81c +SHA512 (gmic_3.4.3.tar.gz) = 8ec1107590c5fa27d2f2c3a54b16832d14af3bfb6800045ad6b39bcbf4423a734bd5a78a4a06984d660daef5868a887b2d8e45c983137c1aa214fefceffbdd95 From 5448f2129be5edc27cf134dbfe94cc5dab14ac97 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 14 Oct 2024 10:30:25 +0200 Subject: [PATCH 112/136] finally remove patches --- gmic.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gmic.spec b/gmic.spec index d89bcfa..31dbb9c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -117,9 +117,10 @@ rm -rf gmic-qt tar zxvf %{SOURCE2} cd gmic-qt -#%patch 1 -p1 -#%patch 2 -p1 -#%patch 3 -p1 +# no longer needed +#%%patch 1 -p1 +#%%patch 2 -p1 +#%%patch 3 -p1 # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash From c92c6087e2f089404e823ad61a9b43c1a907e614 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 15 Oct 2024 11:28:15 +0200 Subject: [PATCH 113/136] remove s390x from supported archs --- gmic.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gmic.spec b/gmic.spec index 31dbb9c..b498d02 100644 --- a/gmic.spec +++ b/gmic.spec @@ -66,6 +66,8 @@ 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 %description G'MIC is an open and full-featured framework for image processing, providing From 6d96f77ed7b0bf1f376c16cab2fbec72c019b98b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:24:51 -0600 Subject: [PATCH 114/136] Rebuild for hdf5 1.14.5 --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index b498d02..a4c4b57 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.4.3 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 1%{?dist} +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 @@ -230,6 +230,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From 060bc8cfe9e8bfd989bd9078ef5ace69858e0cc0 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 4 Jan 2025 09:35:38 +0100 Subject: [PATCH 115/136] bump version --- gmic.spec | 8 +++++--- sources | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index a4c4b57..25f8362 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,12 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20240903gitaa4a6f4 -%global gmic_community_version 20241013git29117687 - +%global gmic_community_version 20250103git467deb07 Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.4.3 +Version: 3.5.0 %global shortver %(foo=%{version}; echo ${foo//./}) Release: 2%{?dist} Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz @@ -230,6 +229,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 diff --git a/sources b/sources index e7d3cff..2a1d49e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ +SHA512 (gmic_3.5.0.tar.gz) = 974a6446446e79ebe0a489fb36b0d5f734a17a29d15db7649b1964e7a8353b09cbfc6084236cd7e858bb1a159907377352c1258b1f6ba6abdc218d6e3abc7661 SHA512 (zart-20231127gitd014169.tar.gz) = e41050512a17e5a6840e3b2c09ec2ad3367979ca0c8cf9d52a803d43c73b3dde75a98e558e95afbdf97e557bba46cdf046f29168f8748244312e73e457c35af0 SHA512 (gmic-qt-20240903gitaa4a6f4.tar.gz) = 87e025db715764dfc96cce09b2f0077c8e0e35f6398162f595a30e1b2bcf0555a848708acd2a02099a1c478c5e20d5e2df96c1369a21773289d858b27e3b89d4 -SHA512 (gmic-community-20241013git29117687.tar.gz) = 45289e4e996522e6ebe3df46cb0693c045b24d9f97d13acf94de4da153ef4d4a1adb5d2db81ae479ac02969fc635d62284bcff6802c200f8416746db07ffd81c -SHA512 (gmic_3.4.3.tar.gz) = 8ec1107590c5fa27d2f2c3a54b16832d14af3bfb6800045ad6b39bcbf4423a734bd5a78a4a06984d660daef5868a887b2d8e45c983137c1aa214fefceffbdd95 +SHA512 (gmic-community-20250103git467deb07.tar.gz) = 9d3e1cf25197f0f550cf1f038fcac382e73d7623e64110eb17ba7a6a0470670b1f296425eb90177a13b45187a5c43389bd5b4446acc7ba9e9defd8f6d25d3250 From cd10a77b663205f676edea309b3b18bff954227b Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 7 Jan 2025 08:56:00 +0100 Subject: [PATCH 116/136] fix compilation --- .gitignore | 3 ++- gmic.spec | 8 ++++++++ sources | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c8a6374..359a03d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ x86_64/ /gmic-community-*.tar.gz /gmic-community/ /zart*.tar.gz -/zart/ \ No newline at end of file +/zart/ +/41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch diff --git a/gmic.spec b/gmic.spec index 25f8362..2d61e13 100644 --- a/gmic.spec +++ b/gmic.spec @@ -25,6 +25,9 @@ Source3: gmic-community-%{gmic_community_version}.tar.gz #Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch #Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch +# fix compilation https://github.com/GreycLab/gmic-qt/commit/41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch +Patch4: 41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch + License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ %if %{use_system_cimg} @@ -122,6 +125,8 @@ cd gmic-qt #%%patch 1 -p1 #%%patch 2 -p1 #%%patch 3 -p1 +%patch -P4 -p1 + # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -229,6 +234,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Tue Jan 07 2025 josef radinger - 3.5.0-2 +- try to fix compilation + * Sat Jan 04 2025 josef radinger - 3.5.0-1 - bump version diff --git a/sources b/sources index 2a1d49e..dff489a 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (gmic_3.5.0.tar.gz) = 974a6446446e79ebe0a489fb36b0d5f734a17a29d15db7649b1 SHA512 (zart-20231127gitd014169.tar.gz) = e41050512a17e5a6840e3b2c09ec2ad3367979ca0c8cf9d52a803d43c73b3dde75a98e558e95afbdf97e557bba46cdf046f29168f8748244312e73e457c35af0 SHA512 (gmic-qt-20240903gitaa4a6f4.tar.gz) = 87e025db715764dfc96cce09b2f0077c8e0e35f6398162f595a30e1b2bcf0555a848708acd2a02099a1c478c5e20d5e2df96c1369a21773289d858b27e3b89d4 SHA512 (gmic-community-20250103git467deb07.tar.gz) = 9d3e1cf25197f0f550cf1f038fcac382e73d7623e64110eb17ba7a6a0470670b1f296425eb90177a13b45187a5c43389bd5b4446acc7ba9e9defd8f6d25d3250 +SHA512 (41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch) = 1240793c2558f49f3fed41e663cdbfe645657b5d0a7b2d9c2aaa43246f5501fcfc68dc059f517c1145703e77a1a5e7a4f15692219b15bcb31361b1880c9cf3ce From d301906022d225af03e958ce397d5a89935c4116 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 7 Jan 2025 11:01:17 +0100 Subject: [PATCH 117/136] fix compilation --- gmic.spec | 12 +++++++----- sources | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index 2d61e13..7ff82e8 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,8 +4,9 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 -%global gmic_qt_version 20240903gitaa4a6f4 -%global gmic_community_version 20250103git467deb07 +%global gmic_qt_version 20241231git41e86b9 +%global gmic_community_version 20250106git67dca7d6 + Summary: GREYC's Magic for Image Computing Name: gmic @@ -26,7 +27,7 @@ Source3: gmic-community-%{gmic_community_version}.tar.gz #Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch # fix compilation https://github.com/GreycLab/gmic-qt/commit/41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch -Patch4: 41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch +#Patch4: 41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ @@ -125,8 +126,6 @@ cd gmic-qt #%%patch 1 -p1 #%%patch 2 -p1 #%%patch 3 -p1 -%patch -P4 -p1 - # remove stash-file (thanks Wolfgang Lieff ) rm -f zart/.qmake.stash @@ -236,6 +235,9 @@ fi %changelog * 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 diff --git a/sources b/sources index dff489a..bea764e 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ SHA512 (gmic_3.5.0.tar.gz) = 974a6446446e79ebe0a489fb36b0d5f734a17a29d15db7649b1964e7a8353b09cbfc6084236cd7e858bb1a159907377352c1258b1f6ba6abdc218d6e3abc7661 SHA512 (zart-20231127gitd014169.tar.gz) = e41050512a17e5a6840e3b2c09ec2ad3367979ca0c8cf9d52a803d43c73b3dde75a98e558e95afbdf97e557bba46cdf046f29168f8748244312e73e457c35af0 -SHA512 (gmic-qt-20240903gitaa4a6f4.tar.gz) = 87e025db715764dfc96cce09b2f0077c8e0e35f6398162f595a30e1b2bcf0555a848708acd2a02099a1c478c5e20d5e2df96c1369a21773289d858b27e3b89d4 -SHA512 (gmic-community-20250103git467deb07.tar.gz) = 9d3e1cf25197f0f550cf1f038fcac382e73d7623e64110eb17ba7a6a0470670b1f296425eb90177a13b45187a5c43389bd5b4446acc7ba9e9defd8f6d25d3250 -SHA512 (41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch) = 1240793c2558f49f3fed41e663cdbfe645657b5d0a7b2d9c2aaa43246f5501fcfc68dc059f517c1145703e77a1a5e7a4f15692219b15bcb31361b1880c9cf3ce +SHA512 (gmic-qt-20241231git41e86b9.tar.gz) = be29ca741166968bc191b40c2243e36eed074812e5fc8fc481bd9417437c1de79deb5cc95f22989f883c91a8abaf3b2d510fe6724665b7df55a4d8c07d73b50f +SHA512 (gmic-community-20250106git67dca7d6.tar.gz) = add048c57eba1164e8a970badbf2524fb30294498dc017e4b9506588f74a12093171d3bb0a2a82339f2d35c74c8c3e354b2ad2d66a6a32cedf0c566407e55889 From c233cbd0b5233a0e6ac70a198e6b1a45b16f1c96 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 7 Jan 2025 11:08:03 +0100 Subject: [PATCH 118/136] fix compilation --- new-snapshot.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/new-snapshot.sh b/new-snapshot.sh index cf0afd7..b9b9c73 100755 --- a/new-snapshot.sh +++ b/new-snapshot.sh @@ -40,7 +40,8 @@ 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/c-koi/gmic-qt . +archive_it gmic-qt https://github.com/GreycLab/gmic-qt.git . archive_it gmic-community https://github.com/dtschump/gmic-community libcgmic print_hash zart From 3638470bc8ecafdbdbfe3c0a00bb954d9e004522 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:30:40 +0000 Subject: [PATCH 119/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 7ff82e8..cbc7832 100644 --- a/gmic.spec +++ b/gmic.spec @@ -12,7 +12,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.5.0 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 2%{?dist} +Release: 3%{?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 @@ -233,6 +233,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* 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 From afc0c04834b301b8fc596ff4cb237125717d2b9c Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 29 Jan 2025 13:01:56 +0100 Subject: [PATCH 120/136] bump version --- gmic.spec | 10 ++++++---- sources | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gmic.spec b/gmic.spec index cbc7832..bdf261a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,14 +5,13 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20241231git41e86b9 -%global gmic_community_version 20250106git67dca7d6 - +%global gmic_community_version 20250129gitf6fb9ace Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.5.0 +Version: 3.5.2 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 3%{?dist} +Release: 1%{?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 @@ -233,6 +232,9 @@ fi %{_libdir}/libcgmic.so.3* %changelog +* Wed Jan 29 2025 josef radinger - 3.5.2-1 +- bump version + * Thu Jan 16 2025 Fedora Release Engineering - 3.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index bea764e..c8a213f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.5.0.tar.gz) = 974a6446446e79ebe0a489fb36b0d5f734a17a29d15db7649b1964e7a8353b09cbfc6084236cd7e858bb1a159907377352c1258b1f6ba6abdc218d6e3abc7661 -SHA512 (zart-20231127gitd014169.tar.gz) = e41050512a17e5a6840e3b2c09ec2ad3367979ca0c8cf9d52a803d43c73b3dde75a98e558e95afbdf97e557bba46cdf046f29168f8748244312e73e457c35af0 -SHA512 (gmic-qt-20241231git41e86b9.tar.gz) = be29ca741166968bc191b40c2243e36eed074812e5fc8fc481bd9417437c1de79deb5cc95f22989f883c91a8abaf3b2d510fe6724665b7df55a4d8c07d73b50f -SHA512 (gmic-community-20250106git67dca7d6.tar.gz) = add048c57eba1164e8a970badbf2524fb30294498dc017e4b9506588f74a12093171d3bb0a2a82339f2d35c74c8c3e354b2ad2d66a6a32cedf0c566407e55889 +SHA512 (gmic_3.5.2.tar.gz) = 3d70fd93c07e4a19a8022b7e33a224b0062b95f244dd254ccdbd3ac74587e9704e6bb2e1f85975a17af1e235f40452fde0c08b2c7cb935319edd8ca12453d202 +SHA512 (zart-20231127gitd014169.tar.gz) = 4d776f87116ea857f382180d85a88bc2a9dc11e58419ab0006bbd20cd31f8f9996a27ea931d5cde0bb12f0d318f93d0f21cdfa32e6f0a34c087a9ca56445e876 +SHA512 (gmic-qt-20241231git41e86b9.tar.gz) = 5c1531bab48d72948f3bdf5a46f3b031d03386212794408752fd3fd012cf9d2bda48942c72dd3f8aeffc38368eb7883a909c78be53a770b4c0647eaf98d9e9a2 +SHA512 (gmic-community-20250129gitf6fb9ace.tar.gz) = f830d493fd1db281d7c74202b946bbdf132f0949bc4e24257be8978a4e70a1eebd0d1afe9f0efbede4de69ed0642028ea30798390b4d098abc82540aa4603d28 From 35be21dd14fbf76eb621d7a3a8c53138e5de7650 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 8 Feb 2025 15:15:46 +0100 Subject: [PATCH 121/136] fix build --- gmic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index bdf261a..3c0cb91 100644 --- a/gmic.spec +++ b/gmic.spec @@ -149,7 +149,7 @@ cp /usr/include/CImg.h CImg.h make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 PREFIX=%{_prefix} LIB=%{_lib} cli lib libc cd ../gmic-qt -%{qmake_qt5} CONFIG+=release GMIC_PATH=../src HOST=gimp3 gmic_qt.pro && %{make_build} +%{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} cd ../zart @@ -225,6 +225,7 @@ fi %{_datadir}/gmic/gmic_denoise_cnn.gmz %{_datadir}/gmic/gmic_fonts.gmz %{_datadir}/gmic/gmic_lightleaks.gmz +%{_datadir}/gmic/gmic_scale2x_cnn.gmz %files libs %license COPYING COPYING-libcgmic @@ -234,6 +235,8 @@ fi %changelog * 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 From 90f9f4545aaa5804b0be7e0276b170463764864c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 7 Mar 2025 14:44:24 +0000 Subject: [PATCH 122/136] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++++ gmic.spec | 397 +----------------------------------------------------- 2 files changed, 396 insertions(+), 395 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8f8bfdd --- /dev/null +++ b/changelog @@ -0,0 +1,394 @@ +* 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.spec b/gmic.spec index 3c0cb91..86e4468 100644 --- a/gmic.spec +++ b/gmic.spec @@ -11,7 +11,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic Version: 3.5.2 %global shortver %(foo=%{version}; echo ${foo//./}) -Release: 1%{?dist} +Release: %autorelease 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 @@ -233,397 +233,4 @@ fi %{_libdir}/libcgmic.so.3* %changelog -* 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) +%autochangelog From fa387818d2894c004c0a7e6e2207c437c4fa8db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 7 Mar 2025 14:43:38 +0000 Subject: [PATCH 123/136] Fix plugin directory (rhbz#2335927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gimp3 requires use of a sub-directory Signed-off-by: Daniel P. Berrangé --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 86e4468..ae6f0cd 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,4 +1,4 @@ -%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins/gmic_gimp_qt %global use_system_cimg 1 From 994b7a9b28915cf4414a6ef03b32c7e265121f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Mar 2025 09:38:17 +0000 Subject: [PATCH 124/136] Add lua script to handle file -> dir replacement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- gmic.spec | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gmic.spec b/gmic.spec index ae6f0cd..f8ce8bf 100644 --- a/gmic.spec +++ b/gmic.spec @@ -194,6 +194,22 @@ 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. +# +# 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}" +st = posix.stat(path) +if st and st.type == "regular" then + os.remove(path) +end + %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : From 5534595f5c2e826940163e1d2a52ea6c19f6947b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Mar 2025 11:54:00 +0000 Subject: [PATCH 125/136] Own gmic specific directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- gmic.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gmic.spec b/gmic.spec index f8ce8bf..9ff2d29 100644 --- a/gmic.spec +++ b/gmic.spec @@ -236,7 +236,9 @@ end %{_libdir}/libcgmic.so %files gimp +%dir %{gimpplugindir} %{gimpplugindir}/gmic_gimp_qt +%dir %{_datadir}/gmic %{_datadir}/gmic/gmic_cluts.gmz %{_datadir}/gmic/gmic_denoise_cnn.gmz %{_datadir}/gmic/gmic_fonts.gmz From 7ca97fad94cdd6e18646a32b95c13595ce7f5b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 10 Mar 2025 11:56:46 +0000 Subject: [PATCH 126/136] Drop obsolete patch files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip changelog] Signed-off-by: Daniel P. Berrangé --- ...e-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch | 133 ------------------ ...Gimp-stop-open-coding-version-checks.patch | 70 --------- ...vert-to-new-GimpProcedureConfig-APIs.patch | 116 --------------- gmic.spec | 8 -- 4 files changed, 327 deletions(-) delete mode 100644 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch delete mode 100644 0002-Host-Gimp-stop-open-coding-version-checks.patch delete mode 100644 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch diff --git a/0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch b/0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch deleted file mode 100644 index fcd52b6..0000000 --- a/0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 4e14b8ca39b29c0d5d0a0070d306de0b11fa8a8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Thu, 29 Aug 2024 10:11:16 +0100 -Subject: [PATCH 1/3] Host/Gimp: replace GIMP_VERSION_LTE with - GIMP_CHECK_VERSION -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The GIMP_VERSION_LTE macro is a re-invention of GIMP_CHECK_VERSION, -but with semantics inverted. It is easy to replace with use of the -standard macro, giving more consistency across the file. - -Signed-off-by: Daniel P. Berrangé ---- - src/Host/Gimp/host_gimp.cpp | 24 +++++++++++------------- - 1 file changed, 11 insertions(+), 13 deletions(-) - -diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp -index 166ff0c..5924773 100644 ---- a/src/Host/Gimp/host_gimp.cpp -+++ b/src/Host/Gimp/host_gimp.cpp -@@ -45,8 +45,6 @@ - * of the GTK version of the gmic plug-in for GIMP by David Tschumperl\'e. - */ - --#define GIMP_VERSION_LTE(MAJOR, MINOR) (GIMP_MAJOR_VERSION < MAJOR) || ((GIMP_MAJOR_VERSION == MAJOR) && (GIMP_MINOR_VERSION <= MINOR)) -- - #define _gimp_image_get_item_position gimp_image_get_item_position - - #if (GIMP_MAJOR_VERSION == 2) && (GIMP_MINOR_VERSION <= 7) && (GIMP_MICRO_VERSION <= 14) -@@ -71,7 +69,7 @@ - #define _gimp_drawable_get_offsets gimp_drawable_offsets - #endif - --#if GIMP_VERSION_LTE(2, 98) -+#if !GIMP_CHECK_VERSION(2, 99, 0) - #define _GimpImagePtr int - #define _GimpLayerPtr int - #define _GimpItemPtr int -@@ -142,7 +140,7 @@ namespace GmicQtHost - { - const QString ApplicationName = QString("GIMP %1.%2").arg(GIMP_MAJOR_VERSION).arg(GIMP_MINOR_VERSION); - const char * const ApplicationShortname = GMIC_QT_XSTRINGIFY(GMIC_HOST); --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - const bool DarkThemeIsDefault = false; - #else - const bool DarkThemeIsDefault = true; -@@ -439,7 +437,7 @@ void showMessage(const char * message) - - void applyColorProfile(gmic_library::gmic_image & image) - { --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - unused(image); - // SWAP RED<->GREEN CHANNELS : FOR TESTING PURPOSE ONLY! - // cimg_forXY(image,x,y) { -@@ -675,7 +673,7 @@ void getCroppedImages(gmic_list & images, gmic_list & imageNames, d - QString name = QString("mode(%1),opacity(%2),pos(%3,%4),name(%5)").arg(blendingMode2String(blendMode)).arg(opacity).arg(xPos).arg(yPos).arg(noParenthesisName); - QByteArray ba = name.toUtf8(); - gmic_image::string(ba.constData()).move_to(imageNames[l]); --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - GimpDrawable * drawable = gimp_drawable_get(inputLayers[l]); - GimpPixelRgn region; - gimp_pixel_rgn_init(®ion, drawable, ix, iy, iw, ih, false, false); -@@ -773,7 +771,7 @@ void outputImages(gmic_list & images, const gmic_list & i - gmic_library::gmic_image & img = images[p]; - GmicQt::calibrateImage(img, inputLayerDimensions(p, 3), false); - if (gimp_drawable_mask_intersect(_GIMP_DRAWABLE(inputLayers[p]), &rgn_x, &rgn_y, &rgn_width, &rgn_height)) { --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - GimpDrawable * drawable = gimp_drawable_get(inputLayers[p]); - GimpPixelRgn region; - gimp_pixel_rgn_init(®ion, drawable, rgn_x, rgn_y, rgn_width, rgn_height, true, true); -@@ -799,7 +797,7 @@ void outputImages(gmic_list & images, const gmic_list & i - if (!is_selection) { - gimp_layer_set_offsets(inputLayers[p], layer_posx, layer_posy); - } else { --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - gimp_layer_translate(inputLayers[p], 0, 0); - #else - gimp_item_transform_translate(_GIMP_ITEM(inputLayers[p]), 0, 0); -@@ -854,7 +852,7 @@ void outputImages(gmic_list & images, const gmic_list & i - } - gimp_image_insert_layer(gmic_qt_gimp_image_id, layer_id, _GIMP_NULL_LAYER, layer_pos + p); - --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - GimpDrawable * drawable = gimp_drawable_get(layer_id); - GimpPixelRgn region; - gimp_pixel_rgn_init(®ion, drawable, 0, 0, drawable->width, drawable->height, true, true); -@@ -937,7 +935,7 @@ void outputImages(gmic_list & images, const gmic_list & i - } - gimp_image_insert_layer(gmic_qt_gimp_image_id, layer_id, _GIMP_NULL_LAYER, p); - --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - GimpDrawable * drawable = gimp_drawable_get(layer_id); - GimpPixelRgn region; - gimp_pixel_rgn_init(®ion, drawable, 0, 0, drawable->width, drawable->height, true, true); -@@ -994,7 +992,7 @@ void outputImages(gmic_list & images, const gmic_list & i - const unsigned int max_width = (unsigned int)bottom_right.x; - const unsigned int max_height = (unsigned int)bottom_right.y; - if (_GIMP_LAYER_IS_NOT_NULL(active_layer_id)) { --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - _GimpImagePtr nimage_id = gimp_image_new(max_width, max_height, max_spectrum <= 2 ? GIMP_GRAY : GIMP_RGB); - #else - _GimpImagePtr nimage_id = gimp_image_new_with_precision(max_width, max_height, max_spectrum <= 2 ? GIMP_GRAY : GIMP_RGB, gimp_image_get_precision(gmic_qt_gimp_image_id)); -@@ -1029,7 +1027,7 @@ void outputImages(gmic_list & images, const gmic_list & i - } - gimp_image_insert_layer(nimage_id, layer_id, _GIMP_NULL_LAYER, p); - --#if GIMP_VERSION_LTE(2, 8) -+#if !GIMP_CHECK_VERSION(2, 9, 0) - GimpDrawable * drawable = gimp_drawable_get(layer_id); - GimpPixelRgn region; - gimp_pixel_rgn_init(®ion, drawable, 0, 0, drawable->width, drawable->height, true, true); -@@ -1061,7 +1059,7 @@ void outputImages(gmic_list & images, const gmic_list & i - - } // namespace GmicQtHost - --#if GIMP_VERSION_LTE(2, 98) -+#if !GIMP_CHECK_VERSION(2, 99, 0) - /* - * 'Run' function, required by the GIMP plug-in API. - */ --- -2.45.2 - diff --git a/0002-Host-Gimp-stop-open-coding-version-checks.patch b/0002-Host-Gimp-stop-open-coding-version-checks.patch deleted file mode 100644 index 124d058..0000000 --- a/0002-Host-Gimp-stop-open-coding-version-checks.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3150434e86fb946a56e414d521a5d515d02b7cc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Thu, 29 Aug 2024 10:15:32 +0100 -Subject: [PATCH 2/3] Host/Gimp: stop open coding version checks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use the GIMP_CHECK_VERSION macro instead of open coding version -checks, giving more consistency across the file. This also has -a theoretical correctness benefit in handling the unlikely case -where the major version is 1. - -Signed-off-by: Daniel P. Berrangé ---- - src/Host/Gimp/host_gimp.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp -index 5924773..6a4f088 100644 ---- a/src/Host/Gimp/host_gimp.cpp -+++ b/src/Host/Gimp/host_gimp.cpp -@@ -47,7 +47,7 @@ - - #define _gimp_image_get_item_position gimp_image_get_item_position - --#if (GIMP_MAJOR_VERSION == 2) && (GIMP_MINOR_VERSION <= 7) && (GIMP_MICRO_VERSION <= 14) -+#if !GIMP_CHECK_VERSION(2, 7, 15) - #define _gimp_item_get_visible gimp_drawable_get_visible - #else - #define _gimp_item_get_visible gimp_item_get_visible -@@ -114,7 +114,7 @@ GType gmic_qt_get_type(void) G_GNUC_CONST; - static GList * gmic_qt_query(GimpPlugIn * plug_in); - static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gchar * name); - --#if (GIMP_MAJOR_VERSION <= 2) && (GIMP_MINOR_VERSION <= 99) && (GIMP_MICRO_VERSION < 6) -+#if !GIMP_CHECK_VERSION(2, 99, 6) - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data); - #else - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data); -@@ -155,7 +155,7 @@ _GimpImagePtr gmic_qt_gimp_image_id; - gmic_library::gmic_image inputLayerDimensions; - std::vector<_GimpLayerPtr> inputLayers; - --#if (GIMP_MAJOR_VERSION >= 3 || GIMP_MINOR_VERSION > 8) && !defined(GIMP_NORMAL_MODE) -+#if GIMP_CHECK_VERSION(2, 9, 0) && !defined(GIMP_NORMAL_MODE) - typedef GimpLayerMode GimpLayerModeEffects; - #define GIMP_NORMAL_MODE GIMP_LAYER_MODE_NORMAL - const QMap BlendingModesMap = {{QString("alpha"), GIMP_LAYER_MODE_NORMAL}, -@@ -1065,7 +1065,7 @@ void outputImages(gmic_list & images, const gmic_list & i - */ - void gmic_qt_run(const gchar * /* name */, gint /* nparams */, const GimpParam * param, gint * nreturn_vals, GimpParam ** return_vals) - { --#if (GIMP_MAJOR_VERSION == 2 && GIMP_MINOR_VERSION > 8) || (GIMP_MAJOR_VERSION >= 3) -+#if GIMP_CHECK_VERSION(2, 9, 0) - gegl_init(nullptr, nullptr); - gimp_plugin_enable_precision(); - #endif -@@ -1156,7 +1156,7 @@ static GList * gmic_qt_query(GimpPlugIn * plug_in) - /* - * 'Run' function, required by the GIMP plug-in API. - */ --#if (GIMP_MAJOR_VERSION <= 2) && (GIMP_MINOR_VERSION <= 99) && (GIMP_MICRO_VERSION < 6) -+#if !GIMP_CHECK_VERSION(2, 99, 7) - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data) - #else - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data) --- -2.45.2 - diff --git a/0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch b/0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch deleted file mode 100644 index a2cf04d..0000000 --- a/0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch +++ /dev/null @@ -1,116 +0,0 @@ -From f24fed64181f81f7e8a4d02da59b182a891a122a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Wed, 28 Aug 2024 17:37:09 +0100 -Subject: [PATCH 3/3] Host/Gimp: convert to new GimpProcedureConfig APIs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The plugin run function now receives a GimpProcedureConfig object -since 2.99.19, instead of a GimpValueArray. Parameters for the -plugin are named GObject properties on this config object which -can be fetched with g_object_get. - -Fixes: https://github.com/c-koi/gmic-qt/issues/207 -Signed-off-by: Daniel P. Berrangé ---- - src/Host/Gimp/host_gimp.cpp | 50 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 50 insertions(+) - -diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp -index 6a4f088..d9bc5c8 100644 ---- a/src/Host/Gimp/host_gimp.cpp -+++ b/src/Host/Gimp/host_gimp.cpp -@@ -117,7 +117,11 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha - #if !GIMP_CHECK_VERSION(2, 99, 6) - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data); - #else -+#if !GIMP_CHECK_VERSION(2, 99, 19) - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data); -+#else -+static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, GimpProcedureConfig *config, gpointer run_data); -+#endif - #endif - - G_DEFINE_TYPE(GmicQtPlugin, gmic_qt, GIMP_TYPE_PLUG_IN) -@@ -1159,7 +1163,11 @@ static GList * gmic_qt_query(GimpPlugIn * plug_in) - #if !GIMP_CHECK_VERSION(2, 99, 7) - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, GimpDrawable * drawable, const GimpValueArray * args, gpointer run_data) - #else -+#if !GIMP_CHECK_VERSION(2, 99, 19) - static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, const GimpValueArray * args, gpointer run_data) -+#else -+static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_mode, GimpImage * image, gint n_drawables, GimpDrawable ** drawables, GimpProcedureConfig *config, gpointer run_data) -+#endif - #endif - { - gegl_init(NULL, NULL); -@@ -1185,9 +1193,24 @@ static GimpValueArray * gmic_qt_run(GimpProcedure * procedure, GimpRunMode run_m - break; - case GIMP_RUN_NONINTERACTIVE: - gmic_qt_gimp_image_id = image; -+#if !GIMP_CHECK_VERSION(2, 99, 19) - pluginParameters.command = g_value_get_string(gimp_value_array_index(args, 2)); - pluginParameters.inputMode = static_cast(g_value_get_int(gimp_value_array_index(args, 0)) + (int)GmicQt::InputMode::NoInput); - pluginParameters.outputMode = static_cast(g_value_get_int(gimp_value_array_index(args, 1)) + (int)GmicQt::OutputMode::InPlace); -+#else -+ char *command; -+ int inputMode; -+ int outputMode; -+ g_object_get(config, -+ "command", &command, -+ "input", &inputMode, -+ "output", &outputMode, -+ NULL); -+ pluginParameters.command = command; -+ pluginParameters.inputMode = (GmicQt::InputMode)inputMode; -+ pluginParameters.outputMode = (GmicQt::OutputMode)outputMode; -+ g_free(command); -+#endif - GmicQt::run(GmicQt::UserInterfaceMode::Silent, // - pluginParameters, // - std::list(), // -@@ -1222,6 +1245,32 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha - "S\303\251bastien Fourey", // copyright - "2017"); // date - -+#if GIMP_CHECK_VERSION(2, 99, 19) -+ gimp_procedure_add_int_argument(procedure, -+ "input", // name -+ "input", // nick -+ "Input layers mode, when non-interactive (0=none, 1=active, 2=all, 3=active & below, 4=active & above, 5=all visibles, 6=all invisibles)", // blurb -+ 0, // min -+ 6, // max -+ 0, // default -+ G_PARAM_READWRITE); // flags -+ -+ gimp_procedure_add_int_argument(procedure, -+ "output", // name -+ "output", // nick -+ "Output mode, when non-interactive (0=in place,1=new layers,2=new active layers,3=new image)", // blurb -+ 0, // min -+ 3, // max -+ 0, // default -+ G_PARAM_READWRITE); // flags -+ -+ gimp_procedure_add_string_argument(procedure, -+ "command", // name -+ "command", // nick -+ "G'MIC command string, when non-interactive", // blurb -+ "", // default -+ G_PARAM_READWRITE); // flags -+#else - GIMP_PROC_ARG_INT(procedure, - "input", // name - "input", // nick -@@ -1246,6 +1295,7 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha - "G'MIC command string, when non-interactive", // blurb - "", // default - G_PARAM_READWRITE); // flags -+#endif - } - - return procedure; --- -2.45.2 - diff --git a/gmic.spec b/gmic.spec index 9ff2d29..a0af7d1 100644 --- a/gmic.spec +++ b/gmic.spec @@ -20,14 +20,6 @@ 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 -# Taken from https://github.com/c-koi/gmic-qt/pull/208 -#Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch -#Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch -#Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch - -# fix compilation https://github.com/GreycLab/gmic-qt/commit/41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch -#Patch4: 41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch - License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ %if %{use_system_cimg} From 8caaed1edcc9a04e55c7b794c3d4d9a08d89ecfd Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 11 Jun 2025 19:56:53 +0200 Subject: [PATCH 127/136] bump version --- gmic.spec | 7 ++++--- sources | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gmic.spec b/gmic.spec index a0af7d1..a7de12c 100644 --- a/gmic.spec +++ b/gmic.spec @@ -4,12 +4,13 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 -%global gmic_qt_version 20241231git41e86b9 -%global gmic_community_version 20250129gitf6fb9ace +%global gmic_qt_version 20250520gitb55b8ca +%global gmic_community_version 20250608git8bbd3d4a + Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.5.2 +Version: 3.5.5 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index c8a213f..cb15fd3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic_3.5.2.tar.gz) = 3d70fd93c07e4a19a8022b7e33a224b0062b95f244dd254ccdbd3ac74587e9704e6bb2e1f85975a17af1e235f40452fde0c08b2c7cb935319edd8ca12453d202 -SHA512 (zart-20231127gitd014169.tar.gz) = 4d776f87116ea857f382180d85a88bc2a9dc11e58419ab0006bbd20cd31f8f9996a27ea931d5cde0bb12f0d318f93d0f21cdfa32e6f0a34c087a9ca56445e876 -SHA512 (gmic-qt-20241231git41e86b9.tar.gz) = 5c1531bab48d72948f3bdf5a46f3b031d03386212794408752fd3fd012cf9d2bda48942c72dd3f8aeffc38368eb7883a909c78be53a770b4c0647eaf98d9e9a2 -SHA512 (gmic-community-20250129gitf6fb9ace.tar.gz) = f830d493fd1db281d7c74202b946bbdf132f0949bc4e24257be8978a4e70a1eebd0d1afe9f0efbede4de69ed0642028ea30798390b4d098abc82540aa4603d28 +SHA512 (gmic-community-20250608git8bbd3d4a.tar.gz) = 0494f8e7af13150767e705fc611956d6715e2aa5409d41ac253effa68955b673edf700b896d11ddcd1ca8787555ddc3e0cc2b6ee99d27ef33c41410ee9bc25fe +SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 +SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 +SHA512 (gmic_3.5.5.tar.gz) = df7e436e8f6c5849f31c6c039b7cd26b2565a9feb16b855f6f0246b3e0c5214179b1bda36d70d9853b7d5184f94c962039d2e9256099703776278d8c5030f649 From b0aeb284ac0ef659c51ce821c3916bf384a2c79d Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 11 Jun 2025 19:58:38 +0200 Subject: [PATCH 128/136] bump version --- changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog b/changelog index 8f8bfdd..88cb777 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* 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 From 8e06d815fe75411013e9a859095c46f823fe01f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:36:37 +0000 Subject: [PATCH 129/136] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 69ea184c1271e0a10308a65cae421124d139fa0d Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 21 Nov 2025 09:59:21 +0100 Subject: [PATCH 130/136] bump version --- gmic.spec | 5 ++--- sources | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index a7de12c..6de7356 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,12 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20250608git8bbd3d4a - +%global gmic_community_version 20251120gitea62768f Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.5.5 +Version: 3.6.3 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index cb15fd3..4b9e3c3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20250608git8bbd3d4a.tar.gz) = 0494f8e7af13150767e705fc611956d6715e2aa5409d41ac253effa68955b673edf700b896d11ddcd1ca8787555ddc3e0cc2b6ee99d27ef33c41410ee9bc25fe +SHA512 (gmic-community-20251120gitea62768f.tar.gz) = d50df4729264a36e585e12056bebb8961e9c0cf2cc114e3c252baaf2235e159f412d678d1778e38ed82e0e86fedbae7c489707e80c010bf99629ebb0529b635c SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.5.5.tar.gz) = df7e436e8f6c5849f31c6c039b7cd26b2565a9feb16b855f6f0246b3e0c5214179b1bda36d70d9853b7d5184f94c962039d2e9256099703776278d8c5030f649 +SHA512 (gmic_3.6.3.tar.gz) = 28ff0f356adec6c1736fe185049c389e405c807749c5cea3968dd388f28b451168c04bba1e726b2671f51ac57ba139ff4f13562ea92e3190eab0cf509996b068 From 71886142f63f2a1109693cb3ad07ad6692b29748 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 24 Nov 2025 19:09:06 +0100 Subject: [PATCH 131/136] bump version --- gmic.spec | 2 +- sources | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index 6de7356..893ca8a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -9,7 +9,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.3 +Version: 3.6.4 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index 4b9e3c3..33a9dc0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20251120gitea62768f.tar.gz) = d50df4729264a36e585e12056bebb8961e9c0cf2cc114e3c252baaf2235e159f412d678d1778e38ed82e0e86fedbae7c489707e80c010bf99629ebb0529b635c -SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.3.tar.gz) = 28ff0f356adec6c1736fe185049c389e405c807749c5cea3968dd388f28b451168c04bba1e726b2671f51ac57ba139ff4f13562ea92e3190eab0cf509996b068 +SHA512 (gmic_3.6.4.tar.gz) = 8774b1c93479a6c63429c1515ddfb3a55f92eeb374e7d3e7a57f3929e597b789271b9f2c33fceb0c87899c7ebb30894f46d55c1abbaaf60752588f34bb579e29 +SHA512 (gmic-community-20251121git8dd9587e.tar.gz) = da87d7e4ae3c3c08a978990e880b91da62bb81a6b96534f42b5b694e768398f23c5aebb8b194f735f5eb75b9bef2f3fb4e2ffdf1d66c31f7133717ab91aac3bc +SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 From 2fadffa6052567f1b795afcba7ddb169216621c9 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 24 Nov 2025 19:17:27 +0100 Subject: [PATCH 132/136] bump version --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 893ca8a..8863876 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,7 +5,7 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251120gitea62768f +%global gmic_community_version 20251121git8dd9587e Summary: GREYC's Magic for Image Computing Name: gmic From db77df619b091b2e9fdad91f457a9256b8283e81 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 11 Dec 2025 11:48:19 +0100 Subject: [PATCH 133/136] Rebuilt for OpenCV-4.12 From 970a112d1aa5ffbc1cf07f4b8730aa617e444856 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 18 Dec 2025 09:19:57 +0100 Subject: [PATCH 134/136] bump version --- gmic.spec | 4 ++-- sources | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index 8863876..c42e541 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,11 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251121git8dd9587e +%global gmic_community_version 20251215git882c6a2f Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.4 +Version: 3.6.5 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index 33a9dc0..8ce3b99 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.4.tar.gz) = 8774b1c93479a6c63429c1515ddfb3a55f92eeb374e7d3e7a57f3929e597b789271b9f2c33fceb0c87899c7ebb30894f46d55c1abbaaf60752588f34bb579e29 -SHA512 (gmic-community-20251121git8dd9587e.tar.gz) = da87d7e4ae3c3c08a978990e880b91da62bb81a6b96534f42b5b694e768398f23c5aebb8b194f735f5eb75b9bef2f3fb4e2ffdf1d66c31f7133717ab91aac3bc +SHA512 (gmic_3.6.5.tar.gz) = cde806bef9e4bca5b06a4306db79c50eded711fd815e310afeff916d96c85c0c9d04487f7c49f4cc2b2e03847d24b3d9c3170b0a1359cd4d0edc4416b9b91e1d +SHA512 (gmic-community-20251215git882c6a2f.tar.gz) = 9977b99ba307d009707a02bd9968549f8729bfff43b9e2ad31a6631001811cab63b0c93513b7fc2a322d13d8e40ae992927d33c6e08ecd11e75840bb2035cacd SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 From f9fe53d132bb06551aecf14e7b93315be511d4e1 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 3 Jan 2026 20:11:55 +0100 Subject: [PATCH 135/136] bump version --- gmic.spec | 4 ++-- sources | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index c42e541..c5ea896 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,11 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251215git882c6a2f +%global gmic_community_version 20251227git7e21d80b Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.5 +Version: 3.6.6 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index 8ce3b99..bae85e9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.5.tar.gz) = cde806bef9e4bca5b06a4306db79c50eded711fd815e310afeff916d96c85c0c9d04487f7c49f4cc2b2e03847d24b3d9c3170b0a1359cd4d0edc4416b9b91e1d -SHA512 (gmic-community-20251215git882c6a2f.tar.gz) = 9977b99ba307d009707a02bd9968549f8729bfff43b9e2ad31a6631001811cab63b0c93513b7fc2a322d13d8e40ae992927d33c6e08ecd11e75840bb2035cacd +SHA512 (gmic_3.6.6.tar.gz) = 500cc5f860b9e4791858f36785913871677ce125e0359693ffaaee68234ce2808ff94b1153f131042795c8888366a280430ad2647769b03c9ac2ae803b540ff9 +SHA512 (gmic-community-20251227git7e21d80b.tar.gz) = 8f472a79b609b1e6562587df77126f5fe0a2837960a34df16fe2376a7b20ac208fa094720d8c539cb23d04b1039b20b1bf3c546312fcc0cb2e666624c7adaeb6 SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 From fee4dfa995f714967bb10fdc7711505d27fb198c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 5 Jan 2026 10:46:09 -0500 Subject: [PATCH 136/136] Fix duplicate nested plugin sub-directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: rhbz#2414313 Signed-off-by: Daniel P. Berrangé --- gmic.spec | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index c5ea896..873b12a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,4 +1,4 @@ -%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins/gmic_gimp_qt +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins %global use_system_cimg 1 @@ -156,9 +156,7 @@ iconv -f iso8859-1 -t utf-8 COPYING > COPYING.conv && mv -f COPYING.conv COPYING iconv -f iso8859-1 -t utf-8 COPYING-libcgmic > COPYING-libcgmic.conv && mv -f COPYING-libcgmic.conv COPYING-libcgmic cd src -# Makefile hardcodes gimptool-2.0 for setting PLUGIN var, so -# override for gimp-3 compat until upstream fixes its rules -make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} PLUGIN=%{gimpplugindir} install +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop @@ -192,16 +190,36 @@ fi # 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}" +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 || : @@ -230,6 +248,9 @@ end %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