From 51d43024486a73d9ec4a931c081c3a6a3b47da0ac53ddcf142834d6611693169 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 10:01:18 +0000 Subject: [PATCH] Accepting request 1156841 from home:polslinux:branches:graphics:darktable - Update to version 4.6.1: https://github.com/darktable-org/darktable/releases/tag/release-4.6.1 - Add darktable-rawspeed-build-type-override.patch. OBS-URL: https://build.opensuse.org/request/show/1156841 OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=71 --- darktable-4.6.0.tar.xz | 3 --- darktable-4.6.0.tar.xz.asc | 6 ----- darktable-4.6.1.tar.xz | 3 +++ darktable-4.6.1.tar.xz.asc | 6 +++++ darktable-rawspeed-build-type-override.patch | 25 ++++++++++++++++++++ darktable.changes | 7 ++++++ darktable.dsc | 2 +- darktable.spec | 6 +++-- debian.tar.xz | 4 ++-- 9 files changed, 48 insertions(+), 14 deletions(-) delete mode 100644 darktable-4.6.0.tar.xz delete mode 100644 darktable-4.6.0.tar.xz.asc create mode 100644 darktable-4.6.1.tar.xz create mode 100644 darktable-4.6.1.tar.xz.asc create mode 100644 darktable-rawspeed-build-type-override.patch diff --git a/darktable-4.6.0.tar.xz b/darktable-4.6.0.tar.xz deleted file mode 100644 index ad13d4c..0000000 --- a/darktable-4.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:724b27e3204d1822de6dc53ea090a6b1ce55f7c32226d34642689775c68aacc2 -size 6129572 diff --git a/darktable-4.6.0.tar.xz.asc b/darktable-4.6.0.tar.xz.asc deleted file mode 100644 index 7c9da33..0000000 --- a/darktable-4.6.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCZXtdmQAKCRAY3KEj+Um9 -O9JMAJ9+eKiiW0VONrrn7U8CpOuJ1G2zegCeP7WSna6tZYteWNMpEKJXxdrVH5I= -=DxEP ------END PGP SIGNATURE----- diff --git a/darktable-4.6.1.tar.xz b/darktable-4.6.1.tar.xz new file mode 100644 index 0000000..8944184 --- /dev/null +++ b/darktable-4.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16edc0a070293e2d3cda4ea10e49bda9bde932e23f9e62e2fa2e7ac74acf7afd +size 6240188 diff --git a/darktable-4.6.1.tar.xz.asc b/darktable-4.6.1.tar.xz.asc new file mode 100644 index 0000000..e2d2f76 --- /dev/null +++ b/darktable-4.6.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCZc+dswAKCRAY3KEj+Um9 +O7xzAJ9rXJizIIWM2Rqm4j742Kq+RonN2gCguaAPzGvqJKkyWP37yzTUTbGEXk0= +=Am5w +-----END PGP SIGNATURE----- diff --git a/darktable-rawspeed-build-type-override.patch b/darktable-rawspeed-build-type-override.patch new file mode 100644 index 0000000..5fba865 --- /dev/null +++ b/darktable-rawspeed-build-type-override.patch @@ -0,0 +1,25 @@ +Index: src/external/CMakeLists.txt +=================================================================== +--- darktable.orig/src/external/CMakeLists.txt ++++ darktable/src/external/CMakeLists.txt +@@ -13,17 +13,19 @@ endif() + + ################################################################################ + # RawSpeed block + + string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_UPPERCASE) + + set(RAWSPEED_${CMAKE_BUILD_TYPE_UPPERCASE}_BUILD 1) + if(RAWSPEED_RELWITHDEBINFO_BUILD) +- set(CMAKE_BUILD_TYPE "Release") ++ # openSUSE hack: we really do need to override CMAKE_BUILD_TYPE here. ++ set(VARNAME "CMAKE_BUILD_TYPE") ++ set(${VARNAME} "Release") + endif() + + SET(COMPILER_SUPPORTS_DEBUG_INFO_COMPRESSION OFF) + SET(COMPILER_SUPPORTS_DEBUG_INFO_COMPRESSION_LINK OFF) + SET(COMPILER_SUPPORTS_SPLIT_DEBUG_INFO OFF) + SET(LINKER_SUPPORTS_GDB_INDEX OFF) + + set(BUILD_TESTING_SAVE "${BUILD_TESTING}") diff --git a/darktable.changes b/darktable.changes index 8cd7fe6..9b527ae 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 11 07:02:40 UTC 2024 - Paolo Stivanin + +- Update to version 4.6.1: + https://github.com/darktable-org/darktable/releases/tag/release-4.6.1 +- Add darktable-rawspeed-build-type-override.patch. + ------------------------------------------------------------------- Sat Dec 23 09:58:05 UTC 2023 - Andreas Schneider diff --git a/darktable.dsc b/darktable.dsc index 304fefe..385b923 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 any-ppc64el -Version: 4.6.0-1.1 +Version: 4.6.1-1.1 Homepage: http://www.darktable.org/ # libavif-dev (>= 0.9.1), Build-Depends: cmake (>= 3.18), diff --git a/darktable.spec b/darktable.spec index 18146f4..f876f3e 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,7 +1,7 @@ # # spec file for package darktable # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -119,7 +119,7 @@ %endif Name: darktable -Version: 4.6.0 +Version: 4.6.1 Release: 0 %global pkg_name darktable %global pkg_version %{version} @@ -134,6 +134,7 @@ Source98: debian.tar.xz Source99: README.openSUSE # Patch0: darktable-old-glib.patch +Patch1: darktable-rawspeed-build-type-override.patch # ExclusiveArch: x86_64 aarch64 ppc64le # build time tools @@ -304,6 +305,7 @@ rm -rf src/external/lua/ -DCMAKE_INSTALL_DATAROOTDIR="share" \\\ -DCMAKE_INSTALL_LIBEXECDIR="%{_libexecdir}" \\\ -DCMAKE_INSTALL_DOCDIR="%{_defaultdocdir}/%{pkg_name}" \\\ + -DCOMPILER_SUPPORTS_SPLIT_DEBUG_INFO=OFF \\\ -DBINARY_PACKAGE_BUILD=1 \\\ -DRAWSPEED_ENABLE_LTO=ON \\\ -DUSE_OPENCL="%{_use_opencl}" \\\ diff --git a/debian.tar.xz b/debian.tar.xz index 0ae7276..81d21ae 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d356e039d73291e2b2f6bbccd6c28dfada56838f3088b1859177bb92dfff103 -size 21308 +oid sha256:6c148cab25d5ad4ca6238c0ed6540579439f63aefa94c07621e28c1c5505f9a4 +size 21328