diff --git a/darktable-4.0.1.tar.xz b/darktable-4.0.1.tar.xz deleted file mode 100644 index 8695f4d..0000000 --- a/darktable-4.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fef81e0c0079977a3cdc3627eed777280c2346d023c5d176c1f4a62cbe51d68 -size 5958392 diff --git a/darktable-4.0.1.tar.xz.asc b/darktable-4.0.1.tar.xz.asc deleted file mode 100644 index 1791f1c..0000000 --- a/darktable-4.0.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYx7angAKCRAY3KEj+Um9 -OwdVAJ42RRyqHdKK7kYGp5Z99g/ddTIo9ACcDX4kaw8/Qjdyk0jf2Hw/0xS/8HI= -=+v39 ------END PGP SIGNATURE----- diff --git a/darktable-4.2.0.tar.xz b/darktable-4.2.0.tar.xz new file mode 100644 index 0000000..0a8e11c --- /dev/null +++ b/darktable-4.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9 +size 5862080 diff --git a/darktable-4.2.0.tar.xz.asc b/darktable-4.2.0.tar.xz.asc new file mode 100644 index 0000000..64bbb07 --- /dev/null +++ b/darktable-4.2.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCY5nqpAAKCRAY3KEj+Um9 +O6frAJ0cY1zctb8bl5aulpiF8PQzgZ3GZgCgv9+XpDEvl2FOg84rMKQm+Pcv0/U= +=FTgc +-----END PGP SIGNATURE----- diff --git a/darktable.changes b/darktable.changes index 4eadf87..72f325e 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Dec 22 14:14:41 UTC 2022 - Marcus Rueckert + +- Switch rpmbuild from GraphicsMagick to ImageMagick + +------------------------------------------------------------------- +Wed Dec 21 12:24:28 UTC 2022 - Andreas Schneider + +- Update to version 4.2.0 + https://github.com/darktable-org/darktable/releases/tag/release-4.2.0 +- New BuildRequires: + pkgconfig(libheif) + pkgconfig(libjxl) + pkgconfig(tinfo) + ------------------------------------------------------------------- Mon Sep 12 07:56:36 UTC 2022 - Andreas Schneider @@ -49,7 +64,7 @@ Mon Jan 3 07:38:51 UTC 2022 - Andreas Schneider ------------------------------------------------------------------- Fri Dec 31 23:23:43 UTC 2021 - Marcus Rueckert -- add SDL2 BR +- add SDL2 BR ------------------------------------------------------------------- Fri Dec 24 21:47:56 UTC 2021 - Andreas Schneider diff --git a/darktable.dsc b/darktable.dsc index 48ab244..aad3651 100644 --- a/darktable.dsc +++ b/darktable.dsc @@ -4,10 +4,10 @@ Section: graphics Priority: optional Binary: darktable darktable-tools-basecurve darktable-tools-noise Architecture: any-amd64 any-arm64 -Version: 4.0.1-1.1 +Version: 4.2.0-1.1 Homepage: http://www.darktable.org/ -# libavif-dev (>= 0.8.2), -Build-Depends: cmake, +# libavif-dev (>= 0.9.1), +Build-Depends: cmake (>= 3.18), debhelper (>= 10), intltool, iso-codes, @@ -25,7 +25,7 @@ Build-Depends: cmake, libgmic-dev, libgphoto2-dev, libgraphicsmagick1-dev, - libgtk-3-dev (>= 3.22), + libgtk-3-dev (>= 3.24.5), libheif-dev, libjpeg-dev, libjson-glib-dev, @@ -44,8 +44,10 @@ Build-Depends: cmake, libsoup2.4-dev, libsqlite3-dev, libtiff-dev, + libtinfo-dev, libwebp-dev, xsltproc Standards-Version: 3.9.8 Package-List: darktable deb graphics optional arch=any-amd64,any-arm64 +DEBTRANSFORM-RELEASE: 1 diff --git a/darktable.spec b/darktable.spec index ace8bd9..ed064cf 100644 --- a/darktable.spec +++ b/darktable.spec @@ -36,12 +36,6 @@ %bcond_with cmake_macros %endif -%if 0%{?suse_version} || 0%{?fedora} -%bcond_without cmake_macros -%else -%bcond_with cmake_macros -%endif - %if 0%{?is_opensuse} || 0%{?fedora} %bcond_without osmgpsmap %bcond_without flickcurl @@ -58,12 +52,24 @@ %bcond_with avif %endif +%if 0%{?suse_version} >= 1550 || 0%{?fedora} >= 37 +%bcond_without jxl +%else +%bcond_with jxl +%endif + %if 0%{?suse_version} >= 1550 %bcond_without gmic %else %bcond_with gmic %endif +%if 0%{?suse_version} +%bcond_without libheif +%else +%bcond_with libheif +%endif + %ifarch ppc64le # The OpenCL kernels don't compile on ppc64le and if you get # them compiled there are funny runtime issues. @@ -103,10 +109,10 @@ %endif Name: darktable -Version: 4.0.1 +Version: 4.2.0 Release: 0 -%define pkg_name darktable -%define pkg_version %{version} +%global pkg_name darktable +%global pkg_version %{version} URL: http://www.darktable.org/ Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{pkg_name}-%{version}.tar.xz Source1: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{pkg_name}-%{version}.tar.xz.asc @@ -121,7 +127,7 @@ Patch0: darktable-old-glib.patch ExclusiveArch: x86_64 aarch64 ppc64le # build time tools BuildRequires: clang -BuildRequires: cmake >= 3.4 +BuildRequires: cmake >= 3.18 BuildRequires: fdupes BuildRequires: llvm-devel %if 0%{?fedora} @@ -158,7 +164,7 @@ BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pugixml) # BuildRequires: pkgconfig -BuildRequires: pkgconfig(GraphicsMagick) +BuildRequires: pkgconfig(ImageMagick) BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(colord) @@ -171,13 +177,19 @@ BuildRequires: pkgconfig(flickcurl) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.5 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(lensfun) +BuildRequires: pkgconfig(lensfun) >= 0.3.2 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgphoto2) +%if %{with libheif} +BuildRequires: pkgconfig(libheif) +%endif +%if %{with jxl} +BuildRequires: pkgconfig(libjxl) >= 0.7.0 +%endif BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libwebp) @@ -187,6 +199,7 @@ BuildRequires: pkgconfig(osmgpsmap-1.0) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(tinfo) %if %{with opencl} BuildRequires: opencl-headers %endif @@ -199,7 +212,7 @@ BuildRequires: gmic-devel # /gmic %endif %if %{with avif} -BuildRequires: libavif-devel +BuildRequires: libavif-devel >= 0.9.0 %endif BuildRequires: portmidi-devel diff --git a/debian.tar.xz b/debian.tar.xz index ebeabe0..90f0037 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c815c9f2c06096f750fef3132ad40605ba2d1d8c17b4fd7bea4533ec0912503b -size 21432 +oid sha256:a33c5e41c96f61aeb2be74fc69b82dd5fb170961c586c6bbcb87755d2442b8ee +size 21504