commit: c2dcd5faefc3f0b0b365fc5c37404fb9ff56a924
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 13:24:20 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun May 23 15:00:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2dcd5fa
media-gfx/darktable: do not depend on LLVM+Clang
Darktable only needs LLVM+Clang if one want to test-build its OpenCL
kernels during installation. This is useful for developers working
on said kernels but feels unnecessary for users, especially given
it involves such a heavyweight dependency. Therefore, disable the
test-building of OpenCL kernels and remove the sys-devel/{llvm,clang}
dependencies.
Closes: https://bugs.gentoo.org/791448
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-gfx/darktable/darktable-2.6.2.ebuild | 10 +++-------
media-gfx/darktable/darktable-3.4.1.ebuild | 26 ++++++++------------------
media-gfx/darktable/darktable-9999.ebuild | 28 +++++++++-------------------
3 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild
b/media-gfx/darktable/darktable-2.6.2.ebuild
index 394e2f5295a..dbca73f7b5f 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -59,12 +59,7 @@ COMMON_DEPEND="
openexr? ( media-libs/openexr:0= )
webp? ( media-libs/libwebp:0= )
"
-DEPEND="${COMMON_DEPEND}
- opencl? (
- >=sys-devel/clang-4
- >=sys-devel/llvm-4
- )
-"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
"
@@ -93,6 +88,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
+ -DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild
b/media-gfx/darktable/darktable-3.4.1.ebuild
index d3f39613559..54b4518a454 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -37,14 +37,11 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
-BDEPEND="
- dev-util/intltool
+BDEPEND="dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
- test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
- dev-db/sqlite:3
+ test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=
@@ -74,20 +71,12 @@ COMMON_DEPEND="
lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( <media-libs/openexr-3.0.0:0= )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
- opencl? (
- >=sys-devel/clang-4
- >=sys-devel/llvm-4
- )
-"
-RDEPEND="${COMMON_DEPEND}
- kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
+ webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+ kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
PATCHES=(
- "${FILESDIR}"/"${PN}"-find-opencl-header.patch
+ "${FILESDIR}"/${PN}-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
)
@@ -128,6 +117,7 @@ src_configure() {
-DCUSTOM_CFLAGS=ON
-DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+ -DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
diff --git a/media-gfx/darktable/darktable-9999.ebuild
b/media-gfx/darktable/darktable-9999.ebuild
index e2dca8478be..696f97a42ff 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,14 +37,11 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
-BDEPEND="
- dev-util/intltool
+BDEPEND="dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
- test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
- dev-db/sqlite:3
+ test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=
@@ -74,20 +71,12 @@ COMMON_DEPEND="
lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
- opencl? (
- >=sys-devel/clang-4
- >=sys-devel/llvm-4
- )
-"
-RDEPEND="${COMMON_DEPEND}
- kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
+ webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+ kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
PATCHES=(
- "${FILESDIR}"/"${PN}"-find-opencl-header.patch
+ "${FILESDIR}"/${PN}-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
)
@@ -128,6 +117,7 @@ src_configure() {
-DCUSTOM_CFLAGS=ON
-DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+ -DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
