From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 380891382C5 for ; Sun, 23 May 2021 15:00:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 762EBE0871; Sun, 23 May 2021 15:00:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CEFDE0871 for ; Sun, 23 May 2021 15:00:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB47A340B4D for ; Sun, 23 May 2021 15:00:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FF58790 for ; Sun, 23 May 2021 15:00:22 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1621782000.c2dcd5faefc3f0b0b365fc5c37404fb9ff56a924.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-2.6.2.ebuild media-gfx/darktable/darktable-3.4.1.ebuild media-gfx/darktable/darktable-9999.ebuild X-VCS-Directories: media-gfx/darktable/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c2dcd5faefc3f0b0b365fc5c37404fb9ff56a924 X-VCS-Branch: master Date: Sun, 23 May 2021 15:00:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa6883f1-47b5-4f9d-bca0-4207b4c67c6f X-Archives-Hash: 7dc2a01bf08d0a69ca3a80a911eda03e commit: c2dcd5faefc3f0b0b365fc5c37404fb9ff56a924 Author: Marek Szuba gentoo org> AuthorDate: Sun May 23 13:24:20 2021 +0000 Commit: Marek Szuba gentoo 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 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? ( =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)