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 2F2A81382C5 for ; Sat, 26 Dec 2020 23:18:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AA38E09D4; Sat, 26 Dec 2020 23:18:43 +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 E2ACDE09D0 for ; Sat, 26 Dec 2020 23:18:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4065534138A for ; Sat, 26 Dec 2020 23:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C527C4C for ; Sat, 26 Dec 2020 23:18:39 +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: <1609024696.dd47c8a2caa923d5eb2355a8c3101e2124b83ca2.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-3.4.0-r1.ebuild media-gfx/darktable/darktable-3.4.0.ebuild media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch media-gfx/darktable/metadata.xml X-VCS-Directories: media-gfx/darktable/ media-gfx/darktable/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: dd47c8a2caa923d5eb2355a8c3101e2124b83ca2 X-VCS-Branch: master Date: Sat, 26 Dec 2020 23:18:39 +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: 3acc48fe-4ad1-4c82-9b06-def33522cb47 X-Archives-Hash: 2583c6c4ff4e917f2bcc4bb651d8c12e commit: dd47c8a2caa923d5eb2355a8c3101e2124b83ca2 Author: Marek Szuba gentoo org> AuthorDate: Fri Dec 25 00:58:28 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sat Dec 26 23:18:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd47c8a2 media-gfx/darktable: + AVIF support, - bundled liblua, unified release/live structure Signed-off-by: Marek Szuba gentoo.org> ...able-3.4.0.ebuild => darktable-3.4.0-r1.ebuild} | 54 ++++++++++++++-------- .../darktable-3.4.0_jsonschema-automagic.patch | 25 ++++++++++ media-gfx/darktable/metadata.xml | 1 + 3 files changed, 62 insertions(+), 18 deletions(-) diff --git a/media-gfx/darktable/darktable-3.4.0.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild similarity index 73% rename from media-gfx/darktable/darktable-3.4.0.ebuild rename to media-gfx/darktable/darktable-3.4.0-r1.ebuild index ffafc687cb4..8405fd12551 100644 --- a/media-gfx/darktable/darktable-3.4.0.ebuild +++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild @@ -7,29 +7,41 @@ LUA_COMPAT=( lua5-3 ) inherit cmake flag-o-matic lua-single toolchain-funcs xdg -DOC_PV="3.4.0" -MY_PV="${PV/_/}" -MY_P="${P/_/.}" - DESCRIPTION="A virtual lighttable and darkroom for photographers" HOMEPAGE="https://www.darktable.org/" -SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz - doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" - LICENSE="GPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 ~arm64" -LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl" -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet - lto lua nls opencl openmp openexr system-lua tools webp + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" + + LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" +else + DOC_PV="3.4.0" + MY_PV="${PV/_/}" + MY_P="${P/_/.}" + + SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" + + KEYWORDS="~amd64 ~arm64" + LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl" +fi + +IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet + lto lua nls opencl openmp openexr test tools webp ${LANGS// / l10n_}" -REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" BDEPEND=" dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) + test? ( >=dev-python/jsonschema-3.2.0 ) " COMMON_DEPEND=" dev-db/sqlite:3 @@ -49,6 +61,7 @@ COMMON_DEPEND=" x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango + avif? ( >=media-libs/libavif-0.8.2 ) colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) @@ -58,9 +71,9 @@ COMMON_DEPEND=" gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) + lua? ( ${LUA_DEPS} ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) - system-lua? ( ${LUA_DEPS} ) webp? ( media-libs/libwebp:0= ) " DEPEND="${COMMON_DEPEND} @@ -76,7 +89,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch - "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch + "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch ) S="${WORKDIR}/${P/_/~}" @@ -95,6 +108,10 @@ pkg_pretend() { fi } +pkg_setup() { + use lua && lua-single_pkg_setup +} + src_prepare() { use cpu_flags_x86_sse3 && append-flags -msse3 @@ -104,15 +121,14 @@ src_prepare() { } src_configure() { - # As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352. local mycmakeargs=( -DBUILD_CURVE_TOOLS=$(usex tools) -DBUILD_NOISE_TOOLS=$(usex tools) -DBUILD_PRINT=$(usex cups) -DCUSTOM_CFLAGS=ON - -DDONT_USE_INTERNAL_LUA=$(usex system-lua) + -DDONT_USE_INTERNAL_LUA=ON -DRAWSPEED_ENABLE_LTO=$(usex lto) - -DUSE_AVIF=no + -DUSE_AVIF=$(usex avif) -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) -DUSE_FLICKR=$(usex flickr) @@ -128,6 +144,7 @@ src_configure() { -DUSE_OPENJPEG=$(usex jpeg2k) -DUSE_OPENMP=$(usex openmp) -DUSE_WEBP=$(usex webp) + -DWANT_JSON_VALIDATION=$(usex test) ) CMAKE_BUILD_TYPE="RELWITHDEBINFO" cmake_src_configure @@ -135,9 +152,10 @@ src_configure() { src_install() { cmake_src_install + # This USE flag is masked for -9999 use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - if use nls ; then + if use nls; then for lang in ${LANGS} ; do if ! use l10n_${lang}; then rm -r "${ED}"/usr/share/locale/${lang/-/_} || die diff --git a/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch new file mode 100644 index 00000000000..45d61e6af6c --- /dev/null +++ b/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch @@ -0,0 +1,25 @@ +jsonschema is only used at install time to validate a file that release +tarballs already include, treat running it as a late part of tests. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -350,6 +350,9 @@ + endif() + + # we need jsonschema to check noiseprofiles.json ++# In case of Git clones this file is generated at build time, for releases ++# it is included in the tarball. ++if (WANT_JSON_VALIDATION) + find_program(jsonschema_BIN jsonschema) + if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND") + message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed") +@@ -358,6 +361,9 @@ + message(STATUS "Found jsonschema") + set(VALIDATE_JSON 1) + endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND") ++else() ++ set(VALIDATE_JSON 0) ++endif() + + # we need an XSLT interpreter to generate preferences_gen.h and darktablerc + find_program(Xsltproc_BIN xsltproc) diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml index 5661ac61bfd..a46ea727d4c 100644 --- a/media-gfx/darktable/metadata.xml +++ b/media-gfx/darktable/metadata.xml @@ -10,6 +10,7 @@ Markus Meier + Support importing and exporting AVIF images Add support for uploading photos to flickr Enable geotagging support Use the G'MIC image-processing framework (media-gfx/gmic), e.g. to support Colour LUTs compressed using their compression scheme