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/files/, profiles/, media-plugins/grilo-plugins/
Date: Thu, 15 Apr 2021 23:06:47
Message-Id: 1618527886.d0ae8ecc4501ce09859ac41aad7a1ba355b7103b.mattst88@gentoo
1 commit: d0ae8ecc4501ce09859ac41aad7a1ba355b7103b
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 15 01:29:00 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 23:04:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ae8ecc
7
8 media-plugins/grilo-plugins: Version bump to 0.3.13
9
10 * Port to lua-single eclass
11
12 Closes: https://bugs.gentoo.org/752756
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 media-plugins/grilo-plugins/Manifest | 1 +
16 .../grilo-plugins/files/0.3.13-meson-goa.patch | 49 +++++++++
17 .../files/0.3.13-meson-tracker3-test.patch | 29 ++++++
18 .../grilo-plugins/grilo-plugins-0.3.13.ebuild | 113 +++++++++++++++++++++
19 profiles/package.mask | 1 +
20 5 files changed, 193 insertions(+)
21
22 diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
23 index ff149a7c218..7f308a9c39b 100644
24 --- a/media-plugins/grilo-plugins/Manifest
25 +++ b/media-plugins/grilo-plugins/Manifest
26 @@ -1 +1,2 @@
27 DIST grilo-plugins-0.3.11.tar.xz 1449408 BLAKE2B 8ed9bd49f779eadb486a13be3bbdee0df797ebffb7833eaf2632cbb6fac90b33e2f3c92223c7e6d268257aabd710e0b9fd6c8e9395bfae776990a64e7537b41a SHA512 eefeabf333568d06ce77ba865f2dc96592428ae41c459f51e2ea7f37914c2b3d52778e5548b7d49059f1e4b83c8c07e5a8798272c5ced0259de1900d9e3f6991
28 +DIST grilo-plugins-0.3.13.tar.xz 1835320 BLAKE2B 3c39c652700eba0d6c557dbfa700a4f8f1b52ecadb757d7c36b5a3023f096fcb7587f4b054f75eb12ffee61b423abbca73d7847d902450d23b5527024f260058 SHA512 7edccc7366623c3dab56f7c95156327db08efdf038563c9be3e423c517a1117003ef516a069f9a2e877f6a610dad6783d3087d111b039ce7bdc6657124cf8e25
29
30 diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch
31 new file mode 100644
32 index 00000000000..8122e57db3f
33 --- /dev/null
34 +++ b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch
35 @@ -0,0 +1,49 @@
36 +https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/109
37 +
38 +From 27585cd5bcfba9e75d8ca9bc86dc0b7b3e5a2e59 Mon Sep 17 00:00:00 2001
39 +From: Mart Raudsepp <leio@g.o>
40 +Date: Sat, 16 Feb 2019 14:44:44 +0200
41 +Subject: [PATCH] build: Support controlling gnome-online-accounts dep
42 +
43 +On Gentoo, some users prefer to disable gnome-online-accounts since it
44 +brings in the large WebKitGTK dependency.
45 +---
46 + meson.build | 4 ++--
47 + meson_options.txt | 1 +
48 + 2 files changed, 3 insertions(+), 2 deletions(-)
49 +
50 +diff --git a/meson.build b/meson.build
51 +index 74a5d2a9..5f8c7cd4 100644
52 +--- a/meson.build
53 ++++ b/meson.build
54 +@@ -13,7 +13,7 @@ project('grilo-plugins', 'c',
55 + 'warning_level=1'
56 + ],
57 + license: 'LGPL 2.1',
58 +- meson_version: '>= 0.44.0')
59 ++ meson_version: '>= 0.47.0')
60 +
61 + plugin_version = meson.project_version()
62 + version_array = plugin_version.split('.')
63 +@@ -52,7 +52,7 @@ avahi_glib_dep = dependency('avahi-glib', required: false)
64 + avahi_gobject_dep = dependency('avahi-gobject', required: false)
65 + gio_dep = dependency('gio-2.0', required: false)
66 + gio_unix_dep = dependency('gio-unix-2.0', required: false)
67 +-goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: false)
68 ++goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: get_option('goa'))
69 + gom_dep = dependency('gom-1.0', version: '>= 0.4', required: false)
70 + grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false,
71 + fallback: ['grilo', 'libgrlnet_dep'])
72 +diff --git a/meson_options.txt b/meson_options.txt
73 +index f5132228..1e0ea090 100644
74 +--- a/meson_options.txt
75 ++++ b/meson_options.txt
76 +@@ -21,4 +21,5 @@ option('enable-tmdb', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'a
77 + option('enable-tracker', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker plugin (DEPRECATED)')
78 + option('enable-tracker3', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker3 plugin')
79 + option('enable-youtube', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable YouTube plugin')
80 ++option('goa', type: 'feature', value: 'auto', description: 'Enable gnome-online-accounts usage')
81 + option('help', type: 'combo', choices: [ 'yes', 'no' ], value: 'yes', description: 'Build examples developers')
82 +--
83 +2.26.3
84 +
85
86 diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch
87 new file mode 100644
88 index 00000000000..0812d7936b6
89 --- /dev/null
90 +++ b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch
91 @@ -0,0 +1,29 @@
92 +https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/110
93 +
94 +From 62229a03614add0d3cb6e1087f241407f952de12 Mon Sep 17 00:00:00 2001
95 +From: Matt Turner <mattst88@×××××.com>
96 +Date: Wed, 14 Apr 2021 22:08:13 -0400
97 +Subject: [PATCH] build: Only run tracker3 test when enabled
98 +
99 +Previously -Denable-tracker3=no would not build the tracker3 plugin but
100 +if the dependency was found on the system the unit test would still be
101 +enabled (and would fail).
102 +---
103 + tests/meson.build | 2 +-
104 + 1 file changed, 1 insertion(+), 1 deletion(-)
105 +
106 +diff --git a/tests/meson.build b/tests/meson.build
107 +index 97e196db..7ba2236b 100644
108 +--- a/tests/meson.build
109 ++++ b/tests/meson.build
110 +@@ -39,6 +39,6 @@ if local_metadata_enabled and lua_factory_enabled
111 + subdir('local-metadata')
112 + endif
113 +
114 +-if tracker3_dep.found() and tracker3_testutils_dep.found()
115 ++if get_option('enable-tracker3') != 'no' and tracker3_dep.found() and tracker3_testutils_dep.found()
116 + subdir('tracker3')
117 + endif
118 +--
119 +2.26.3
120 +
121
122 diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
123 new file mode 100644
124 index 00000000000..b1aa867de4f
125 --- /dev/null
126 +++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
127 @@ -0,0 +1,113 @@
128 +# Copyright 1999-2021 Gentoo Authors
129 +# Distributed under the terms of the GNU General Public License v2
130 +
131 +EAPI=7
132 +LUA_COMPAT=( lua5-3 )
133 +inherit gnome.org lua-single meson xdg
134 +
135 +DESCRIPTION="A collection of plugins for the Grilo framework"
136 +HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
137 +
138 +LICENSE="LGPL-2.1+"
139 +SLOT="0.3"
140 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
141 +IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
142 +RESTRICT="!test? ( test )"
143 +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
144 +
145 +# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.13)
146 +# json-glib used by tmdb and lua; tmdb currently non-optional
147 +# TODO: validate upnp-av dleyna deps
148 +RDEPEND="
149 + >=dev-libs/glib-2.44:2
150 + >=media-libs/grilo-0.3.13:${SLOT}=[playlist]
151 + freebox? ( net-dns/avahi[dbus] )
152 + >=dev-libs/gom-0.4
153 + chromaprint? (
154 + media-libs/gstreamer:1.0
155 + media-libs/gst-plugins-base:1.0
156 + media-plugins/gst-plugins-chromaprint:1.0
157 + )
158 + dev-libs/json-glib
159 + daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
160 + media-libs/libmediaart:2.0
161 + net-libs/libsoup:2.4
162 + dev-libs/libxml2:2
163 + flickr? (
164 + net-libs/liboauth
165 + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
166 + )
167 + dev-db/sqlite:3
168 + >=dev-libs/totem-pl-parser-3.4.1
169 + tracker? ( app-misc/tracker:3= )
170 + upnp-av? (
171 + net-libs/dleyna-connector-dbus
172 + net-misc/dleyna-server
173 + )
174 + lua? (
175 + ${LUA_DEPS}
176 + app-arch/libarchive
177 + dev-libs/libxml2:2
178 + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
179 + )
180 + thetvdb? ( app-arch/libarchive )
181 + youtube? ( >=dev-libs/libgdata-0.9.1:= )
182 +"
183 +DEPEND="${RDEPEND}"
184 +BDEPEND="
185 + app-text/docbook-xml-dtd:4.5
186 + dev-util/itstool
187 + >=sys-devel/gettext-0.19.8
188 + upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
189 + virtual/pkgconfig
190 + lua? ( dev-util/gperf )
191 +"
192 +
193 +PATCHES=(
194 + "${FILESDIR}"/0.3.13-meson-goa.patch
195 + "${FILESDIR}"/0.3.13-meson-tracker3-test.patch
196 +)
197 +
198 +pkg_setup() {
199 + use lua && lua-single_pkg_setup
200 +}
201 +
202 +src_prepare() {
203 + xdg_src_prepare
204 + sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-plugins-${SLOT%/*}':" meson.build || die
205 + sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" po/meson.build || die
206 + sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" help/meson.build || die
207 +
208 + # libdmapsharing-4 is not packaged
209 + sed -i -e "s:libdmapsharing4_dep.found():false:" meson.build || die
210 +}
211 +
212 +src_configure() {
213 + local emesonargs=(
214 + -Denable-bookmarks=yes
215 + -Denable-chromaprint=$(usex chromaprint yes no)
216 + -Denable-dleyna=$(usex upnp-av yes no)
217 + -Denable-dmap=$(usex daap yes no)
218 + -Denable-filesystem=yes
219 + -Denable-flickr=$(usex flickr yes no)
220 + -Denable-freebox=$(usex freebox yes no)
221 + -Denable-gravatar=yes
222 + -Denable-local-metadata=yes
223 + -Denable-lua-factory=$(usex lua yes no)
224 + -Denable-magnatune=yes
225 + -Denable-metadata-store=yes
226 + -Denable-opensubtitles=yes
227 + -Denable-optical-media=yes
228 + -Denable-podcasts=yes
229 + -Denable-raitv=yes
230 + -Denable-shoutcast=yes
231 + -Denable-thetvdb=$(usex thetvdb yes no)
232 + -Denable-tmdb=yes
233 + -Denable-tracker=no
234 + -Denable-tracker3=$(usex tracker yes no)
235 + -Denable-youtube=$(usex youtube yes no)
236 + $(meson_feature gnome-online-accounts goa)
237 + -Dhelp=no
238 + )
239 + meson_src_configure
240 +}
241
242 diff --git a/profiles/package.mask b/profiles/package.mask
243 index 1c786e42ccf..71da1262b3f 100644
244 --- a/profiles/package.mask
245 +++ b/profiles/package.mask
246 @@ -75,6 +75,7 @@ x11-misc/xstroke
247 >=app-misc/tracker-miners-3
248 >=gnome-base/nautilus-40
249 >=sys-process/gnome-usage-3.38
250 +>=media-plugins/grilo-plugins-0.3.13
251
252 # Michał Górny <mgorny@g.o> (2021-04-10)
253 # Obsolete backport to Python < 3.4. No reverse dependencies left.