Accepting request 163027 from graphics

- Update to release 1.2
- removed
  darktable-1.2.x_update_to_4b856e6ec99035d5a1041db73e2339000d395aa0.patch
  as it is now included. 
- When possible use pkgconfig hence:
   instead of libopenjgeg-devel  used  pkgconfig(libopenjpeg)
   instead of GraphicsMagick-devel used pkgconfig(GraphicsMagick)
- If build is for 12.1 then require gtk2-engines (forwarded request 163026 from toganm)

OBS-URL: https://build.opensuse.org/request/show/163027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=27

0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch

@@ -1,30 +0,0 @@
->From 47bdab232b382efb89881e79491b7f2c9dbd3ead Mon Sep 17 00:00:00 2001
-From: hal <hal.from.2001@gmail.com>
-Date: Sun, 10 Mar 2013 22:56:33 +0100
-Subject: [PATCH] Fix: svg uses premultiplied alpha, we didn't respect this.
-
----
- src/iop/watermark.c |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/iop/watermark.c b/src/iop/watermark.c
-index 3b8fad7..e30936a 100644
---- a/src/iop/watermark.c
-+++ b/src/iop/watermark.c
-@@ -645,9 +645,10 @@ void process (struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, void
-   for(int j=0; j<roi_out->height; j++) for(int i=0; i<roi_out->width; i++)
-     {
-       float alpha = (sd[3]/255.0)*opacity;
--      out[0] = ((1.0-alpha)*in[0]) + (alpha*(sd[2]/255.0));
--      out[1] = ((1.0-alpha)*in[1]) + (alpha*(sd[1]/255.0));
--      out[2] = ((1.0-alpha)*in[2]) + (alpha*(sd[0]/255.0));
-+      /* svg uses a premultiplied alpha, so only use opacity for the blending */
-+      out[0] = ((1.0-alpha)*in[0]) + (opacity*(sd[2]/255.0));
-+      out[1] = ((1.0-alpha)*in[1]) + (opacity*(sd[1]/255.0));
-+      out[2] = ((1.0-alpha)*in[2]) + (opacity*(sd[0]/255.0));
-       out[3] = in[3];
- 
-       out+=ch;
--- 
-1.7.10.4
-

darktable-1.1.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb6bc7d5a672b1b493921e80aae8cff2a94e66da7acee9e2cdbd83fa11ececaf
-size 2231272

darktable-1.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc52582b5c5dfbd22e936f1d441e192a4aa53ac6533fe2c53aaa59433ccd5450
+size 2399856

darktable-usermanual-1.1.2.pdf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a33d4e7bb87c8d7f748f99badb12bd923ba798d205bbddbac85a648d6c9d866f
-size 8513151

darktable-usermanual.pdf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a
+size 10016945

darktable.changes

@@ -1,3 +1,104 @@
+-------------------------------------------------------------------
+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. 
+- When possible use pkgconfig hence:
+   instead of libopenjgeg-devel  used  pkgconfig(libopenjpeg)
+   instead of GraphicsMagick-devel used pkgconfig(GraphicsMagick)
+
+- If build is for 12.1 then require gtk2-engines
+
+-------------------------------------------------------------------
+Thu Apr  4 13:39:08 UTC 2013 - mrueckert@suse.de
+
+- added darktable-1.2.x_update_to_4b856e6ec99035d5a1041db73e2339000d395aa0.patch:
+  update to HEAD (4b856e6ec99035d5a1041db73e2339000d395aa0)
+  - adobe_coeff: Nikon Coolpix A same as D7000
+  - fix-crash-lr-import:
+    Proactive fix to avoid a crash trying to dereference a null
+    pointer.  If node stEvt:softwareAgent not found, skip as not a
+    lightroom xmp.
+  - don't crash on malformatted TIFF file
+    In case a file was alraedy rejected by GraphicsMagick, it's not
+    a good idea to try open it with our handmade imageio routines
+    like TIFFOpen().  Let's take GraphicsMagick as a last resort if
+    available.
+  - usermanual: add missing file lighttable_directory.png
+  - Fix: snapshot + gnd, cliping, ... #9329
+  - Upgraded and reviewed Spanish translation
+    I have fully reviewed the Spanish translation, fixing typos,
+    improving grammar and the language used.
+  - denoiseprofile: really fix legacy_params
+  - denoiseprofile: get param "mode" right when converting params
+    from version 2 to 3 fix: denoiseprofile: crash when trying to
+    update presets/styles from version 2 to 3 do not try to find
+    autodetection for them - would probably be not useful and is
+    impossible anyway
+  - Merge pull request #206 from bluesceada/denoise-copy-autodetect
+    denoiseprofile: copy "profile autodetected" correctly + fix:
+    display "found match" also for first profile
+  - noise profile: canon eos 1d iv by rene weiss
+  - denoiseprofile: only use a[0] = -1.0 to signal autodetection,
+    and don't use epsilon for comparisons
+  - denoiseprofile: make it possible to copy the information "this
+    profile was set automatically" across images with different ISO
+    and camera vendor
+  - fix: denoiseprofile: also show "found match:" instead of the
+    profile name for index 0
+  - Preliminary update of the Russian translation
+  - Merge branch 'fix-clipping-aspect'
+    * fix-clipping-aspect:
+      Fix aspect ratio computation.
+      It cannot happen in legacy_params() as at this point the size
+      of the image is not yet known. We then use a deferred
+      circuitry to handle this at the right point in the code.
+      Fixes #9320.
+  - [l10n] Swedish update
+
+-------------------------------------------------------------------
+Thu Apr  4 12:25:56 UTC 2013 - mrueckert@suse.de
+
+- update to release 1.2.rc2
+  - the changes on top of rc1 are minor, some details:
+  - fixed a spurious crash/deadlock when switching images in
+    filmstrip mode
+  - fixed a couple of exif strings for profiled denoising
+  - fixed gcc 4.8.0 build
+  - new noise profiles
+  - fixed gphoto 2.5 issues
+  - updated translations
+  - updated user manual!
+- additional changes from 1.2.rc1
+  - profiled denoising: adapt to the properties of your camera's
+    sensor (72 cameras already profiled for you).
+  - lightroom import: convert some basic edits from your lightroom
+    collection to darktable operations.
+  - multi instance support: duplicate your modules and apply them
+    more than one time with different settings.
+  - improved usability for distorting modules (streamline spot
+    removal in the presence of crop/rotate for example).
+  - selective copy/paste of image processing.
+  - new more intuitive keystone correction tool.
+  - jpeg2000 support.
+  - graphics magick import (support virtually all input image
+    formats).
+  - much faster thumbnail loading (if you can live with crappy
+    embedded thumbnails).
+  - incredibly lengthy list of small bug fixes, performance
+    enhancements, and usability improvements.
+  - new camera support (decode and color matrices).
+  - dithering against banding.
+  - sharper thumbnails in lighttable mode.
+  - new oauth2 based picasa uploader.
+  - and the final release 1.2 will contain a thoroughly overhauled
+    user manual, proof read by natives (thanks heaps guys!).
+- removed 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch
+  included upstream
+- added BuildRequires for GraphicsMagick and openjpeg
+
 -------------------------------------------------------------------
 Sun Mar 17 17:17:26 UTC 2013 - fcrozat@suse.com
 

darktable.spec

@@ -17,13 +17,11 @@
 
 
 Name:           darktable
-Version:        1.1.4
+Version:        1.2
 Release:        0
 Url:            http://darktable.sourceforge.net
-Source0:        https://downloads.sourceforge.net/project/darktable/darktable/1.1/darktable-%{version}.tar.xz
+Source0:        https://downloads.sourceforge.net/project/darktable/darktable/1.2/%name-%version.tar.xz
-Source1:        http://downloads.sourceforge.net/project/darktable/darktable/1.1/darktable-usermanual-1.1.2.pdf
+Source1:        http://sourceforge.net/projects/darktable/files/darktable/1.2/darktable-usermanual.pdf
-# PATCH-FIX-UPSTREAM 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch  Max Killer <hal.from.2001@gmail.com>
-Patch0:         0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  dbus-1-glib-devel
@@ -36,6 +34,9 @@ BuildRequires:  libtiff-devel
 BuildRequires:  libxslt
 BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
+BuildRequires:  libGraphicsMagick3
+BuildRequires:  pkgconfig(GraphicsMagick)
+BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(OpenEXR)
 BuildRequires:  pkgconfig(colord)
 BuildRequires:  pkgconfig(dri)
@@ -57,7 +58,12 @@ ExclusiveArch:  %ix86 x86_64
 BuildRequires:  xz
 %endif
 # needed for darktable black UI
+%if 0%{?suse_version} == 1210
+Requires:       gtk2-engines
+%endif
+%if 0%{?suse_version} > 1210
 Requires:       gtk2-engine-clearlooks
+%endif
 
 Summary:        A virtual Lighttable and Darkroom
 License:        GPL-3.0+
@@ -81,7 +87,6 @@ This package provides the user manual in pdf format
 
 %prep
 %setup -q
-%patch0 -p1
 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh
 cp %{S:1} darktable-usermanual.pdf