diff --git a/darktable-3.2.1.tar.xz b/darktable-3.2.1.tar.xz deleted file mode 100644 index 8fcd40c..0000000 --- a/darktable-3.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e3683ea88dc0a0271be7eca4fd594b9e46b1b7194847825a8d0a0c12bdeb90c -size 3920728 diff --git a/darktable-3.2.1.tar.xz.asc b/darktable-3.2.1.tar.xz.asc deleted file mode 100644 index 032e50d..0000000 --- a/darktable-3.2.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCXylMSAAKCRAY3KEj+Um9 -O51oAKCIQJeL7fzS008SlNNEn5NasPADxQCgjwfm8smzFj5yNtYfTL5xwdgzxbM= -=ol4n ------END PGP SIGNATURE----- diff --git a/darktable-3.4.0.tar.xz b/darktable-3.4.0.tar.xz new file mode 100644 index 0000000..7ae6f26 --- /dev/null +++ b/darktable-3.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda +size 4444452 diff --git a/darktable-3.4.0.tar.xz.asc b/darktable-3.4.0.tar.xz.asc new file mode 100644 index 0000000..dec8c67 --- /dev/null +++ b/darktable-3.4.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCX9nFjQAKCRAY3KEj+Um9 +O/6iAKDbj09ZzfWf6cj7n93r97ot135HWACgqriBVHB6P0iWvVGq2L/CrEO8BYA= +=qa5M +-----END PGP SIGNATURE----- diff --git a/darktable-lua-api.pdf b/darktable-lua-api.pdf index cf5a38d..c128215 100644 --- a/darktable-lua-api.pdf +++ b/darktable-lua-api.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:066edc484086d594b91794e96382cd743888a2271da83f7e714fa8f9786c9f11 -size 634842 +oid sha256:90dc93e0e404f237fcf687c61459001e9e810da9c56fceeb193edb8568448525 +size 752600 diff --git a/darktable-rpmlintrc b/darktable-rpmlintrc new file mode 100644 index 0000000..9f50398 --- /dev/null +++ b/darktable-rpmlintrc @@ -0,0 +1,4 @@ +# The OpenCL Kernel get compiled during darktable startup by the graphics +# driver and are then cached. Those kernel require header files which need to +# be part of the runtime. +addFilter("devel-file-in-non-devel-package") diff --git a/darktable-usermanual-de.pdf b/darktable-usermanual-de.pdf index d14cc61..555a5e4 100644 --- a/darktable-usermanual-de.pdf +++ b/darktable-usermanual-de.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca1405f56cdff29dbca860fd031b02d1b3bcc9dabe1604b44ac16a80bcd75e64 -size 16307772 +oid sha256:fee58bd23441f9a5f8b7b5028caeedf169cf8819c231608bb3b14dfdae7d8b93 +size 16309424 diff --git a/darktable-usermanual-fr.pdf b/darktable-usermanual-fr.pdf index f3e439e..204564e 100644 --- a/darktable-usermanual-fr.pdf +++ b/darktable-usermanual-fr.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b9fddcdd9244456d391f798ec5c27a57e2f34e3eb4ea2ef9bcf110e4f4a06a0 -size 16358723 +oid sha256:7e25bafd98847a2a4c941936480684daa1102cb185682294b73ea0e7c565ddc7 +size 16370984 diff --git a/darktable-usermanual-it.pdf b/darktable-usermanual-it.pdf index d99876b..3fa9cad 100644 --- a/darktable-usermanual-it.pdf +++ b/darktable-usermanual-it.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e4bab204afcb77be5ebe844e114e513b308213b3c5647b634c78b35e5d05048 -size 16300682 +oid sha256:59ed50056b933439a48bc77af6b6eacfb957e4d426f303cb79a76f16362434e4 +size 16303184 diff --git a/darktable-usermanual.pdf b/darktable-usermanual.pdf index 18b0c9a..cf88cf0 100644 --- a/darktable-usermanual.pdf +++ b/darktable-usermanual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fb8793308f36e79c8b99944676e62a0fde88f7030f26dca8936d0577f56f5d2 -size 16237603 +oid sha256:4cf3a52b2abf5634d9f14f560f86545fe5239333992c40cc93ad226767d22263 +size 16241791 diff --git a/darktable.changes b/darktable.changes index 82a3740..217dbc4 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Dec 24 08:00:00 UTC 2020 - Andreas Schneider + +- Update to version 3.4.0 + * https://github.com/darktable-org/darktable/releases/tag/release-3.4.0 + +------------------------------------------------------------------- +Mon Dec 21 14:43:52 UTC 2020 - Andreas Schneider + +- Use URL for source tarball and signature +- Added darktable-rpmlintrc +- Added missing lua-api pdf +- Removed trailing spaces from changes file +- Fixed building on Fedora + ------------------------------------------------------------------- Tue Aug 11 10:19:56 UTC 2020 - Paolo Stivanin @@ -22,7 +37,7 @@ Tue Aug 11 10:19:56 UTC 2020 - Paolo Stivanin ------------------------------------------------------------------- Wed Apr 29 14:19:58 UTC 2020 - Paolo Stivanin -- Update dsc file and debian archive +- Update dsc file and debian archive ------------------------------------------------------------------- Tue Apr 21 06:53:31 UTC 2020 - Paolo Stivanin @@ -2863,7 +2878,7 @@ Mon Mar 2 00:12:25 UTC 2015 - toganm@opensuse.org * noise profiles: + Canon EOS 1DX - + ------------------------------------------------------------------- Sun Feb 1 20:36:46 UTC 2015 - toganm@opensuse.org @@ -2875,7 +2890,7 @@ Sun Feb 1 20:36:46 UTC 2015 - toganm@opensuse.org + Local gallery export limited to useful web formats (JPEG/PNG/WebP) + Add a way to control the brush size with keys - + Default X-Trans Demosaic to markesteijn (single pass) + + Default X-Trans Demosaic to markesteijn (single pass) * Bugfixes: + Fix IPTC Keyword reading for real @@ -2909,7 +2924,7 @@ Sat Jan 10 13:38:45 UTC 2015 - toganm@opensuse.org - Update to version 1.6.1 * this is a point release which fixes a couple of minor issues in the recent feature release 1.6.0 (such as a crash with images - greater than 134 megapixels). + greater than 134 megapixels). ------------------------------------------------------------------- Mon Dec 8 09:26:05 UTC 2014 - toganm@opensuse.org @@ -3004,14 +3019,14 @@ Sat Apr 26 15:19:33 UTC 2014 - fcrozat@suse.com + Fix potential format string attacks via .po files + Add $(TITLE) to export variables + opencl: fix border handling in lens correction module - + Experimental support and matrix for samsung nx30, nx1100, + + Experimental support and matrix for samsung nx30, nx1100, Olympus E-M10, Canon 1200d, Nikon D3300, D5300 + Fix memory bugs spotted by Coverity + Various crash fixes + Update amaze code (SSE2 code) + Set lt position when changing image in dr with keys + Tonecurve: fix serious logical flaw. - + Colorout: map shortkeys of gamut check/softproof to + + Colorout: map shortkeys of gamut check/softproof to ctrl-g/ctrl-s + Fix crash when exporting to Picasa. + Noise profile: panasonic dmc-lx7 @@ -3023,7 +3038,7 @@ Sat Apr 26 15:19:33 UTC 2014 - fcrozat@suse.com ------------------------------------------------------------------- Sun Feb 9 12:59:09 UTC 2014 - toganm@opensuse.org -- update to version 1.4.1 +- update to version 1.4.1 * export: consistent names for output formats * export to disk: overwrite file option @@ -3055,7 +3070,7 @@ Sun Feb 9 12:59:09 UTC 2014 - toganm@opensuse.org that. -- Added pkgconfig(xandr) to build requires +- Added pkgconfig(xandr) to build requires ------------------------------------------------------------------- Wed Jan 1 11:54:39 UTC 2014 - adrian@suse.de @@ -3067,7 +3082,7 @@ Wed Jan 1 11:54:39 UTC 2014 - adrian@suse.de ------------------------------------------------------------------- Mon Dec 16 18:49:50 UTC 2013 - toganm@opensuse.org -- Fixes #bnc855442 +- Fixes #bnc855442 * added patches: - 0001-Fix-9720-Don-t-crash-when-kwallet-is-not-running.patch ------------------------------------------------------------------- @@ -3102,14 +3117,14 @@ Sun Dec 1 19:32:52 UTC 2013 - toganm@opensuse.org can now evaluate mathematical expressions * many bug fixes and small improvements * a tool for measuring basecurves from a sample image - + - Remove backported 0001-Allow-compilation-with-colord-and-without-squish.patch ------------------------------------------------------------------- Sun Nov 24 17:40:52 UTC 2013 - toganm@opensuse.org - Backported patch for colord compilation without squish - 0001-Allow-compilation-with-colord-and-without-squish.patch + 0001-Allow-compilation-with-colord-and-without-squish.patch ------------------------------------------------------------------- Tue Sep 10 19:28:34 UTC 2013 - toganm@opensuse.org @@ -3169,7 +3184,7 @@ Tue Sep 10 19:28:34 UTC 2013 - toganm@opensuse.org + Update Picasa uploader: references Google+ now + Some fixes for memory leaks, deadlocks, background jobs + Fixes of on-screen handles for Crop&Rotate and GND modules - + 0 bytes files will no longer be imported but ignored + + 0 bytes files will no longer be imported but ignored ------------------------------------------------------------------- Tue Jun 25 13:53:52 UTC 2013 - toganm@opensuse.org @@ -3216,8 +3231,8 @@ Tue Jun 25 13:53:52 UTC 2013 - toganm@opensuse.org + libsquish compilation now optional + dr: deactivate interpolation at 200% zoom -* Removed backported patches: - 0001-thumbnail-compression-make-libsquish-optional +* Removed backported patches: + 0001-thumbnail-compression-make-libsquish-optional 0001-fixed-error-handling-for-broken-full-color-images.patch ------------------------------------------------------------------- @@ -3226,19 +3241,19 @@ Thu Jun 20 12:52:15 UTC 2013 - toganm@opensuse.org - Remove patented code from the source via generate--tarball.sh bnc#824484 * added backported patch from git master - 0001-thumbnail-compression-make-libsquish-optional + 0001-thumbnail-compression-make-libsquish-optional * Remove pkgconfig(colord) from Build Requires Because compression code is disabled previous cache will not work. Removing ~/.cache/darktable/mipmaps is necessary - + ------------------------------------------------------------------- Mon Jun 10 13:07:02 UTC 2013 - toganm@opensuse.org -- added backported patch from git master +- added backported patch from git master 0001-fixed-error-handling-for-broken-full-color-images.patch fixes bnc#823114 - + ------------------------------------------------------------------- Sun May 26 12:24:17 UTC 2013 - toganm@opensuse.org @@ -3296,7 +3311,7 @@ Sun May 26 12:24:17 UTC 2013 - toganm@opensuse.org + Option for thumbnail cache now specified in MB + Updated purge_non_existing_images.sh script + CLI option -d nan gives per-module output of NaN values - + Some minor renamings, typo fixings... + + Some minor renamings, typo fixings... - Drop 0001--OpenEXR-2.0-fixes.patch since fixed upstream @@ -3310,7 +3325,7 @@ Fri Apr 26 17:55:55 UTC 2013 - mrueckert@suse.de Tue Apr 23 23:20:01 UTC 2013 - toganm@opensuse.org - Fix factory build with OpenEXR-2.0 - added 0001-OpenEXR-2.0-fixes.patch + added 0001-OpenEXR-2.0-fixes.patch ------------------------------------------------------------------- Sat Apr 6 16:31:09 UTC 2013 - toganm@opensuse.org @@ -3318,7 +3333,7 @@ Sat Apr 6 16:31:09 UTC 2013 - toganm@opensuse.org - Update to release 1.2 - removed darktable-1.2.x_update_to_4b856e6ec99035d5a1041db73e2339000d395aa0.patch - as it is now included. + as it is now included. - When possible use pkgconfig hence: instead of libopenjgeg-devel used pkgconfig(libopenjpeg) instead of GraphicsMagick-devel used pkgconfig(GraphicsMagick) @@ -3458,8 +3473,8 @@ Sun Mar 10 18:15:03 UTC 2013 - toganm@opensuse.org * Olympus E-M5 enhanced matrix with help from Frederic Crozat * ICC profile handling: catch certain mal-formatted profiles -- Added 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch -- Remove 0001-Olympus-E-M5-enhanced-matrix.patch as it's upstreamed +- Added 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch +- Remove 0001-Olympus-E-M5-enhanced-matrix.patch as it's upstreamed ------------------------------------------------------------------- Sun Feb 10 18:19:50 UTC 2013 - fcrozat@suse.com @@ -3557,7 +3572,7 @@ Sun Jan 13 13:48:32 UTC 2013 - toganm@opensuse.org - sony nex c3 - sony slt a57 - sony nex 5n - - panasonic dmc-gh3 + - panasonic dmc-gh3 ------------------------------------------------------------------- Sun Dec 9 23:38:02 UTC 2012 - toganm@opensuse.org @@ -3592,9 +3607,9 @@ Sun Dec 9 23:38:02 UTC 2012 - toganm@opensuse.org * lots of updates for the usermanual (make sure you download a new copy) -- Subpackage the user manual -- enable darktable-viewer by adding sdl to buildrequires - +- Subpackage the user manual +- enable darktable-viewer by adding sdl to buildrequires + ------------------------------------------------------------------- Tue Nov 27 07:56:26 UTC 2012 - toganm@opensuse.org @@ -3652,7 +3667,7 @@ Tue Nov 27 07:56:26 UTC 2012 - toganm@opensuse.org * Remove backported patches as they are part of the package now + rsvg_cairo.patch + update-curves.patch - * provide tool to work with database cleanup + * provide tool to work with database cleanup purge_non_existing_images.sh (placed in documentation directory) * where possible use pkgconfig variables for buildrequires diff --git a/darktable.dsc b/darktable.dsc index 3972bb9..c34f97c 100644 --- a/darktable.dsc +++ b/darktable.dsc @@ -4,7 +4,7 @@ Section: graphics Priority: optional Binary: darktable darktable-tools-basecurve darktable-tools-noise Architecture: any-amd64 any-arm64 -Version: 3.2.1-1.1 +Version: 3.4.0-1.1 Homepage: http://www.darktable.org/ Build-Depends: cmake, debhelper (>= 10), diff --git a/darktable.spec b/darktable.spec index 52e74b5..dbb6e9c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -18,6 +18,12 @@ %bcond_with clang +%if 0%{?suse_version} || 0%{?fedora_version} >= 33 +%bcond_without cmake_macros +%else +%bcond_with cmake_macros +%endif + %if 0%{?is_opensuse} || 0%{?fedora_version} >= 26 %bcond_without osmgpsmap %bcond_without flickcurl @@ -28,6 +34,18 @@ %bcond_with translated_manpages %endif +%if 0%{?suse_version} >= 1550 || 0%{?fedora_version} >= 33 +%bcond_without avif +%else +%bcond_with avif +%endif + +%if 0%{?suse_version} >= 1550 +%bcond_without gmic +%else +%bcond_with gmic +%endif + %ifarch ppc64le # The OpenCL kernels don't compile on ppc64le and if you get # them compiled there are funny runtime issues. @@ -50,27 +68,44 @@ %global _use_opencl "OFF" %endif +%if %{with gmic} +%global _use_gmic "ON" +%else +%global _use_gmic "OFF" +%endif + +%if %{with avif} +%global _use_avif "ON" +%else +%global _use_avif "OFF" +%endif + %if 0%{?suse_version} && 0%{?suse_version} < 1550 %define force_gcc_version 7 %endif Name: darktable -Version: 3.2.1 +Version: 3.4.0 Release: 0 %define pkg_name darktable -%define pkg_version 3.2.1 +%define pkg_version %{version} URL: http://www.darktable.org/ -Source0: %{pkg_name}-%{pkg_version}.tar.xz -Source1: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual.pdf -Source2: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-de.pdf -Source3: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-it.pdf -Source4: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-fr.pdf -Source5: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-lua-api.pdf -Source96: %{pkg_name}-%{pkg_version}.tar.xz.asc +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 +Source2: %{pkg_name}-rpmlintrc +# +Source10: https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf +Source11: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-de.pdf +Source12: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-it.pdf +Source13: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-fr.pdf +# This is not online yet? +Source14: darktable-lua-api.pdf +# Source97: darktable.dsc Source98: debian.tar.xz Source99: README.openSUSE -Patch: darktable-old-glib.patch +# +Patch0: darktable-old-glib.patch ExclusiveArch: x86_64 aarch64 ppc64le # build time tools @@ -139,6 +174,18 @@ BuildRequires: pkgconfig(sqlite3) %if %{with opencl} BuildRequires: opencl-headers %endif +%if %{with gmic} +%if 0%{?is_opensuse} +BuildRequires: libgmic-devel +%else +BuildRequires: gmic-devel +%endif +# /gmic +%endif +%if %{with avif} +BuildRequires: libavif-devel +%endif + # for the sake of simplicity we do not enforce the version here # the package is small enough that installing it doesnt hurt Requires: iso-codes @@ -205,8 +252,8 @@ This package provides the user manual in PDF format. %prep %autosetup -p1 -n %{pkg_name}-%{version} -cp %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} . -cp %{S:99} . +cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} . +cp %{SOURCE99} . # Remove bundled OpenCL headers. rm -rf src/external/CL src/external/OpenCL @@ -216,7 +263,7 @@ sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt rm -rf src/external/lua/ %build -%define cmake_options \\\ +%global cmake_options \\\ -DCMAKE_INSTALL_LIBDIR=%{_lib} \\\ -DCMAKE_SKIP_RPATH:BOOL=OFF \\\ -DCMAKE_INSTALL_DATAROOTDIR="share" \\\ @@ -226,6 +273,8 @@ rm -rf src/external/lua/ -DRAWSPEED_ENABLE_LTO=ON \\\ -DUSE_OPENCL="%{_use_opencl}" \\\ -DUSE_OPENMP="%{_use_openmp}" \\\ + -DUSE_GMIC="%{_use_gmic}" \\\ + -DUSE_AVIF="%{_use_avif}" \\\ -DBUILD_NOISE_TOOLS=ON \\\ -DBUILD_CURVE_TOOLS=ON @@ -238,7 +287,8 @@ export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" %endif export _OPENCL_INCLUDE_DIR=$(clang -print-search-dirs | awk -F= '/^libra/ {print $2}' | awk -F: '{print $1 "/include"}') -%if 0%{?suse_version} + +%if %{with cmake_macros} #suse branch %cmake \ -DCLANG_OPENCL_INCLUDE_DIR=${_OPENCL_INCLUDE_DIR} \ @@ -247,9 +297,11 @@ export _OPENCL_INCLUDE_DIR=$(clang -print-search-dirs | awk -F= '/^libra/ {print -DTESTBUILD_OPENCL_PROGRAMS=OFF \ %endif %{cmake_options} \ +%if "%{optimization_architecture}" == "asan" + -DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" -DCMAKE_SHARED_LINKER_FLAGS="" -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ +%endif || cat CMakeFiles/CMakeError.log %cmake_build - #/ suse branch %else #fedora branch @@ -263,14 +315,17 @@ pushd %{_target_platform} %{cmake_options} .. make %{_smp_mflags} VERBOSE=1 +#/ with cmake_macros %endif %install -%if 0%{?suse_version} -# suse branch +%if %{with cmake_macros} %cmake_install + +%if 0%{?suse_version} %suse_update_desktop_file darktable -#/ suse branch +%endif +#/ cmake macros branch %else # fedora branch %make_install -C %{_target_platform} @@ -279,7 +334,7 @@ make %{_smp_mflags} VERBOSE=1 %find_lang darktable -cp -av %{S:1} %{S:2} %{S:3} %{S:4} doc/TODO \ +cp -av %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} doc/TODO \ %{buildroot}%{_defaultdocdir}/%{pkg_name} rm %{buildroot}%{_defaultdocdir}/%{pkg_name}/LICENSE diff --git a/debian.tar.xz b/debian.tar.xz index dea86c6..4da2911 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f438226627246eb196f77cd470e31836c6c27447d92f49afb3f5187d66bc264 -size 21112 +oid sha256:eaa802fa6565454ca75968ee5834ea4edacc88a17120727652813f53ec73dd93 +size 21080