| 1 |
commit: b557506329726b87539a8d9350f6e62b0f10d49c |
| 2 |
Author: Rémi Cardona <remi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 10 08:18:09 2018 +0000 |
| 4 |
Commit: Remi Cardona <remi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 10 08:18:09 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b5575063 |
| 7 |
|
| 8 |
media-video/totem: fix brasero plugin handling |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
Manifest-Sign-Key: 0xE0663D48103108F8 |
| 12 |
|
| 13 |
media-video/totem/files/3.26-control-plugins.patch | 42 +++++++++------------- |
| 14 |
1 file changed, 17 insertions(+), 25 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/totem/files/3.26-control-plugins.patch b/media-video/totem/files/3.26-control-plugins.patch |
| 17 |
index 1a467603..6b4b1a7d 100644 |
| 18 |
--- a/media-video/totem/files/3.26-control-plugins.patch |
| 19 |
+++ b/media-video/totem/files/3.26-control-plugins.patch |
| 20 |
@@ -1,13 +1,13 @@ |
| 21 |
-From e2dd2508e0b356159e00ba90afdfef0b6b623b27 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Gilles Dartiguelongue <eva@g.o> |
| 23 |
-Date: Thu, 7 Jun 2018 22:52:21 +0200 |
| 24 |
-Subject: [PATCH 2/5] Allow full control over which plugins are built |
| 25 |
+From 5bdfac8a4a34e3edec05439fa3cd5544e0515e24 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@g.o> |
| 27 |
+Date: Sun, 10 Jun 2018 10:09:16 +0200 |
| 28 |
+Subject: [PATCH] Allow full control over which plugins are built |
| 29 |
|
| 30 |
--- |
| 31 |
meson.build | 2 +- |
| 32 |
- meson_options.txt | 28 +++++++++++++++++- |
| 33 |
- src/plugins/meson.build | 65 ++++++++++++++++++++++++++++++----------- |
| 34 |
- 3 files changed, 76 insertions(+), 19 deletions(-) |
| 35 |
+ meson_options.txt | 28 ++++++++++++++++++++- |
| 36 |
+ src/plugins/meson.build | 56 ++++++++++++++++++++++++++++++----------- |
| 37 |
+ 3 files changed, 69 insertions(+), 17 deletions(-) |
| 38 |
|
| 39 |
diff --git a/meson.build b/meson.build |
| 40 |
index 9c4797dd..aa91ae10 100644 |
| 41 |
@@ -62,7 +62,7 @@ index 3b6ff67b..6e056952 100644 |
| 42 |
option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension') |
| 43 |
option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') |
| 44 |
diff --git a/src/plugins/meson.build b/src/plugins/meson.build |
| 45 |
-index 95af6485..20134952 100644 |
| 46 |
+index 95af6485..289ba811 100644 |
| 47 |
--- a/src/plugins/meson.build |
| 48 |
+++ b/src/plugins/meson.build |
| 49 |
@@ -41,8 +41,8 @@ allowed_plugins = [ |
| 50 |
@@ -76,7 +76,7 @@ index 95af6485..20134952 100644 |
| 51 |
'apple-trailers', |
| 52 |
'autoload-subtitles', |
| 53 |
'im-status', |
| 54 |
-@@ -56,61 +56,83 @@ if plugins_option != 'none' |
| 55 |
+@@ -56,26 +56,38 @@ if plugins_option != 'none' |
| 56 |
'variable-rate', |
| 57 |
'vimeo' |
| 58 |
] |
| 59 |
@@ -120,21 +120,13 @@ index 95af6485..20134952 100644 |
| 60 |
error(str) |
| 61 |
endif |
| 62 |
message(str) |
| 63 |
- endif |
| 64 |
- |
| 65 |
-- libxml_req_version = '>= 2.6.0' |
| 66 |
-- libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) |
| 67 |
-- gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false) |
| 68 |
-+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('brasero-disc-recorder') |
| 69 |
-+ libxml_req_version = '>= 2.6.0' |
| 70 |
-+ libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) |
| 71 |
-+ gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false) |
| 72 |
-+ else |
| 73 |
-+ libxml_dep = disabler() |
| 74 |
-+ gtk_x11_dep = disabler() |
| 75 |
-+ endif |
| 76 |
+@@ -84,33 +96,38 @@ if plugins_option != 'none' |
| 77 |
+ libxml_req_version = '>= 2.6.0' |
| 78 |
+ libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) |
| 79 |
+ gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false) |
| 80 |
+- if libxml_dep.found() and gtk_x11_dep.found() |
| 81 |
+ |
| 82 |
- if libxml_dep.found() and gtk_x11_dep.found() |
| 83 |
++ 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')) |
| 84 |
plugins += 'brasero-disc-recorder' |
| 85 |
else |
| 86 |
str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin' |
| 87 |
@@ -172,7 +164,7 @@ index 95af6485..20134952 100644 |
| 88 |
endif |
| 89 |
|
| 90 |
if have_vala |
| 91 |
-@@ -129,17 +151,26 @@ if plugins_option != 'none' |
| 92 |
+@@ -129,17 +146,26 @@ if plugins_option != 'none' |
| 93 |
'--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version) |
| 94 |
] |
| 95 |
|
| 96 |
@@ -203,5 +195,5 @@ index 95af6485..20134952 100644 |
| 97 |
endif |
| 98 |
message(str) |
| 99 |
-- |
| 100 |
-2.17.0 |
| 101 |
+2.17.1 |
Archives