[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

["Marek Szuba" <marecki@gentoo.org>]

commit:     9cb5ef5c3e97c72b45c015fb9bb38d7209e67030
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 15:28:00 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 15:41:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb5ef5c

media-gfx/darktable: enable Lua support

Looks like it will still take a lot of time before we have lua-5.3
available in the tree, slotted or not. Fortunately it turns out that
recent versions of Darktable come with bundled Lua 5.3 which can
optionally be used instead of system version.

Closes: https://bugs.gentoo.org/618104
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 ...table-9999.ebuild => darktable-3.2.1-r1.ebuild} | 39 +++++++++++++++++-----
 media-gfx/darktable/darktable-9999.ebuild          |  9 ++---
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
similarity index 74%
copy from media-gfx/darktable/darktable-9999.ebuild
copy to media-gfx/darktable/darktable-3.2.1-r1.ebuild
index b94745a602b..adbe95a27f1 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -3,23 +3,26 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
-EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+DOC_PV="3.0.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 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"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
+KEYWORDS="~amd64 ~arm64"
+LANGS=" de es fr he it pl pt-BR ru sl"
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto nls opencl openmp openexr tools webp
+	lto lua nls opencl openmp openexr tools webp
 	${LANGS// / l10n_}"
 
-BDEPEND=">=dev-python/jsonschema-3.2.0
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -66,8 +69,12 @@ 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
 )
 
+S="${WORKDIR}/${P/_/~}"
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		# Bug #695658
@@ -91,10 +98,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: switch to system Lua once 5.3 has been unmasked
 	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
+		-DDONT_USE_INTERNAL_LUA=OFF
 		-DBUILD_CURVE_TOOLS=$(usex tools)
 		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
@@ -103,7 +112,7 @@ src_configure() {
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
+		-DUSE_LUA=$(usex lua)
 		-DUSE_MAP=$(usex geolocation)
 		-DUSE_NLS=$(usex nls)
 		-DUSE_OPENCL=$(usex opencl)
@@ -128,3 +137,15 @@ src_install() {
 		done
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}

diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index b94745a602b..94d8c657437 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -14,9 +14,8 @@ LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 #KEYWORDS="~amd64 ~arm64"
 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"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto nls opencl openmp openexr tools webp
+	lto lua nls opencl openmp openexr tools webp
 	${LANGS// / l10n_}"
 
 BDEPEND=">=dev-python/jsonschema-3.2.0
@@ -91,10 +90,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: switch to system Lua once 5.3 has been unmasked
 	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
+		-DDONT_USE_INTERNAL_LUA=OFF
 		-DBUILD_CURVE_TOOLS=$(usex tools)
 		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
@@ -103,7 +104,7 @@ src_configure() {
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
+		-DUSE_LUA=$(usex lua)
 		-DUSE_MAP=$(usex geolocation)
 		-DUSE_NLS=$(usex nls)
 		-DUSE_OPENCL=$(usex opencl)