From 08828d76515a18736d1ef906ca41ca01420902dd51f2550ea09bc21de298c17b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 Apr 2015 14:03:14 +0000 Subject: [PATCH] Accepting request 293723 from graphics Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/293723 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=46 --- ...52bc3564e74133680cc53e69e040d3663b47.patch | 36 +++++++++++++++++++ darktable.changes | 7 ++++ darktable.spec | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 826152bc3564e74133680cc53e69e040d3663b47.patch diff --git a/826152bc3564e74133680cc53e69e040d3663b47.patch b/826152bc3564e74133680cc53e69e040d3663b47.patch new file mode 100644 index 0000000..a58e19d --- /dev/null +++ b/826152bc3564e74133680cc53e69e040d3663b47.patch @@ -0,0 +1,36 @@ +From 826152bc3564e74133680cc53e69e040d3663b47 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= +Date: Mon, 2 Mar 2015 13:30:53 +0000 +Subject: [PATCH] Support for the Canon "Digital Rebel" (300D alias) + +--- + src/external/adobe_coeff.c | 1 + + src/external/rawspeed/data/cameras.xml | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/src/external/adobe_coeff.c b/src/external/adobe_coeff.c +index 051c896..5b4be66 100644 +--- a/src/external/adobe_coeff.c ++++ b/src/external/adobe_coeff.c +@@ -36,6 +36,7 @@ static void dt_dcraw_adobe_coeff(const char *name, float cam_xyz[1][12]) + { "Canon EOS 60D", 0, 0x2ff7, { 6719,-994,-925,-4408,12426,2211,-887,2129,6051 } }, + { "Canon EOS 70D", 0, 0x3bc7, { 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 } }, + { "Canon EOS 100D", 0, 0x350f, { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, ++ { "Canon EOS DIGITAL REBEL", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, + { "Canon EOS 300D DIGITAL", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, + { "Canon EOS 350D DIGITAL", 0, 0xfff, { 6018,-617,-965,-8645,15881,2975,-1530,1719,7642 } }, + { "Canon EOS 400D DIGITAL", 0, 0xe8e, { 7054,-1501,-990,-8156,15544,2812,-1278,1414,7796 } }, +diff --git a/src/external/rawspeed/data/cameras.xml b/src/external/rawspeed/data/cameras.xml +index 50b798d..b19507e 100644 +--- a/src/external/rawspeed/data/cameras.xml ++++ b/src/external/rawspeed/data/cameras.xml +@@ -101,6 +101,9 @@ + + + ++ ++ Canon EOS DIGITAL REBEL ++ + + + diff --git a/darktable.changes b/darktable.changes index 849097f..223644c 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 23 15:55:50 UTC 2015 - mrueckert@suse.de + +- added 826152bc3564e74133680cc53e69e040d3663b47.patch: + Backport from upstream to fix upstream issue #10370 + 'Unable to work with Canon EOS Rebel images using darktable 1.6' + ------------------------------------------------------------------- Mon Mar 2 00:12:25 UTC 2015 - toganm@opensuse.org diff --git a/darktable.spec b/darktable.spec index 5af32e1..2bcf125 100644 --- a/darktable.spec +++ b/darktable.spec @@ -30,6 +30,7 @@ Source0: %name-%version-nopatents.tar.xz Source1: https://github.com/darktable-org/darktable/releases/download/release-1.6.0/darktable-usermanual.pdf Source2: README.openSUSE Source3: generate-tarball.sh +Patch: 826152bc3564e74133680cc53e69e040d3663b47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -111,6 +112,7 @@ This package provides the user manual in pdf format %prep %setup -q +%patch -p1 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh tools/basecurve/* tools/noise/* cp %{S:1} darktable-usermanual.pdf