Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/grilo-plugins/
Date: Mon, 07 Feb 2022 19:03:34
Message-Id: 1644260570.78acc0d39deff3accd9d72a9b2b4fe07de2efb11.mattst88@gentoo
1 commit: 78acc0d39deff3accd9d72a9b2b4fe07de2efb11
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 7 18:40:06 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 7 19:02:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78acc0d3
7
8 media-plugins/grilo-plugins: Fix enabling gnome-online-accounts
9
10 Closes: https://bugs.gentoo.org/832777
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild | 14 +++++++++++++-
14 1 file changed, 13 insertions(+), 1 deletion(-)
15
16 diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild
17 index 226ee065aaa4..293cd7957771 100644
18 --- a/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild
19 +++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild
20 @@ -63,6 +63,14 @@ BDEPEND="
21 lua? ( dev-util/gperf )
22 "
23
24 +pkg_pretend() {
25 + if use gnome-online-accounts; then
26 + if ! use flickr && ! use lua; then
27 + ewarn "Ignoring USE=gnome-online-accounts USE does not contain flickr or lua"
28 + fi
29 + fi
30 +}
31 +
32 pkg_setup() {
33 use lua && lua-single_pkg_setup
34 }
35 @@ -101,8 +109,12 @@ src_configure() {
36 -Denable-tracker=no
37 -Denable-tracker3=$(usex tracker yes no)
38 -Denable-youtube=$(usex youtube yes no)
39 - $(meson_feature gnome-online-accounts goa)
40 -Dhelp=no
41 )
42 + if use flickr || use lua; then
43 + emesonargs+=($(meson_feature gnome-online-accounts goa))
44 + else
45 + emesonargs+=(-Dgoa=disabled)
46 + fi
47 meson_src_configure
48 }