Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/darktable/files: darktable-1.4.1-automagic-openexr.patch
Date: Tue, 11 Feb 2014 05:43:52
Message-Id: 20140211054349.B69982004E@flycatcher.gentoo.org
1 radhermit 14/02/11 05:43:49
2
3 Added: darktable-1.4.1-automagic-openexr.patch
4 Log:
5 Version bump, add openexr use flag (bug #499708).
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.1 media-gfx/darktable/files/darktable-1.4.1-automagic-openexr.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-1.4.1-automagic-openexr.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-1.4.1-automagic-openexr.patch?rev=1.1&content-type=text/plain
14
15 Index: darktable-1.4.1-automagic-openexr.patch
16 ===================================================================
17 --- darktable-1.4.1/CMakeLists.txt
18 +++ darktable-1.4.1/CMakeLists.txt
19 @@ -26,6 +26,7 @@
20 option(BINARY_PACKAGE_BUILD "Sets march optimization to generic" OFF)
21 option(APRIL_FOOLS "Add the \"file manager\" (a shell) to lighttable mode" OFF)
22 option(USE_XMLLINT "Run xmllint to test if darktableconfig.xml is valid" ON)
23 +option(USE_OPENEXR "Enable OpenEXR support" ON)
24 option(USE_OPENJPEG "Enable JPEG 2000 support" ON)
25 option(USE_WEBP "Enable WebP export support" ON)
26 option(BUILD_CMSTEST "Build a test program to check your system's color management setup" OFF)
27 --- darktable-1.4.1/src/CMakeLists.txt
28 +++ darktable-1.4.1/src/CMakeLists.txt
29 @@ -152,13 +152,15 @@
30 add_definitions(${INOTIFY_DEFINITIONS})
31 endif(INOTIFY_FOUND)
32
33 -find_package(OpenEXR)
34 -if(OPENEXR_FOUND)
35 - include_directories(${OpenEXR_INCLUDE_DIRS})
36 - list(APPEND LIBS ${OpenEXR_LIBRARIES})
37 - add_definitions(${OpenEXR_DEFINITIONS})
38 - list(APPEND SOURCES "common/imageio_exr.cc")
39 -endif(OPENEXR_FOUND)
40 +if(USE_OPENEXR)
41 + find_package(OpenEXR)
42 + if(OPENEXR_FOUND)
43 + include_directories(${OpenEXR_INCLUDE_DIRS})
44 + list(APPEND LIBS ${OpenEXR_LIBRARIES})
45 + add_definitions(${OpenEXR_DEFINITIONS})
46 + list(APPEND SOURCES "common/imageio_exr.cc")
47 + endif(OPENEXR_FOUND)
48 +endif(USE_OPENEXR)
49
50 find_package(WebP 0.3.0)
51 if(WEBP_FOUND)