pool/darktable
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 173118 from graphics

Browse Source 
- Fix factory build with OpenEXR-2.0
  added 0001-OpenEXR-2.0-fixes.patch (forwarded request 173105 from toganm)

OBS-URL: https://build.opensuse.org/request/show/173118
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=28
This commit is contained in:
Stephan Kulow 2013-04-24 09:50:19 +00:00 committed by Git OBS Bridge
parent cebf0e418d
commit 4f9a621ad4
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-OpenEXR-2.0-fixes.patch Normal file
View File

@ -0,0 +1,37 @@
From 161eaf014c4846679e0ee5366aee4beb4113b205 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@users.sourceforge.net>
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 <toganm@users.sourceforge.net>
---
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

6
darktable.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 23 23:20:01 UTC 2013 - toganm@opensuse.org
- Fix factory build with OpenEXR-2.0
added 0001-OpenEXR-2.0-fixes.patch
-------------------------------------------------------------------
Sat Apr 6 16:31:09 UTC 2013 - toganm@opensuse.org

5
darktable.spec
View File

@ -22,6 +22,8 @@ Release: 0
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 @@ This package provides the user manual in pdf format
%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