diff --git a/10678.patch b/10678.patch new file mode 100644 index 0000000..0dc3927 --- /dev/null +++ b/10678.patch @@ -0,0 +1,23 @@ +From 8c89be79f64883e4551db5aa51726b21a62a07e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Fri, 24 Dec 2021 15:42:17 -0500 +Subject: [PATCH] __DT_CLONE_TARGETS__ was undefined on aarch64 + +- it's probably broken on armv7 too and other non intel arch +--- + src/common/darktable.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/darktable.h b/src/common/darktable.h +index b841bf2bc15..aad6169f8b6 100644 +--- a/src/common/darktable.h ++++ b/src/common/darktable.h +@@ -133,6 +133,8 @@ typedef unsigned int u_int; + # elif defined(__PPC64__) + /* __PPC64__ is the only macro tested for in is_supported_platform.h, other macros would fail there anyway. */ + #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default","cpu=power9"))) ++# else ++#define __DT_CLONE_TARGETS__ + # endif + #else + #define __DT_CLONE_TARGETS__ diff --git a/darktable-3.6.1.tar.xz b/darktable-3.6.1.tar.xz deleted file mode 100644 index 2496533..0000000 --- a/darktable-3.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2bfc7c103b824945457a9bfed9e52f007fa1d030f9dbcb3ff0327851be42d14 -size 4685928 diff --git a/darktable-3.6.1.tar.xz.asc b/darktable-3.6.1.tar.xz.asc deleted file mode 100644 index a2532fd..0000000 --- a/darktable-3.6.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYTr7fQAKCRAY3KEj+Um9 -O0rTAJ9G38Sqqw/eNQ/9vVdNQEcgzDRP5gCeMTkG+hcuYNxt50etxFra4hIbYxw= -=UPZs ------END PGP SIGNATURE----- diff --git a/darktable-3.8.0.tar.xz b/darktable-3.8.0.tar.xz new file mode 100644 index 0000000..0bda8cd --- /dev/null +++ b/darktable-3.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e65c7c78d074ad218e3ef7a8c3051a8ea78f4a0406386667859645e5e4bf705 +size 5415532 diff --git a/darktable-3.8.0.tar.xz.asc b/darktable-3.8.0.tar.xz.asc new file mode 100644 index 0000000..dc9adb6 --- /dev/null +++ b/darktable-3.8.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iFwEABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYbpM+gAKCRAY3KEj+Um9 +O8oHAJjfRXGnap50pWJ4ChmtStRLzNewAJ9D/qkTldFMJl8RnwLfAiO8eJe3pg== +=3PCZ +-----END PGP SIGNATURE----- diff --git a/darktable-lua-api.pdf b/darktable-lua-api.pdf deleted file mode 100644 index c128215..0000000 --- a/darktable-lua-api.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90dc93e0e404f237fcf687c61459001e9e810da9c56fceeb193edb8568448525 -size 752600 diff --git a/darktable.changes b/darktable.changes index 4ac8f26..37f41ca 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sat Jan 8 15:46:14 UTC 2022 - Marcus Rueckert + +- Fix the previous change: + bcond_* is hard + +------------------------------------------------------------------- +Mon Jan 3 07:38:51 UTC 2022 - Andreas Schneider + +- Build with intree lua for openSUSE Leap versions + +------------------------------------------------------------------- +Fri Dec 31 23:23:43 UTC 2021 - Marcus Rueckert + +- add SDL2 BR + +------------------------------------------------------------------- +Fri Dec 24 21:47:56 UTC 2021 - Andreas Schneider + +- Add https://github.com/darktable-org/darktable/pull/10678.patch + to fix build on aarch64 + +------------------------------------------------------------------- +Fri Dec 24 17:10:20 UTC 2021 - Andreas Schneider + +- Update to version 3.8.0 + https://www.darktable.org/2021/12/darktable-3.8.0-released/ + https://www.darktable.org/2021/12/darktable-3-8/ +- drop the darktable-docs package with the pdf docs + get them from https://www.darktable.org/resources/ + ------------------------------------------------------------------- Fri Sep 10 21:57:34 UTC 2021 - Andreas Schneider diff --git a/darktable.dsc b/darktable.dsc index 5de3110..3e6ce2a 100644 --- a/darktable.dsc +++ b/darktable.dsc @@ -4,8 +4,9 @@ Section: graphics Priority: optional Binary: darktable darktable-tools-basecurve darktable-tools-noise Architecture: any-amd64 any-arm64 -Version: 3.6.0-1.1 +Version: 3.8.0-1.1 Homepage: http://www.darktable.org/ +# libavif-dev (>= 0.8.2), Build-Depends: cmake, debhelper (>= 10), intltool, @@ -18,21 +19,27 @@ Build-Depends: cmake, libexiv2-dev, libflickcurl-dev, libglib2.0-dev, + clang (>= 10), + libclang-dev (>= 10), + llvm-dev (>= 10), libgmic-dev, libgphoto2-dev, libgraphicsmagick1-dev, libgtk-3-dev (>= 3.22), + libheif-dev, libjpeg-dev, libjson-glib-dev, liblcms2-dev, liblensfun-dev, - liblua5.3-dev, + liblua5.4-dev | liblua5.3-dev, libopenexr-dev, libopenjp2-7-dev, libosmgpsmap-1.0-dev, libpng-dev, + libportmidi-dev, libpugixml-dev, librsvg2-dev, + libsdl2-dev, libsecret-1-dev, libsoup2.4-dev, libsqlite3-dev, diff --git a/darktable.spec b/darktable.spec index 1240fa4..be24183 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,7 +1,7 @@ # # spec file for package darktable # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %bcond_with clang -%if 0%{?fedora_version} >= 33 -%bcond_without use_intree_lua -%else +%if 0%{?fedora_version} >= 33 || 0%{?suse_version} >= 1590 %bcond_with use_intree_lua +%else +%bcond_without use_intree_lua %endif %if %{with use_intree_lua} @@ -99,11 +99,11 @@ %endif %if 0%{?suse_version} && 0%{?suse_version} < 1550 -%define force_gcc_version 7 +%global force_gcc_version 7 %endif Name: darktable -Version: 3.6.1 +Version: 3.8.0 Release: 0 %define pkg_name darktable %define pkg_version %{version} @@ -112,15 +112,12 @@ Source0: https://github.com/darktable-org/darktable/releases/download/rel Source1: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{pkg_name}-%{version}.tar.xz.asc Source2: %{pkg_name}-rpmlintrc # -Source10: https://darktable-org.github.io/dtdocs/darktable_user_manual.pdf -# This is not online yet? -Source14: darktable-lua-api.pdf -# Source97: darktable.dsc Source98: debian.tar.xz Source99: README.openSUSE # Patch0: darktable-old-glib.patch +Patch1: https://github.com/darktable-org/darktable/pull/10678.patch # ExclusiveArch: x86_64 aarch64 ppc64le # build time tools @@ -155,7 +152,7 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) # %if 0%{?suse_version} >= 1550 -BuildRequires: pkgconfig(lua5.3) +BuildRequires: pkgconfig(lua5.4) %else BuildRequires: pkgconfig(lua) %endif @@ -193,6 +190,7 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(osmgpsmap-1.0) %endif BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sqlite3) %if %{with opencl} BuildRequires: opencl-headers @@ -208,6 +206,7 @@ BuildRequires: gmic-devel %if %{with avif} BuildRequires: libavif-devel %endif +BuildRequires: portmidi-devel # for the sake of simplicity we do not enforce the version here # the package is small enough that installing it doesnt hurt @@ -224,6 +223,7 @@ Recommends: google-roboto-fonts Summary: A virtual Lighttable and Darkroom License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers +Obsoletes: darktable-docs < %{version}-%{release} %description darktable is a virtual lighttable and darkroom for photographers: it manages @@ -260,18 +260,6 @@ lighttable. It also enables developing raw images and enhance them. This package provides the noise profiling tools to add support for new cameras. -%package doc -Summary: Documentation for Darktable -Group: Documentation/Other -BuildArch: noarch - -%description doc -darktable is a virtual lighttable and darkroom for photographers: it manages -digital negatives in a database and can show them through a zoomable -lighttable. It also enables developing raw images and enhance them. - -This package provides the user manual in PDF format. - %prep %autosetup -p1 -n %{pkg_name}-%{version} @@ -281,8 +269,8 @@ cp %{SOURCE99} . rm -rf src/external/CL src/external/OpenCL sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt -# Remove bundled lua %if %{without use_intree_lua} +# Remove bundled lua rm -rf src/external/lua/ %endif @@ -358,8 +346,6 @@ make %{_smp_mflags} VERBOSE=1 %find_lang darktable -cp -av %{SOURCE10} %{SOURCE14} \ - %{buildroot}%{_defaultdocdir}/%{pkg_name} rm %{buildroot}%{_defaultdocdir}/%{pkg_name}/LICENSE %fdupes %{buildroot}/%{_prefix} @@ -382,7 +368,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>/dev/null || : %files -f darktable.lang %doc %{_defaultdocdir}/%{pkg_name} %license LICENSE -%exclude %{_defaultdocdir}/%{pkg_name}/*.pdf %exclude %{_defaultdocdir}/%{pkg_name}/README.tools.basecurve.md %{_bindir}/darktable %if %{with opencl} @@ -419,7 +404,4 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>/dev/null || : %{_libexecdir}/darktable/tools/profiling-shot.xmp %{_libexecdir}/darktable/tools/subr.sh -%files doc -%{_defaultdocdir}/%{pkg_name}/*.pdf - %changelog diff --git a/darktable_user_manual.pdf b/darktable_user_manual.pdf deleted file mode 100644 index daa6b47..0000000 --- a/darktable_user_manual.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6a55e7ac3e3b59e58841cd8ef4b5a301be2f6025220a7ec8809385c683c6483 -size 34294054 diff --git a/debian.tar.xz b/debian.tar.xz index a05f40a..86054e1 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5acfe3f8d2a3f72e37044e197e8dc4712898d64001721c04ce55fe5f4325a7e7 -size 21156 +oid sha256:ad0181965f198b6142f0cac03998aa2a5a91aa17b6d53ec47ac87551c6b092eb +size 21472