Accepting request 1242033 from graphics

OBS-URL: https://build.opensuse.org/request/show/1242033
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gmic?expand=0&rev=46

gmic.changes

@@ -1,3 +1,89 @@
+-------------------------------------------------------------------
+Fri Jan 31 23:56:24 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.5.2 
+  - New features:
+    - [math-core-351] Add function isfinite() that returns 0 or 1
+      whether the given argument is a finite number or not (i.e.
+      not inf nor NaN).
+    - [math-core-351] Add function isvar(varname) that returns 0 or
+      1 whether the given argument is the name of an already
+      defined variable or not.
+    - [math-core-351] Add function abscut(x,min,max,offset) that
+      returns cut(abs(x) + offset,min,max)*sign(x) (see dedicated
+      post 2 to get an idea why).
+    - [stdlib-351] Add new command matchpatch_alt, a custom
+      re-implementation of command matchpatch that is slower but
+      easier to modify for computing custom correspondence maps
+      between two images.
+  - Improvements / Modifications:
+    - [stdlib-351] Command scale2x_cnn: Implement downscaling
+      fidelity constraint, so that a downscaled version of the
+      upscaled image is closer to the input image.
+    - [stdlib-351] Command denoise_cnn: Changed the network
+      architecture to make it more controllable (add a user-defined
+      parameter for noise level estimation).
+    - [stdlib-351] Management of simultaneous neural networks has
+      been improved in the nn_lib (ML library inside G’MIC). Some
+      of the existing layers have been also improved.
+  - Bugfix:
+    - [core-353] Fix command median when size=3 and selected image
+      is a one-column vector.
+    - [math-core-351] Fix multi-threading issue when forcing the
+      evaluation of math expressions in parallel for images that
+      has less values than the number of threads (including empty
+      images).
+    - [math-core-351] Fix function v(a,b) that was always returning
+      positive random values when a or b were negative.
+    - [stdlib-351] Command display: Fix window title when
+      displaying a single image that has been generated from a math
+      expression.
+    - [packages-352] Fix DLL issue with the G’MIC-Qt for GIMP.
+
+-------------------------------------------------------------------
+Fri Jan 10 21:43:55 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Use GCC 13 on Leap 15
+
+-------------------------------------------------------------------
+Wed Jan  8 13:06:49 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- switch all the Qt gui implementations to Qt6 except for the krita
+  one, as this also still pulls KF5 libraries, not sure how well
+  mixing KF5 and QT6 would work. (boo#1218653#c14)
+
+-------------------------------------------------------------------
+Tue Jan  7 13:10:52 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- gimp3 plugin needs to be in a subdir 
+
+-------------------------------------------------------------------
+Tue Jan  7 12:57:23 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- use installation of gimp plugin by using install -D
+
+-------------------------------------------------------------------
+Tue Jan  7 12:37:26 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Fix the gimp 3 based build by using gimptool-3.0 instead of
+  gimptool-2.99
+
+-------------------------------------------------------------------
+Wed Jan  1 14:12:32 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.5.0
+  https://discuss.pixls.us/t/release-of-gmic-3-5/44490
+
+-------------------------------------------------------------------
+Tue Oct 22 13:19:18 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 3.4.3. No changelog.
+
+-------------------------------------------------------------------
+Mon Sep 23 08:39:16 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 3.4.2. No changelog.
+
 -------------------------------------------------------------------
 Fri Jun 28 07:42:52 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

gmic.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gmic
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,9 +22,9 @@
 %bcond_with    krita5
 %endif
 
-%if %{pkg_vcmp gimp >= 2.99}
+%if %{pkg_vcmp gimp >= 3}
 %define gimp_suffix 3
-%global _gimpplugindir %(gimptool-2.99 --gimpplugindir)/plug-ins/
+%global _gimpplugindir %(gimptool-3.0 --gimpplugindir)/plug-ins/gmic_gimp_qt/
 %else
 %global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins/
 %endif
@@ -40,7 +40,7 @@
 %define gmic_datadir %{_datadir}/gmic
 
 Name:           gmic
-Version:        3.4.0
+Version:        3.5.2
 Release:        0
 Summary:        GREYC's Magick for Image Computing (denoise and others)
 # gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are
@@ -63,10 +63,15 @@ BuildRequires:  krita
 #
 # /SECTION
 #
-BuildRequires:  cmake >= 3.14.0
+BuildRequires:  cmake >= 3.16.0
 BuildRequires:  dos2unix
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fftw3-threads-devel
+%if 0%{?suse_version} == 1500
+# Qt 6 requires c++-17, we'll use the latest version available on Leap 15
+BuildRequires:  gcc13-c++
+BuildRequires:  gcc13-PIE
+%endif
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
@@ -80,6 +85,12 @@ BuildRequires:  cmake(Qt5LinguistTools)
 BuildRequires:  cmake(Qt5Network)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Network)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(Qt6Xml)
 BuildRequires:  pkgconfig(OpenEXR)
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(libcurl)
@@ -87,6 +98,7 @@ BuildRequires:  pkgconfig(libheif)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(opencv4)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb-shm)
@@ -164,6 +176,10 @@ This package contains shared data files for the various gmic frontends.
 dos2unix src/gmic_libc.*
 
 %build
+%if 0%{?suse_version} == 1500
+export CC=gcc-13 CXX=g++-13
+%endif
+
 # Build gmic
 # Starting with gmic 3.1.0, the gmic dev replaced their CMake build system with a non-configurable Makefile...
 sed -i 's#LIB ?= lib#LIB ?= %{_lib}#' src/Makefile
@@ -184,20 +200,20 @@ EXTRA_CFLAGS='%{optflags}' NOSTRIP=1 %__make cli_shared %{?_smp_mflags}
 # Build gmic{_gimp|_krita}_qt
 pushd gmic-qt
 
-%cmake %{gmic_qt_options} -DGMIC_QT_HOST=none
+%cmake %{gmic_qt_options} -DGMIC_QT_HOST=none  -DBUILD_WITH_QT6=ON
 %cmake_build
 
 cd ..
 
 for hostapp in %{hostapps} ; do
-%cmake %{gmic_qt_options} -DGMIC_QT_HOST=${hostapp}
+%cmake %{gmic_qt_options} -DGMIC_QT_HOST=${hostapp}  -DBUILD_WITH_QT6=ON
 %cmake_build
 
 cd ..
 done
 
 %if %{with krita5}
-%cmake_kf5 -d plugin-build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %{gmic_qt_options} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=RelWithDebInfo
+%cmake_kf5 -d plugin-build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %{gmic_qt_options} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DBUILD_WITH_QT6=OFF
 
 %cmake_build
 
@@ -234,7 +250,7 @@ pushd gmic-qt
 install -m 0755 build/gmic_qt %{buildroot}%{_bindir}/gmic_qt
 
 # gimp plugin
-install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt
+install -D -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt
 popd
 
 %ldconfig_scriptlets -n libgmic3

gmic_3.4.0.tar.gz

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

gmic_3.5.2.tar.gz

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