Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
Date: Sun, 31 Dec 2017 14:05:31
Message-Id: 1514729123.79d8464037d18e1d870fafc94423cd136cfd031b.monsieurp@gentoo
1 commit: 79d8464037d18e1d870fafc94423cd136cfd031b
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 29 17:48:42 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 31 14:05:23 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d84640
7
8 media-gfx/darktable : add hints to find opencl header file.
9
10 Closes: https://github.com/gentoo/gentoo/pull/6633
11
12 media-gfx/darktable/darktable-2.4.0.ebuild | 2 ++
13 media-gfx/darktable/files/darktable-find-opencl-header.patch | 12 ++++++++++++
14 2 files changed, 14 insertions(+)
15
16 diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
17 index 3f0453270d4..c32deff305a 100644
18 --- a/media-gfx/darktable/darktable-2.4.0.ebuild
19 +++ b/media-gfx/darktable/darktable-2.4.0.ebuild
20 @@ -69,6 +69,8 @@ DEPEND="${CDEPEND}
21 >=sys-devel/llvm-4
22 )"
23
24 +PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
25 +
26 S="${WORKDIR}/${P/_/~}"
27
28 pkg_pretend() {
29
30 diff --git a/media-gfx/darktable/files/darktable-find-opencl-header.patch b/media-gfx/darktable/files/darktable-find-opencl-header.patch
31 new file mode 100644
32 index 00000000000..0a692f9341e
33 --- /dev/null
34 +++ b/media-gfx/darktable/files/darktable-find-opencl-header.patch
35 @@ -0,0 +1,12 @@
36 +diff -Nur a/CMakeLists.txt b/CMakeLists.txt
37 +--- a/CMakeLists.txt 2017-12-24 09:09:10.000000000 +0000
38 ++++ b/CMakeLists.txt 2017-12-25 20:42:40.998693994 +0000
39 +@@ -355,7 +355,7 @@
40 + message(STATUS "Found clang compiler - ${CLANG_OPENCL_COMPILER}")
41 +
42 + find_path(CLANG_OPENCL_INCLUDE_DIR opencl-c.h
43 +- HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang
44 ++ HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang /usr/lib/clang /usr/lib64/clang
45 + PATH_SUFFIXES include ${LLVM_PACKAGE_VERSION}/include
46 + NO_DEFAULT_PATH
47 + )