media-gfx/darktable: sync with main tree

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Manifest-Sign-Key: 0x363AF1F7765A9D02

3 files changed, 30 insertions, 15 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 40d10d0..f7de927 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX darktable-find-opencl-header.patch 601 SHA256 0cc23f01d49b95c954cf8d35f64dcbb4a9e85bab92fd894698a72e793a32e502 SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020 WHIRLPOOL d59682a13fdf44c456060c6693835f8432d291b03bc8c328af4ccc5185e33db9a8a4590c9b5eddbcbd699c5df6825a68aeaa2d1e94c5b533b0cbd8913cf566b1
 DIST darktable-2.2.4.tar.xz 3083400 SHA256 bd5445d6b81fc3288fb07362870e24bb0b5378cacad2c6e6602e32de676bf9d8 SHA512 4231bcbbf975fb9cd73d3a9e4ab1a05ebd1c58e681f776896b252bb245529d89bfd34d05c1a6dcf0d6a9a190898eaaa495084906f92bfb1aa8bb2ca0cf84eb9d WHIRLPOOL c49d1a8d8bd50f8ec0927ab03b9837beb5bbb80936e026283882dc4bb5b7ed25e761cb4810794fcbc7b6d970c390046c2530b3b5bab9aed74a0b7d884f729dee
 DIST darktable-2.2.5.tar.xz 3092540 SHA256 e303a42b33f78eb1f48d3b36d1df46f30873df4c5a7b49605314f61c49fbf281 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b WHIRLPOOL 540e784780689fd9604e7c1fd195e1f2fa90aa378380ea26846bd641c71b2118d26795a874b8a7a049ce58cbb27ce3df853671af7def71f59cc84f9086361ec8
 DIST darktable-2.4.0.tar.xz 3387972 SHA256 9d37388aee79d5ada71062bbac3cda612a61d1a781f6320b784b27308f3a1878 SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db WHIRLPOOL 56196aaa8a409e8c103f60f046b5df4a249ed9b4662fc53ee306f865bfece56c949d7dc2ce259a01d441744a9ed631e178ae5215bd7174a1ab9a9be4e1348cc9
 DIST darktable-usermanual-2.2.0.pdf 14998142 SHA256 04213234e5bcdef658431d265310fbdfae38e1b820420c69cd802391a5a7accf SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 WHIRLPOOL 16aa4422f20871802cad3421f30dc6e230757f5366ec17259f4d07da048e23d64003f2531dcf33c702a46c0f2788aa4e0d81e94e13b83da2dd699255f6aca247
 EBUILD darktable-2.2.4.ebuild 3861 SHA256 3f9d829cef64a9082b3aae7505209e7cccb0ba3d888ef40b16cf7f40ef79f7dd SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556 WHIRLPOOL 19feb7fa08ff387de22f4604e4f69cc11feff3cbec272472e8eebed455200c2a38d1abf11d9a4f159d26a6cd4fc03a743d7359a343907fed55605e31e250b9d5
 EBUILD darktable-2.2.5.ebuild 3861 SHA256 3f9d829cef64a9082b3aae7505209e7cccb0ba3d888ef40b16cf7f40ef79f7dd SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556 WHIRLPOOL 19feb7fa08ff387de22f4604e4f69cc11feff3cbec272472e8eebed455200c2a38d1abf11d9a4f159d26a6cd4fc03a743d7359a343907fed55605e31e250b9d5
-EBUILD darktable-2.4.0.ebuild 3935 SHA256 9e97bc95d694f05d0d3bb498a1bf36f5e849ee1ffeaebf72f2bc0c59dbc74cea SHA512 4f18f241bcc825b337f3ee90f5e2fe727ee01be3fc1d308f1b7169b42c6b4650ccc8e7d24844f3b17b179b1d0d3bb2b1a1b0b9a7179b6631687cc6c51762c79d WHIRLPOOL 7cb35472816f083392a2c6a831909c35721ad78f6e6b4acc1deb8f125dd945f39cea7e9a51df277b2e46d38bfde7b25e92da466104d50630e45d4f80353a04ea
+EBUILD darktable-2.4.0.ebuild 3995 SHA256 d21e0d8a325b344acfd76ee827b4e89e16445bd028ae675e644054d8d6b2cdf6 SHA512 00c1a43c39695a653a31beded947baffdd33f24b4873642b021a414ba49946a24990870f44644bbb3e6ca3e12451020cc3f4425e499d019aa6616bc0d94dc42c WHIRLPOOL 804cb1621b081b5955e32bfbeb0d49312b8591f9cafdf05958e9969df6cb4a2bdffca531e9e79fc335e7cba96a4d2cf9b551cfe965c3e2b9685bacfead06e14e
 EBUILD darktable-9999.ebuild 3296 SHA256 7275c15da9429a8dede77fc814bdc93156439d449da8347ccffd4e67198349dc SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62 WHIRLPOOL 20ce1cd7df9b9853ff134ef1ce03799bf407221b46a21713b54ba069fc5bf6fdb142168814e687ec58e2c24efadac9ad3c496197d86d5cfd6c7d886a22413989
 MISC metadata.xml 1001 SHA256 dc599f3625ad302106823e3f7593e121c113e14c3f7fd395bc369921631ddfaf SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88 WHIRLPOOL 6a80ae2a0b9fc6b3cf2a3794242251338fc33346ea3551612fecc99eee08882f204d89a5dd1bf52042a2f3161a566a5fa7985b3f0c9f9a34bb40c17d266dd817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlpGLu5fFIAAAAAALgAo
+iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlpmLrBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
 OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
-RDzA2w/8DdTFjDXGxiaX6L0xJ57Dfg/hCA6OUp0m6xtnP89+hYbC1fCs8wGSKWPY
-RhiTsfFe6ch1ipzREkbKVeH2C1LYUPpIAlOZZ2vIE2Qj+pw3D6BN88PVFfXtDkgA
-FPjX6I/+ZJG8n2jwunTAtJ8ug/Pxw/a/Q9TRusX9CdbRzDk81clRVbg77p4xxx+E
-VGWMPJKMTDFR6SwwwCXRPH7JvFABE/5JQq5xvbY2vhuwylri1jKDAGT7WmDzI4DW
-xYkbc08P7UxNUOpl2nAHVy9vHCyHp8BbekXw/3AKF/Lbxa06i7/H82b4Sj+PBN0J
-yQAYrjx81MWkxZfy7ek+SmRX5nxU6gqR8gVbp/KfYrA1uSeabA2RO+6B6wOSQQwJ
-mt2I9kGpI3v8lR2Us8hd+tM86ux23Aj40fQCuRVCkKYLguZAM59Pg0YnMI0NegN2
-Yo1iZz4Y6mA6E0J/OqLU7G1qc8NgB02xNbxNFC5wierHMbj1VkLEEHcOk6gtG1VX
-wH5P4bsDbe7Y40QXJMNfkIj4xw/j2yyDBihDH4+gzHKVdPwkOXZp7wlFoFPiRGGO
-8mvx6UuTW5nBweu3+LsUIDfqP6m/U2gfT87TCUUUjLmL4S16zrxyyAFLidNZg7aD
-Gk2omrkkg4BZDjOeBQ7H897tNC8Jfy6MaSwQRFF4IihetsfCQyk=
-=kurg
+RDxczRAAlj/ZWOTYRONlhoHKsrFSLUZw2ID4vqKlbKzqDL9GctIaVeMY7LV1h89c
+fX9c60DztwE9Jf9IJtgcGUqhH3WhRAUPLNEOlb8Jxs8pdFaYtySDqFmF4oVtE53r
+hfX6Y1Rwbn2lPyQiWIAyJVAY0NKX5QMqnHJOqc2uWtrnSIsx+ImyxCEylJe0jqvq
+ST1fRvg3ftJAWXnObKGXrYBqv6sG6tklYibMMd5388thNqal2+WZYH5qMn12p7R0
+0u9BJUXRgKgJawo1VMUcXM/9QvOiJVgd/3oQoWCBUSEFzZQwgsq40tr3PKQm/QTl
+jv1fJ6jM57U87bDTaj6Yhg42ZKyqF7Gnt1zGpBFHiX+fxzPZxjKQ9jwiuCFpKxov
+/QzdLM4EtY2RvwgRpg85XDR77X7Xlelv6J31FhocpC1JJm7nahVm1Sxs14j6QGe5
+zbE6kiFRd/uudZq4sPpi/MJt+FqguR16KwB+fGPESkmq0FRodhAS1xZvo2blilX/
+dXIFspmJdMOmdU17i2ks04XKmCRfe6l/oGfhWbHJkN/adtQweH84yS+CS6zZYA+L
+B96btSFVENW3SrsDJ2imUvh5pZRe/WycvTsePFSHpXy3khFqoa7BfUxdGdqRqWkz
+mvS/cy7xKnF5JSaYlDmUC0kmNA6+vJWroX6rV+T0rPf6QaTBwnU=
+=Z6L7
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index 3f04532..ccf4b49 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,6 +69,8 @@ DEPEND="${CDEPEND}
 		>=sys-devel/llvm-4
 	)"
 
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {
diff --git a/media-gfx/darktable/files/darktable-find-opencl-header.patch b/media-gfx/darktable/files/darktable-find-opencl-header.patch
new file mode 100644
index 0000000..0a692f9
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-find-opencl-header.patch
@@ -0,0 +1,12 @@
+diff -Nur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-12-24 09:09:10.000000000 +0000
++++ b/CMakeLists.txt	2017-12-25 20:42:40.998693994 +0000
+@@ -355,7 +355,7 @@
+       message(STATUS "Found clang compiler - ${CLANG_OPENCL_COMPILER}")
+ 
+       find_path(CLANG_OPENCL_INCLUDE_DIR opencl-c.h
+-        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang
++        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang /usr/lib/clang /usr/lib64/clang
+         PATH_SUFFIXES include ${LLVM_PACKAGE_VERSION}/include
+         NO_DEFAULT_PATH
+       )