diff options
author | Mart Raudsepp <leio@gentoo.org> | 2020-04-25 23:02:49 +0300 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2020-04-25 23:17:28 +0300 |
commit | b399cfb53be34d480a8fdd6e9290d7eb91edc8fd (patch) | |
tree | 689a29070b547de64b85a3c7cfd89934048cf991 /media-video/totem/files | |
parent | media-video/cheese: remove old (diff) | |
download | gentoo-b399cfb53be34d480a8fdd6e9290d7eb91edc8fd.tar.gz gentoo-b399cfb53be34d480a8fdd6e9290d7eb91edc8fd.tar.bz2 gentoo-b399cfb53be34d480a8fdd6e9290d7eb91edc8fd.zip |
media-video/totem: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'media-video/totem/files')
-rw-r--r-- | media-video/totem/files/3.26-gst-inspect-sandbox.patch | 42 | ||||
-rw-r--r-- | media-video/totem/files/3.32.1-control-plugins.patch | 124 |
2 files changed, 0 insertions, 166 deletions
diff --git a/media-video/totem/files/3.26-gst-inspect-sandbox.patch b/media-video/totem/files/3.26-gst-inspect-sandbox.patch deleted file mode 100644 index 016368a69b97..000000000000 --- a/media-video/totem/files/3.26-gst-inspect-sandbox.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 742b64b7a74eabd67344ef1cc260427dc402588f Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Thu, 7 Jun 2018 23:47:48 +0200 -Subject: [PATCH 5/5] Make gst-inspect calls optional at build-time - -Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed ---- - meson_options.txt | 1 + - src/backend/meson.build | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index 6e056952..631b8cca 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -32,3 +32,4 @@ option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: - option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension') - option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') - option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)') -+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins') -diff --git a/src/backend/meson.build b/src/backend/meson.build -index 28c8e123..55037a6a 100644 ---- a/src/backend/meson.build -+++ b/src/backend/meson.build -@@ -1,5 +1,6 @@ - backend_inc = include_directories('.') - -+if get_option('gst-inspect') - gst_inspect = find_program( - 'gst-inspect-1.0', - join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'), -@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins - assert(r.returncode() == 0, - 'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.') - endforeach -+endif - - sources = files( - 'bacon-time-label.c', --- -2.17.0 - diff --git a/media-video/totem/files/3.32.1-control-plugins.patch b/media-video/totem/files/3.32.1-control-plugins.patch deleted file mode 100644 index 2abcd75bac59..000000000000 --- a/media-video/totem/files/3.32.1-control-plugins.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 4944c498633f913c07a2680563a64d47c233630d Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <sobhan@gentoo.org> -Date: Sun, 14 Jul 2019 20:18:45 -0400 -Subject: [PATCH] 3.32.1 control plugins - -update From 5bdfac8a4a34e3edec05439fa3cd5544e0515e24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Sun, 10 Jun 2018 10:09:16 +0200 -Subject: [PATCH] Allow full control over which plugins are built ---- - meson_options.txt | 24 +++++++++++++++++++++++- - src/plugins/meson.build | 30 +++++++++++++++++++++--------- - 2 files changed, 44 insertions(+), 10 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index e1c5909..085380e 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,27 @@ - option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer') - option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support') --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)') -+option('with-plugins', type: 'array', choices: [ -+ 'all', -+ 'auto', -+ 'apple-trailers', -+ 'autoload-subtitles', -+ 'brasero-disc-recorder', -+ 'dbusservice', -+ 'im-status', -+ 'lirc', -+ 'media-player-keys', -+ 'opensubtitles', -+ 'properties', -+ 'pythonconsole', -+ 'recent', -+ 'rotation', -+ 'samplepython', -+ 'save-file', -+ 'screensaver', -+ 'screenshot', -+ 'skipto', -+ 'variable-rate', -+ 'vimeo', -+], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)') - option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') - option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)') -diff --git a/src/plugins/meson.build b/src/plugins/meson.build -index 552cc22..cddda3f 100644 ---- a/src/plugins/meson.build -+++ b/src/plugins/meson.build -@@ -37,8 +37,8 @@ allowed_plugins = [ - plugins = [] - - plugins_option = get_option('with-plugins') --if plugins_option != 'none' -- plugins += [ -+if plugins_option.length() > 0 -+ foreach plugin: [ - 'apple-trailers', - 'autoload-subtitles', - 'im-status', -@@ -53,15 +53,22 @@ if plugins_option != 'none' - 'variable-rate', - 'vimeo' - ] -+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin) -+ plugins += plugin -+ endif -+ endforeach -+ -+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('lirc') -+ lirc_dep = dependency('lirc', required: false) -+ else -+ lirc_dep = disabler() -+ endif - -- plugin_error = (plugins_option == 'all') -- -- lirc_dep = dependency('lirc', required: false) - if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h') - plugins += 'lirc' - else - str = 'you need lirc_client installed for the lirc plugin' -- if plugin_error -+ if plugins_option.contains('all') or plugins_option.contains('lirc') - error(str) - endif - message(str) -@@ -70,23 +77,28 @@ if plugins_option != 'none' - libxml_req_version = '>= 2.6.0' - libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) - gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false) -- if libxml_dep.found() and gtk_x11_dep.found() -+ 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')) - plugins += 'brasero-disc-recorder' - else - str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin' -- if plugin_error -+ if plugins_option.contains('all') or plugins_option.contains('brasero-disc-recorder') - error(str) - endif - message(str) - endif - - if have_python -- plugins += [ -+ foreach plugin: [ - 'dbusservice', - 'opensubtitles', - 'pythonconsole', - 'samplepython' - ] -+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin) -+ plugins += plugin -+ endif -+ endforeach -+ - endif - endif - --- -2.22.0 - |