Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2013-04-24 11:50:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "darktable", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2013-04-07 14:20:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2013-04-24 11:50:21.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 23 23:20:01 UTC 2013 - [email protected] + +- Fix factory build with OpenEXR-2.0 + added 0001-OpenEXR-2.0-fixes.patch + +------------------------------------------------------------------- New: ---- 0001-OpenEXR-2.0-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.PIafYS/_old 2013-04-24 11:50:30.000000000 +0200 +++ /var/tmp/diff_new_pack.PIafYS/_new 2013-04-24 11:50:30.000000000 +0200 @@ -22,6 +22,8 @@ Url: http://darktable.sourceforge.net Source0: https://downloads.sourceforge.net/project/darktable/darktable/1.2/%name-%version.tar.xz Source1: http://sourceforge.net/projects/darktable/files/darktable/1.2/darktable-usermanual.pdf +# PATCH-FIX-OPENSUSE Fixes build with OpenEXR-2.0 toganm<users.sourceforge.net> +Patch0: 0001-OpenEXR-2.0-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: dbus-1-glib-devel @@ -87,6 +89,9 @@ %prep %setup -q +%if 0%{?suse_version} >1230 +%patch0 -p1 +%endif chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh cp %{S:1} darktable-usermanual.pdf ++++++ 0001-OpenEXR-2.0-fixes.patch ++++++ >From 161eaf014c4846679e0ee5366aee4beb4113b205 Mon Sep 17 00:00:00 2001 From: Togan Muftuoglu <[email protected]> Date: Wed, 24 Apr 2013 00:58:29 +0200 Subject: [PATCH] OpenEXR 2.0 fixes Use Imf_2_0 as the name space for OpenEXR 2.0 version Signed-off-by: Togan Muftuoglu <[email protected]> --- src/common/imageio_exr.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/imageio_exr.hh b/src/common/imageio_exr.hh index 47a4b1d..46db4de 100644 --- a/src/common/imageio_exr.hh +++ b/src/common/imageio_exr.hh @@ -31,7 +31,7 @@ #include <OpenEXR/ImfStandardAttributes.h> // this stores our exif data as a blob. -namespace Imf +namespace Imf_2_0 { class Blob { @@ -54,7 +54,7 @@ public: }; -typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute; +typedef Imf_2_0::TypedAttribute<Imf_2_0::Blob> BlobAttribute; template <> const char *BlobAttribute::staticTypeName() { return "blob"; -- 1.8.2.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
