From 496cb2672e23635c16799c629497908c6eeb85cbd5b0cb4cc5b87da460752355 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 18 Mar 2020 11:46:41 +0000 Subject: [PATCH] Accepting request 786116 from graphics OBS-URL: https://build.opensuse.org/request/show/786116 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=86 --- ...ae80bd8459f4ec5929df75d6ec0471c3d26c.patch | 44 +++++++++++++++++++ darktable-3.0.0.tar.xz | 3 -- darktable-3.0.0.tar.xz.asc | 6 --- darktable-3.0.1.tar.xz | 3 ++ darktable-3.0.1.tar.xz.asc | 6 +++ darktable.changes | 8 ++++ darktable.dsc | 2 +- darktable.spec | 5 ++- debian.tar.xz | 4 +- 9 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 8bceae80bd8459f4ec5929df75d6ec0471c3d26c.patch delete mode 100644 darktable-3.0.0.tar.xz delete mode 100644 darktable-3.0.0.tar.xz.asc create mode 100644 darktable-3.0.1.tar.xz create mode 100644 darktable-3.0.1.tar.xz.asc diff --git a/8bceae80bd8459f4ec5929df75d6ec0471c3d26c.patch b/8bceae80bd8459f4ec5929df75d6ec0471c3d26c.patch new file mode 100644 index 0000000..8c8ab44 --- /dev/null +++ b/8bceae80bd8459f4ec5929df75d6ec0471c3d26c.patch @@ -0,0 +1,44 @@ +From 8bceae80bd8459f4ec5929df75d6ec0471c3d26c Mon Sep 17 00:00:00 2001 +From: coolcom200 +Date: Mon, 9 Mar 2020 20:47:16 -0400 +Subject: [PATCH] Fix: Missing legacy_params in Basic Adjustment module + +--- + src/iop/basicadj.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/src/iop/basicadj.c b/src/iop/basicadj.c +index fa24e32ae4..9b79690d7d 100644 +--- a/src/iop/basicadj.c ++++ b/src/iop/basicadj.c +@@ -90,6 +90,30 @@ typedef struct dt_iop_basicadj_global_data_t + int kernel_basicadj; + } dt_iop_basicadj_global_data_t; + ++int legacy_params(dt_iop_module_t *self, const void *const old_params, const int old_version, void *new_params, ++ const int new_version) ++{ ++ if(old_version == 1 && new_version == 2) ++ { ++ const dt_iop_basicadj_params_t *old = old_params; ++ dt_iop_basicadj_params_t *new = new_params; ++ ++ new->black_point = old->black_point; ++ new->exposure = old->exposure; ++ new->hlcompr = old->hlcompr; ++ new->hlcomprthresh = old->hlcomprthresh; ++ new->contrast = old->contrast; ++ new->preserve_colors = old->preserve_colors; ++ new->middle_grey = old->middle_grey; ++ new->brightness = old->brightness; ++ new->saturation = old->saturation; ++ new->clip = old->clip; ++ new->vibrance = 0; ++ return 0; ++ } ++ return 1; ++} ++ + const char *name() + { + return _("basic adjustments"); diff --git a/darktable-3.0.0.tar.xz b/darktable-3.0.0.tar.xz deleted file mode 100644 index 239f985..0000000 --- a/darktable-3.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db -size 3827412 diff --git a/darktable-3.0.0.tar.xz.asc b/darktable-3.0.0.tar.xz.asc deleted file mode 100644 index afec696..0000000 --- a/darktable-3.0.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCXf3towAKCRAY3KEj+Um9 -O5r9AJ4uTtqV9XCPfNlrHFC/DPLEJDbYWQCfcCPdtR2SJPDiLuflXR7DZqYrlXM= -=XC3w ------END PGP SIGNATURE----- diff --git a/darktable-3.0.1.tar.xz b/darktable-3.0.1.tar.xz new file mode 100644 index 0000000..003a0fb --- /dev/null +++ b/darktable-3.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c54b3921da14a97c99ab2f79feca468cf2abca65adf907dba6216e47edab7cb7 +size 3859720 diff --git a/darktable-3.0.1.tar.xz.asc b/darktable-3.0.1.tar.xz.asc new file mode 100644 index 0000000..93a2537 --- /dev/null +++ b/darktable-3.0.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCXmKP+QAKCRAY3KEj+Um9 +O2+jAJ9hoieIVUy6Rx+WrbmG4PtPr2+VrwCgqiNviiC5Qc2WKBPWp5lVXMzXOtI= +=+RBy +-----END PGP SIGNATURE----- diff --git a/darktable.changes b/darktable.changes index b762f1d..f80d525 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 10 16:28:28 UTC 2020 - Andreas Schneider + +- Update to version 3.0.1 + * https://github.com/darktable-org/darktable/releases/tag/release-3.0.1 +- added https://github.com/darktable-org/darktable/commit/8bceae80bd8459f4ec5929df75d6ec0471c3d26c.patch + to fix regression in the basic adjustment module. + ------------------------------------------------------------------- Wed Feb 12 15:15:45 UTC 2020 - Andreas Schneider diff --git a/darktable.dsc b/darktable.dsc index 38c7c94..9754d2b 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.0.0-1.1 +Version: 3.0.1-1.1 Homepage: http://www.darktable.org/ Build-Depends: cmake, debhelper (>= 10), diff --git a/darktable.spec b/darktable.spec index 71e4f75..8c28496 100644 --- a/darktable.spec +++ b/darktable.spec @@ -55,10 +55,10 @@ %endif Name: darktable -Version: 3.0.0 +Version: 3.0.1 Release: 0 %define pkg_name darktable -%define pkg_version 3.0.0 +%define pkg_version 3.0.1 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 @@ -71,6 +71,7 @@ Source97: darktable.dsc Source98: debian.tar.xz Source99: README.openSUSE Patch: darktable-old-glib.patch +Patch1: https://github.com/darktable-org/darktable/commit/8bceae80bd8459f4ec5929df75d6ec0471c3d26c.patch ExclusiveArch: x86_64 aarch64 ppc64le # build time tools diff --git a/debian.tar.xz b/debian.tar.xz index 08b4fa4..f7184f7 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36b1aac62bbaca09d409d4331f6a2c2d35a040d22737dbf4eb3d81596c0a6e3d -size 21032 +oid sha256:af78738db9fcac7131eed85421636a9c2991b64e7c12688f27dd12997ff7ed38 +size 21744