| 1 |
commit: 2e4000e9e113d8280850e999de6d2dbcff184075 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 12 14:59:58 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 12 15:03:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4000e9 |
| 7 |
|
| 8 |
media-gfx/darktable: migrate to lua-single.eclass |
| 9 |
|
| 10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 11 |
|
| 12 |
media-gfx/darktable/darktable-3.2.1-r1.ebuild | 12 ++++++++---- |
| 13 |
media-gfx/darktable/metadata.xml | 1 + |
| 14 |
2 files changed, 9 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild |
| 17 |
index adbe95a27f1..8c8b4232164 100644 |
| 18 |
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild |
| 19 |
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild |
| 20 |
@@ -3,7 +3,9 @@ |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
|
| 24 |
-inherit cmake flag-o-matic toolchain-funcs xdg |
| 25 |
+LUA_COMPAT=( lua5-3 ) |
| 26 |
+ |
| 27 |
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg |
| 28 |
|
| 29 |
DOC_PV="3.0.0" |
| 30 |
MY_PV="${PV/_/}" |
| 31 |
@@ -19,9 +21,11 @@ SLOT="0" |
| 32 |
KEYWORDS="~amd64 ~arm64" |
| 33 |
LANGS=" de es fr he it pl pt-BR ru sl" |
| 34 |
IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet |
| 35 |
- lto lua nls opencl openmp openexr tools webp |
| 36 |
+ lto lua nls opencl openmp openexr system-lua tools webp |
| 37 |
${LANGS// / l10n_}" |
| 38 |
|
| 39 |
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )" |
| 40 |
+ |
| 41 |
BDEPEND=" |
| 42 |
dev-util/intltool |
| 43 |
virtual/pkgconfig |
| 44 |
@@ -55,6 +59,7 @@ COMMON_DEPEND=" |
| 45 |
jpeg2k? ( media-libs/openjpeg:2= ) |
| 46 |
opencl? ( virtual/opencl ) |
| 47 |
openexr? ( media-libs/openexr:0= ) |
| 48 |
+ system-lua? ( ${LUA_DEPS} ) |
| 49 |
webp? ( media-libs/libwebp:0= ) |
| 50 |
" |
| 51 |
DEPEND="${COMMON_DEPEND} |
| 52 |
@@ -98,13 +103,12 @@ src_prepare() { |
| 53 |
} |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
- # TODO: switch to system Lua once 5.3 has been unmasked |
| 57 |
local mycmakeargs=( |
| 58 |
- -DDONT_USE_INTERNAL_LUA=OFF |
| 59 |
-DBUILD_CURVE_TOOLS=$(usex tools) |
| 60 |
-DBUILD_NOISE_TOOLS=$(usex tools) |
| 61 |
-DBUILD_PRINT=$(usex cups) |
| 62 |
-DCUSTOM_CFLAGS=ON |
| 63 |
+ -DDONT_USE_INTERNAL_LUA=$(usex system-lua) |
| 64 |
-DRAWSPEED_ENABLE_LTO=$(usex lto) |
| 65 |
-DUSE_CAMERA_SUPPORT=$(usex gphoto2) |
| 66 |
-DUSE_COLORD=$(usex colord) |
| 67 |
|
| 68 |
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml |
| 69 |
index 63e4e905d37..bc5ef345788 100644 |
| 70 |
--- a/media-gfx/darktable/metadata.xml |
| 71 |
+++ b/media-gfx/darktable/metadata.xml |
| 72 |
@@ -15,6 +15,7 @@ |
| 73 |
<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag> |
| 74 |
<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag> |
| 75 |
<flag name="opencl">Enable opencl support</flag> |
| 76 |
+ <flag name="system-lua">Use dev-lang/lua instead of the bundled liblua</flag> |
| 77 |
<flag name="tools">Install tools for generating base curves and noise profiles</flag> |
| 78 |
</use> |
| 79 |
<upstream> |
Archives