Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/
Date: Wed, 30 Sep 2020 15:41:58
Message-Id: 1601480497.9cb5ef5c3e97c72b45c015fb9bb38d7209e67030.marecki@gentoo
1 commit: 9cb5ef5c3e97c72b45c015fb9bb38d7209e67030
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 15:28:00 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 15:41:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb5ef5c
7
8 media-gfx/darktable: enable Lua support
9
10 Looks like it will still take a lot of time before we have lua-5.3
11 available in the tree, slotted or not. Fortunately it turns out that
12 recent versions of Darktable come with bundled Lua 5.3 which can
13 optionally be used instead of system version.
14
15 Closes: https://bugs.gentoo.org/618104
16 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
17
18 ...table-9999.ebuild => darktable-3.2.1-r1.ebuild} | 39 +++++++++++++++++-----
19 media-gfx/darktable/darktable-9999.ebuild | 9 ++---
20 2 files changed, 35 insertions(+), 13 deletions(-)
21
22 diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
23 similarity index 74%
24 copy from media-gfx/darktable/darktable-9999.ebuild
25 copy to media-gfx/darktable/darktable-3.2.1-r1.ebuild
26 index b94745a602b..adbe95a27f1 100644
27 --- a/media-gfx/darktable/darktable-9999.ebuild
28 +++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
29 @@ -3,23 +3,26 @@
30
31 EAPI=7
32
33 -inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
34 +inherit cmake flag-o-matic toolchain-funcs xdg
35
36 -EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
37 +DOC_PV="3.0.0"
38 +MY_PV="${PV/_/}"
39 +MY_P="${P/_/.}"
40
41 DESCRIPTION="A virtual lighttable and darkroom for photographers"
42 HOMEPAGE="https://www.darktable.org/"
43 +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
44 + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
45
46 LICENSE="GPL-3 CC-BY-3.0"
47 SLOT="0"
48 -#KEYWORDS="~amd64 ~arm64"
49 -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"
50 -# TODO add lua once dev-lang/lua-5.2 is unmasked
51 +KEYWORDS="~amd64 ~arm64"
52 +LANGS=" de es fr he it pl pt-BR ru sl"
53 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
54 - lto nls opencl openmp openexr tools webp
55 + lto lua nls opencl openmp openexr tools webp
56 ${LANGS// / l10n_}"
57
58 -BDEPEND=">=dev-python/jsonschema-3.2.0
59 +BDEPEND="
60 dev-util/intltool
61 virtual/pkgconfig
62 nls? ( sys-devel/gettext )
63 @@ -66,8 +69,12 @@ RDEPEND="${COMMON_DEPEND}
64
65 PATCHES=(
66 "${FILESDIR}"/"${PN}"-find-opencl-header.patch
67 + "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
68 + "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
69 )
70
71 +S="${WORKDIR}/${P/_/~}"
72 +
73 pkg_pretend() {
74 if [[ ${MERGE_TYPE} != binary ]]; then
75 # Bug #695658
76 @@ -91,10 +98,12 @@ src_prepare() {
77 }
78
79 src_configure() {
80 + # TODO: switch to system Lua once 5.3 has been unmasked
81 local mycmakeargs=(
82 - -DBUILD_PRINT=$(usex cups)
83 + -DDONT_USE_INTERNAL_LUA=OFF
84 -DBUILD_CURVE_TOOLS=$(usex tools)
85 -DBUILD_NOISE_TOOLS=$(usex tools)
86 + -DBUILD_PRINT=$(usex cups)
87 -DCUSTOM_CFLAGS=ON
88 -DRAWSPEED_ENABLE_LTO=$(usex lto)
89 -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
90 @@ -103,7 +112,7 @@ src_configure() {
91 -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
92 -DUSE_KWALLET=$(usex kwallet)
93 -DUSE_LIBSECRET=$(usex gnome-keyring)
94 - -DUSE_LUA=OFF
95 + -DUSE_LUA=$(usex lua)
96 -DUSE_MAP=$(usex geolocation)
97 -DUSE_NLS=$(usex nls)
98 -DUSE_OPENCL=$(usex opencl)
99 @@ -128,3 +137,15 @@ src_install() {
100 done
101 fi
102 }
103 +
104 +pkg_postinst() {
105 + xdg_pkg_postinst
106 +
107 + elog
108 + elog "When updating a major version,"
109 + elog "please bear in mind that your edits will be preserved during this process,"
110 + elog "but it will not be possible to downgrade any more."
111 + elog
112 + ewarn "It will not be possible to downgrade!"
113 + ewarn
114 +}
115
116 diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
117 index b94745a602b..94d8c657437 100644
118 --- a/media-gfx/darktable/darktable-9999.ebuild
119 +++ b/media-gfx/darktable/darktable-9999.ebuild
120 @@ -14,9 +14,8 @@ LICENSE="GPL-3 CC-BY-3.0"
121 SLOT="0"
122 #KEYWORDS="~amd64 ~arm64"
123 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"
124 -# TODO add lua once dev-lang/lua-5.2 is unmasked
125 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
126 - lto nls opencl openmp openexr tools webp
127 + lto lua nls opencl openmp openexr tools webp
128 ${LANGS// / l10n_}"
129
130 BDEPEND=">=dev-python/jsonschema-3.2.0
131 @@ -91,10 +90,12 @@ src_prepare() {
132 }
133
134 src_configure() {
135 + # TODO: switch to system Lua once 5.3 has been unmasked
136 local mycmakeargs=(
137 - -DBUILD_PRINT=$(usex cups)
138 + -DDONT_USE_INTERNAL_LUA=OFF
139 -DBUILD_CURVE_TOOLS=$(usex tools)
140 -DBUILD_NOISE_TOOLS=$(usex tools)
141 + -DBUILD_PRINT=$(usex cups)
142 -DCUSTOM_CFLAGS=ON
143 -DRAWSPEED_ENABLE_LTO=$(usex lto)
144 -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
145 @@ -103,7 +104,7 @@ src_configure() {
146 -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
147 -DUSE_KWALLET=$(usex kwallet)
148 -DUSE_LIBSECRET=$(usex gnome-keyring)
149 - -DUSE_LUA=OFF
150 + -DUSE_LUA=$(usex lua)
151 -DUSE_MAP=$(usex geolocation)
152 -DUSE_NLS=$(usex nls)
153 -DUSE_OPENCL=$(usex opencl)