1 |
commit: 99b9eda26c11f4b1661442764b0194c0893b0351 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 19:56:43 2021 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 20:02:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=99b9eda2 |
7 |
|
8 |
media-video/totem-9999: sync with main tree |
9 |
|
10 |
Closes: https://bugs.gentoo.org/767559 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
media-video/totem/files/3.26-control-plugins.patch | 199 --------------------- |
14 |
media-video/totem/files/3.26-meson-fixes.patch | 40 ----- |
15 |
.../totem/files/3.26-skip-pylint-check.patch | 37 ---- |
16 |
...dbox.patch => 3.34.1-gst-inspect-sandbox.patch} | 16 +- |
17 |
media-video/totem/metadata.xml | 3 - |
18 |
media-video/totem/totem-9999.ebuild | 155 +++++++--------- |
19 |
6 files changed, 75 insertions(+), 375 deletions(-) |
20 |
|
21 |
diff --git a/media-video/totem/files/3.26-control-plugins.patch b/media-video/totem/files/3.26-control-plugins.patch |
22 |
deleted file mode 100644 |
23 |
index 6b4b1a7d..00000000 |
24 |
--- a/media-video/totem/files/3.26-control-plugins.patch |
25 |
+++ /dev/null |
26 |
@@ -1,199 +0,0 @@ |
27 |
-From 5bdfac8a4a34e3edec05439fa3cd5544e0515e24 Mon Sep 17 00:00:00 2001 |
28 |
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@g.o> |
29 |
-Date: Sun, 10 Jun 2018 10:09:16 +0200 |
30 |
-Subject: [PATCH] Allow full control over which plugins are built |
31 |
- |
32 |
---- |
33 |
- meson.build | 2 +- |
34 |
- meson_options.txt | 28 ++++++++++++++++++++- |
35 |
- src/plugins/meson.build | 56 ++++++++++++++++++++++++++++++----------- |
36 |
- 3 files changed, 69 insertions(+), 17 deletions(-) |
37 |
- |
38 |
-diff --git a/meson.build b/meson.build |
39 |
-index 9c4797dd..aa91ae10 100644 |
40 |
---- a/meson.build |
41 |
-+++ b/meson.build |
42 |
-@@ -7,7 +7,7 @@ project( |
43 |
- 'c_std=gnu99', |
44 |
- 'warning_level=1' |
45 |
- ], |
46 |
-- meson_version: '>= 0.41.0' |
47 |
-+ meson_version: '>= 0.44.0' |
48 |
- ) |
49 |
- |
50 |
- totem_version = meson.project_version() |
51 |
-diff --git a/meson_options.txt b/meson_options.txt |
52 |
-index 3b6ff67b..6e056952 100644 |
53 |
---- a/meson_options.txt |
54 |
-+++ b/meson_options.txt |
55 |
-@@ -1,7 +1,33 @@ |
56 |
- option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer') |
57 |
- option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support') |
58 |
- option('enable-vala', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'whether Vala plugin support is requested') |
59 |
--option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)') |
60 |
-+option('with-plugins', type: 'array', choices: [ |
61 |
-+ 'all', |
62 |
-+ 'auto', |
63 |
-+ 'apple-trailers', |
64 |
-+ 'autoload-subtitles', |
65 |
-+ 'brasero-disc-recorder', |
66 |
-+ 'dbusservice', |
67 |
-+ 'gromit', |
68 |
-+ 'im-status', |
69 |
-+ 'lirc', |
70 |
-+ 'media-player-keys', |
71 |
-+ 'ontop', |
72 |
-+ 'opensubtitles', |
73 |
-+ 'properties', |
74 |
-+ 'pythonconsole', |
75 |
-+ 'recent', |
76 |
-+ 'rotation', |
77 |
-+ 'sample-vala', |
78 |
-+ 'samplepython', |
79 |
-+ 'save-file', |
80 |
-+ 'screensaver', |
81 |
-+ 'screenshot', |
82 |
-+ 'skipto', |
83 |
-+ 'variable-rate', |
84 |
-+ 'vimeo', |
85 |
-+ 'zeitgeist-dp' |
86 |
-+], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)') |
87 |
- option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'compile the nautilus plugin') |
88 |
- option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension') |
89 |
- option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') |
90 |
-diff --git a/src/plugins/meson.build b/src/plugins/meson.build |
91 |
-index 95af6485..289ba811 100644 |
92 |
---- a/src/plugins/meson.build |
93 |
-+++ b/src/plugins/meson.build |
94 |
-@@ -41,8 +41,8 @@ allowed_plugins = [ |
95 |
- plugins = [] |
96 |
- |
97 |
- plugins_option = get_option('with-plugins') |
98 |
--if plugins_option != 'none' |
99 |
-- plugins += [ |
100 |
-+if plugins_option.length() > 0 |
101 |
-+ foreach plugin: [ |
102 |
- 'apple-trailers', |
103 |
- 'autoload-subtitles', |
104 |
- 'im-status', |
105 |
-@@ -56,26 +56,38 @@ if plugins_option != 'none' |
106 |
- 'variable-rate', |
107 |
- 'vimeo' |
108 |
- ] |
109 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin) |
110 |
-+ plugins += plugin |
111 |
-+ endif |
112 |
-+ endforeach |
113 |
- |
114 |
-- plugin_error = (plugins_option == 'all') |
115 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('gromit') |
116 |
-+ gdk_targets = gtk_dep.get_pkgconfig_variable('targets') |
117 |
-+ else |
118 |
-+ gdk_targets = [] |
119 |
-+ endif |
120 |
- |
121 |
-- gdk_targets = gtk_dep.get_pkgconfig_variable('targets') |
122 |
- if gdk_targets.contains('x11') |
123 |
- plugins += 'gromit' |
124 |
- else |
125 |
- str = 'the gromit plugin is not supported on non-X11 targets' |
126 |
-- if plugin_error |
127 |
-+ if plugins_option.contains('all') or plugins_option.contains('gromit') |
128 |
- error(str) |
129 |
- endif |
130 |
- message(str) |
131 |
- endif |
132 |
- |
133 |
-- lirc_dep = dependency('lirc', required: false) |
134 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('lirc') |
135 |
-+ lirc_dep = dependency('lirc', required: false) |
136 |
-+ else |
137 |
-+ lirc_dep = disabler() |
138 |
-+ endif |
139 |
-+ |
140 |
- if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h') |
141 |
- plugins += 'lirc' |
142 |
- else |
143 |
- str = 'you need lirc_client installed for the lirc plugin' |
144 |
-- if plugin_error |
145 |
-+ if plugins_option.contains('all') or plugins_option.contains('lirc') |
146 |
- error(str) |
147 |
- endif |
148 |
- message(str) |
149 |
-@@ -84,33 +96,38 @@ if plugins_option != 'none' |
150 |
- libxml_req_version = '>= 2.6.0' |
151 |
- libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) |
152 |
- gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false) |
153 |
-- if libxml_dep.found() and gtk_x11_dep.found() |
154 |
-+ |
155 |
-+ if libxml_dep.found() and gtk_x11_dep.found() and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('brasero-disc-recorder')) |
156 |
- plugins += 'brasero-disc-recorder' |
157 |
- else |
158 |
- str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin' |
159 |
-- if plugin_error |
160 |
-+ if plugins_option.contains('all') or plugins_option.contains('brasero-disc-recorder') |
161 |
- error(str) |
162 |
- endif |
163 |
- message(str) |
164 |
- endif |
165 |
- |
166 |
-- if have_nautilus |
167 |
-+ if have_nautilus and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('save-file')) |
168 |
- plugins += 'save-file' |
169 |
- else |
170 |
- str = 'you need libnautilus-extension to use the save-file plugin' |
171 |
-- if plugin_error |
172 |
-+ if plugins_option.contains('all') or plugins_option.contains('save-file') |
173 |
- error(str) |
174 |
- endif |
175 |
- message(str) |
176 |
- endif |
177 |
- |
178 |
- if have_python |
179 |
-- plugins += [ |
180 |
-+ foreach plugin: [ |
181 |
- 'dbusservice', |
182 |
- 'opensubtitles', |
183 |
- 'pythonconsole', |
184 |
- 'samplepython' |
185 |
- ] |
186 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin) |
187 |
-+ plugins += plugin |
188 |
-+ endif |
189 |
-+ endforeach |
190 |
- endif |
191 |
- |
192 |
- if have_vala |
193 |
-@@ -129,17 +146,26 @@ if plugins_option != 'none' |
194 |
- '--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version) |
195 |
- ] |
196 |
- |
197 |
-- plugins += [ |
198 |
-+ foreach plugin: [ |
199 |
- 'rotation', |
200 |
- 'sample-vala' |
201 |
- ] |
202 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin) |
203 |
-+ plugins += plugin |
204 |
-+ endif |
205 |
-+ endforeach |
206 |
-+ |
207 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('zeitgeist-dp') |
208 |
-+ zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false) |
209 |
-+ else |
210 |
-+ zeitgeist_dep = disabler() |
211 |
-+ endif |
212 |
- |
213 |
-- zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false) |
214 |
- if zeitgeist_dep.found() |
215 |
- plugins += 'zeitgeist-dp' |
216 |
- else |
217 |
- str = 'you need zeitgeist-2.0 >= 0.9.12 to use the zeitgeist-dp plugin' |
218 |
-- if plugin_error |
219 |
-+ if plugins_option.contains('all') or plugins_option.contains('zeitgeist-dp') |
220 |
- error(str) |
221 |
- endif |
222 |
- message(str) |
223 |
--- |
224 |
-2.17.1 |
225 |
- |
226 |
|
227 |
diff --git a/media-video/totem/files/3.26-meson-fixes.patch b/media-video/totem/files/3.26-meson-fixes.patch |
228 |
deleted file mode 100644 |
229 |
index 924d91c5..00000000 |
230 |
--- a/media-video/totem/files/3.26-meson-fixes.patch |
231 |
+++ /dev/null |
232 |
@@ -1,40 +0,0 @@ |
233 |
-From b66ceb0e2fe72591132576a6ca3469eff905cd8d Mon Sep 17 00:00:00 2001 |
234 |
-From: Gilles Dartiguelongue <eva@g.o> |
235 |
-Date: Thu, 7 Jun 2018 22:52:04 +0200 |
236 |
-Subject: [PATCH 1/4] meson.build: Fix typos in vala handling |
237 |
- |
238 |
---- |
239 |
- meson.build | 4 ++-- |
240 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
241 |
- |
242 |
-diff --git a/meson.build b/meson.build |
243 |
-index 8a87b8b9..9c4797dd 100644 |
244 |
---- a/meson.build |
245 |
-+++ b/meson.build |
246 |
-@@ -238,13 +238,13 @@ if python_option != 'no' |
247 |
- endif |
248 |
- |
249 |
- # vala support |
250 |
-+vala_req_version = '>= 0.14.1' |
251 |
- have_vala = false |
252 |
- |
253 |
- vala_option = get_option('enable-vala') |
254 |
- if vala_option != 'no' |
255 |
- if have_gir |
256 |
- if add_languages('vala', required: false) |
257 |
-- vala_req_version = '>= 0.14.1' |
258 |
- if meson.get_compiler('vala').version().version_compare(vala_req_version) |
259 |
- have_vala = true |
260 |
- endif |
261 |
-@@ -258,7 +258,7 @@ if vala_option != 'no' |
262 |
- endif |
263 |
- |
264 |
- if not have_vala |
265 |
-- if vala_options == 'yes' or introspection_option == 'yes' |
266 |
-+ if vala_option == 'yes' or introspection_option == 'yes' |
267 |
- error(str) |
268 |
- endif |
269 |
- message(str) |
270 |
--- |
271 |
-2.17.0 |
272 |
- |
273 |
|
274 |
diff --git a/media-video/totem/files/3.26-skip-pylint-check.patch b/media-video/totem/files/3.26-skip-pylint-check.patch |
275 |
deleted file mode 100644 |
276 |
index 326cffbc..00000000 |
277 |
--- a/media-video/totem/files/3.26-skip-pylint-check.patch |
278 |
+++ /dev/null |
279 |
@@ -1,37 +0,0 @@ |
280 |
-From 008df868818b821cdbed8d124d1a86f0747ad3fc Mon Sep 17 00:00:00 2001 |
281 |
-From: Gilles Dartiguelongue <eva@g.o> |
282 |
-Date: Thu, 7 Jun 2018 22:55:56 +0200 |
283 |
-Subject: [PATCH 3/4] Drop requirement for pylint at build-time |
284 |
- |
285 |
-This is a development QA tool anyway. |
286 |
---- |
287 |
- meson.build | 5 ++--- |
288 |
- 1 file changed, 2 insertions(+), 3 deletions(-) |
289 |
- |
290 |
-diff --git a/meson.build b/meson.build |
291 |
-index aa91ae10..f8f306e4 100644 |
292 |
---- a/meson.build |
293 |
-+++ b/meson.build |
294 |
-@@ -219,9 +219,8 @@ if python_option != 'no' |
295 |
- python_version = r.stdout().split(' ')[1] |
296 |
- |
297 |
- pygobject_dep = dependency('pygobject-3.0', version: '>= 2.90.3', required: false) |
298 |
-- pylint = find_program('pylint-3', 'pylint3', 'pylint', required: false) |
299 |
- |
300 |
-- if python_version.version_compare(python_req_version) and pygobject_dep.found() and pylint.found() |
301 |
-+ if python_version.version_compare(python_req_version) and pygobject_dep.found() |
302 |
- have_python = true |
303 |
- python_deps += pygobject_dep |
304 |
- meson.add_install_script('meson_compile_python.py') |
305 |
-@@ -229,7 +228,7 @@ if python_option != 'no' |
306 |
- endif |
307 |
- |
308 |
- if not have_python |
309 |
-- str = 'python ' + python_req_version + ', pygobject or pylint not found' |
310 |
-+ str = 'python ' + python_req_version + ' or pygobject not found' |
311 |
- if python_option == 'yes' |
312 |
- error(str) |
313 |
- endif |
314 |
--- |
315 |
-2.17.0 |
316 |
- |
317 |
|
318 |
diff --git a/media-video/totem/files/3.26-gst-inspect-sandbox.patch b/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch |
319 |
similarity index 66% |
320 |
rename from media-video/totem/files/3.26-gst-inspect-sandbox.patch |
321 |
rename to media-video/totem/files/3.34.1-gst-inspect-sandbox.patch |
322 |
index 016368a6..01ee15f8 100644 |
323 |
--- a/media-video/totem/files/3.26-gst-inspect-sandbox.patch |
324 |
+++ b/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch |
325 |
@@ -1,7 +1,7 @@ |
326 |
-From 742b64b7a74eabd67344ef1cc260427dc402588f Mon Sep 17 00:00:00 2001 |
327 |
+From 2108ed8d025499fbf11dfe750ebc7617bdbb795a Mon Sep 17 00:00:00 2001 |
328 |
From: Gilles Dartiguelongue <eva@g.o> |
329 |
Date: Thu, 7 Jun 2018 23:47:48 +0200 |
330 |
-Subject: [PATCH 5/5] Make gst-inspect calls optional at build-time |
331 |
+Subject: [PATCH] Make gst-inspect calls optional at build-time |
332 |
|
333 |
Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed |
334 |
--- |
335 |
@@ -10,16 +10,16 @@ Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed |
336 |
2 files changed, 3 insertions(+) |
337 |
|
338 |
diff --git a/meson_options.txt b/meson_options.txt |
339 |
-index 6e056952..631b8cca 100644 |
340 |
+index d6f8b4290..c8db92335 100644 |
341 |
--- a/meson_options.txt |
342 |
+++ b/meson_options.txt |
343 |
-@@ -32,3 +32,4 @@ option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: |
344 |
- option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension') |
345 |
+@@ -2,3 +2,4 @@ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', ' |
346 |
+ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support') |
347 |
+ option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)') |
348 |
option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') |
349 |
- option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)') |
350 |
+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins') |
351 |
diff --git a/src/backend/meson.build b/src/backend/meson.build |
352 |
-index 28c8e123..55037a6a 100644 |
353 |
+index 7a63bab1b..5c4ebb996 100644 |
354 |
--- a/src/backend/meson.build |
355 |
+++ b/src/backend/meson.build |
356 |
@@ -1,5 +1,6 @@ |
357 |
@@ -38,5 +38,5 @@ index 28c8e123..55037a6a 100644 |
358 |
sources = files( |
359 |
'bacon-time-label.c', |
360 |
-- |
361 |
-2.17.0 |
362 |
+2.20.1 |
363 |
|
364 |
|
365 |
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml |
366 |
index 8a1eb150..f80874d5 100644 |
367 |
--- a/media-video/totem/metadata.xml |
368 |
+++ b/media-video/totem/metadata.xml |
369 |
@@ -17,9 +17,6 @@ |
370 |
Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility. |
371 |
</longdescription> |
372 |
<use> |
373 |
- <flag name="lirc">Enable support for controlling Totem with a remote control |
374 |
- using <pkg>app-misc/lirc</pkg></flag> |
375 |
- <flag name="nautilus">Enable the nautilus extension</flag> |
376 |
<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag> |
377 |
</use> |
378 |
</pkgmetadata> |
379 |
|
380 |
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild |
381 |
index 011291c7..4c3cb1ae 100644 |
382 |
--- a/media-video/totem/totem-9999.ebuild |
383 |
+++ b/media-video/totem/totem-9999.ebuild |
384 |
@@ -1,11 +1,11 @@ |
385 |
-# Copyright 1999-2018 Gentoo Foundation |
386 |
+# Copyright 1999-2020 Gentoo Authors |
387 |
# Distributed under the terms of the GNU General Public License v2 |
388 |
|
389 |
-EAPI=6 |
390 |
-PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
391 |
-PYTHON_REQ_USE="threads" |
392 |
+EAPI=7 |
393 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
394 |
+PYTHON_REQ_USE="threads(+)" |
395 |
|
396 |
-inherit gnome-meson python-single-r1 vala |
397 |
+inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1 |
398 |
if [[ ${PV} = 9999 ]]; then |
399 |
SRC_URI="" |
400 |
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/totem.git" |
401 |
@@ -17,87 +17,72 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Videos" |
402 |
|
403 |
LICENSE="GPL-2+ LGPL-2+" |
404 |
SLOT="0" |
405 |
-IUSE="cdr +introspection lirc nautilus +python test vala" |
406 |
+IUSE="gtk-doc +python test" |
407 |
# see bug #359379 |
408 |
REQUIRED_USE=" |
409 |
- python? ( introspection ${PYTHON_REQUIRED_USE} ) |
410 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
411 |
" |
412 |
+RESTRICT="!test? ( test )" |
413 |
|
414 |
if [[ ${PV} = 9999 ]]; then |
415 |
KEYWORDS="" |
416 |
else |
417 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
418 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
419 |
fi |
420 |
|
421 |
-# FIXME: |
422 |
-# Runtime dependency on gnome-session-2.91 |
423 |
-COMMON_DEPEND=" |
424 |
- >=dev-libs/glib-2.43.4:2[dbus] |
425 |
- >=dev-libs/libpeas-1.1[gtk] |
426 |
- >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] |
427 |
+DEPEND=" |
428 |
+ >=dev-libs/glib-2.43.4:2 |
429 |
+ >=x11-libs/gtk+-3.19.4:3[introspection] |
430 |
+ >=media-libs/gstreamer-1.6.0:1.0 |
431 |
+ >=media-libs/gst-plugins-base-1.6.0:1.0[pango] |
432 |
+ >=media-libs/gst-plugins-good-1.6.0:1.0 |
433 |
+ >=media-libs/grilo-0.3.0:0.3[playlist] |
434 |
+ >=dev-libs/libpeas-1.1.0[gtk] |
435 |
+ >=dev-libs/totem-pl-parser-3.10.1:0=[introspection] |
436 |
>=media-libs/clutter-1.17.3:1.0[gtk] |
437 |
>=media-libs/clutter-gst-2.99.2:3.0 |
438 |
>=media-libs/clutter-gtk-1.8.1:1.0 |
439 |
- >=x11-libs/cairo-1.14 |
440 |
- >=x11-libs/gdk-pixbuf-2.23.0:2 |
441 |
- >=x11-libs/gtk+-3.19.4:3[introspection?] |
442 |
- |
443 |
- >=media-libs/grilo-0.3.0:0.3[playlist] |
444 |
- >=media-libs/gstreamer-1.6.0:1.0 |
445 |
- >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango] |
446 |
- media-libs/gst-plugins-good:1.0 |
447 |
- |
448 |
- x11-libs/libX11 |
449 |
- |
450 |
gnome-base/gnome-desktop:3= |
451 |
gnome-base/gsettings-desktop-schemas |
452 |
+ >=x11-libs/cairo-1.14 |
453 |
+ x11-libs/gdk-pixbuf:2 |
454 |
+ >=dev-libs/gobject-introspection-1.54:= |
455 |
|
456 |
- cdr? ( |
457 |
- >=dev-libs/libxml2-2.6:2 |
458 |
- >=x11-libs/gtk+-3.19.4:3[X] |
459 |
- ) |
460 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) |
461 |
- lirc? ( app-misc/lirc ) |
462 |
- nautilus? ( >=gnome-base/nautilus-2.91.3 ) |
463 |
python? ( |
464 |
${PYTHON_DEPS} |
465 |
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] ) |
466 |
+ $(python_gen_cond_dep ' |
467 |
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}] |
468 |
+ ') |
469 |
+ ) |
470 |
" |
471 |
-RDEPEND="${COMMON_DEPEND} |
472 |
+RDEPEND="${DEPEND} |
473 |
media-plugins/grilo-plugins:0.3 |
474 |
media-plugins/gst-plugins-meta:1.0 |
475 |
media-plugins/gst-plugins-taglib:1.0 |
476 |
x11-themes/adwaita-icon-theme |
477 |
python? ( |
478 |
- >=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}] |
479 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
480 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
481 |
- >=x11-libs/gtk+-3.5.2:3[introspection] ) |
482 |
+ x11-libs/pango[introspection] |
483 |
+ >=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}] |
484 |
+ $(python_gen_cond_dep ' |
485 |
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] |
486 |
+ ') |
487 |
+ ) |
488 |
" |
489 |
-# libxml2+gdk-pixbuf required for glib-compile-resources |
490 |
-DEPEND="${COMMON_DEPEND} |
491 |
- app-text/docbook-xml-dtd:4.5 |
492 |
- app-text/yelp-tools |
493 |
- >=dev-libs/libxml2-2.6:2 |
494 |
- >=dev-util/meson-0.44 |
495 |
- >=dev-util/intltool-0.50.1 |
496 |
+BDEPEND=" |
497 |
+ dev-lang/perl |
498 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.14 |
499 |
+ app-text/docbook-xml-dtd:4.5 ) |
500 |
+ dev-util/glib-utils |
501 |
+ dev-util/itstool |
502 |
>=sys-devel/gettext-0.19.8 |
503 |
virtual/pkgconfig |
504 |
x11-base/xorg-proto |
505 |
- vala? ( $(vala_depend) ) |
506 |
" |
507 |
-# docbook-xml-dtd is needed for user doc |
508 |
+# perl for pod2man |
509 |
# Prevent dev-python/pylint dep, bug #482538 |
510 |
|
511 |
PATCHES=( |
512 |
- # Fix some typos in meson.build files |
513 |
- "${FILESDIR}"/3.26-meson-fixes.patch |
514 |
- # Do not force all plugins |
515 |
- "${FILESDIR}"/3.26-control-plugins.patch |
516 |
- # Do not force pylint with USE=python |
517 |
- "${FILESDIR}"/3.26-skip-pylint-check.patch |
518 |
- # Allow disabling calls to gst-inspect (sandbox issue) |
519 |
- "${FILESDIR}"/3.26-gst-inspect-sandbox.patch |
520 |
+ "${FILESDIR}"/3.34.1-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue) |
521 |
) |
522 |
|
523 |
pkg_setup() { |
524 |
@@ -105,45 +90,39 @@ pkg_setup() { |
525 |
} |
526 |
|
527 |
src_prepare() { |
528 |
- vala_src_prepare |
529 |
- gnome-meson_src_prepare |
530 |
+ # Drop pointless samplepython plugin from build |
531 |
+ sed -e '/samplepython/d' -i src/plugins/meson.build || die |
532 |
+ xdg_src_prepare |
533 |
} |
534 |
|
535 |
src_configure() { |
536 |
- # Disabled: sample-python, sample-vala, zeitgeist-dp |
537 |
- # brasero-disc-recorder and gromit depend on GTK+ X11 backend and could be made optional |
538 |
- # if totem itself didn't depend on it |
539 |
- local plugins="apple-trailers,autoload-subtitles" |
540 |
- plugins+=",im-status,media-player-keys,ontop" |
541 |
- plugins+=",properties,recent,screensaver,screenshot" |
542 |
- plugins+=",skipto,variable-rate,vimeo" |
543 |
- use cdr && plugins+=",brasero-disc-recorder" |
544 |
- use lirc && plugins+=",lirc" |
545 |
- use nautilus && plugins+=",save-file" |
546 |
- use python && plugins+=",dbusservice,pythonconsole,opensubtitles" |
547 |
- use vala && plugins+=",rotation" |
548 |
- plugins+=",gromit" |
549 |
- |
550 |
- # pylint is checked unconditionally, but is only used for make check |
551 |
- # appstream-util overriding necessary until upstream fixes their macro |
552 |
- # to respect configure switch |
553 |
- gnome-meson_src_configure \ |
554 |
- -Denable-easy-codec-installation=yes \ |
555 |
- -Denable-gtk-doc=false \ |
556 |
- -Denable-introspection=$(usex introspection yes no) \ |
557 |
- -Denable-nautilus=$(usex nautilus yes no) \ |
558 |
- -Denable-python=$(usex python yes no) \ |
559 |
- -Denable-vala=$(usex vala yes no) \ |
560 |
- -Dgst-inspect=false \ |
561 |
- -Dwith-plugins=${plugins} |
562 |
+ local emesonargs=( |
563 |
+ -Denable-easy-codec-installation=yes |
564 |
+ -Denable-python=$(usex python yes no) |
565 |
+ -Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python |
566 |
+ $(meson_use gtk-doc enable-gtk-doc) |
567 |
+ -Dgst-inspect=false |
568 |
+ ) |
569 |
+ meson_src_configure |
570 |
} |
571 |
|
572 |
src_install() { |
573 |
- gnome-meson_src_install |
574 |
+ meson_src_install |
575 |
if use python ; then |
576 |
- local plugin |
577 |
- for plugin in dbusservice pythonconsole opensubtitles ; do |
578 |
- python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/${plugin} |
579 |
- done |
580 |
+ python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/ |
581 |
fi |
582 |
} |
583 |
+ |
584 |
+pkg_postinst() { |
585 |
+ xdg_pkg_postinst |
586 |
+ gnome2_schemas_update |
587 |
+} |
588 |
+ |
589 |
+pkg_postrm() { |
590 |
+ xdg_pkg_postrm |
591 |
+ gnome2_schemas_update |
592 |
+} |
593 |
+ |
594 |
+src_test() { |
595 |
+ virtx meson_src_test |
596 |
+} |