From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- media-video/totem/Manifest | 6 +- .../totem/files/3.26-gst-inspect-sandbox.patch | 42 ------- .../totem/files/3.32.1-control-plugins.patch | 124 -------------------- media-video/totem/metadata.xml | 2 - media-video/totem/totem-3.32.1-r2.ebuild | 127 --------------------- 5 files changed, 1 insertion(+), 300 deletions(-) delete mode 100644 media-video/totem/files/3.26-gst-inspect-sandbox.patch delete mode 100644 media-video/totem/files/3.32.1-control-plugins.patch delete mode 100644 media-video/totem/totem-3.32.1-r2.ebuild (limited to 'media-video/totem') diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index de479692e9b2..17b4335ecffe 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,8 +1,4 @@ -AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b -AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7 AUX 3.34.1-gst-inspect-sandbox.patch 1828 BLAKE2B 9abd87afc62c784c4e5f79374d0172da0295cee520a9aa3ce2d4a2471f3e94accd7f14746fb93873767a5a11a2c9143b9387bf70295cc792199df62f501f73de SHA512 c312ddee62695b4344917eb2c7cca67284f3c7b24b21f35646f8b315bded9827aec05056fd17eadfe35da3dd876f20fd7b2cadd2141d04843c3c96d5f0346b21 -DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67 DIST totem-3.34.1.tar.xz 2157160 BLAKE2B 9ae9c8f6485c7377af07803c328e8ea3cc6fa80d8e30a7045bd2b50f7bc3d5a12582e5b60d901d22683f89e994c619c26ddb8b0890e343c873d4457fa177786d SHA512 9a3556f5cf522fca29926db185c2e5d25bdb80a25e14d0ba3062a7f15fc3ec40ae9f25752763bc444d4fd82ec2098efd732da662a1b1c5923ec19fde432606db -EBUILD totem-3.32.1-r2.ebuild 3186 BLAKE2B d75f3aa485c4a540306121e78410880135f3e62fe72197840a12a7b54d4558c0d762bb5eabeee1b50db748807fbd450247e71733ad461e8ba50410f29563a0ae SHA512 6663251bb8990af94e942ce6da26e7e10b4100fcf0392bea09e7c97e3e37f4ddf36858379110bef8df239054cef4ea4adb06fb42be641b729df8098824419e75 EBUILD totem-3.34.1.ebuild 2789 BLAKE2B 4c96dd229f6bd75a88d0a7ea0884729937ad666e86ba5511e5e0d3de2ce45342f8414c1516c5f1050eb5987befafa8aa573c1a1652ad95439d80bb788280837e SHA512 ee9104562111d305cf32373aea7d131759e4fd266dcab18658a143ad02822162057384bebbd8c10dad41b5de9ff0139ba1d236c8200cc419a7b545ff6ee2dc49 -MISC metadata.xml 1137 BLAKE2B 4ea20f132e41d6a3d0ca93b5e104445e79ca5db7dbee4e64bdd017f1d5ed3ad3334cdb5ec7dbe1115633698a4ca3faa53ff2e9cffb06d9b83cc81d4955036a36 SHA512 382661d42acb8bc1b8831da810aba91127992530dd6b7677a23005355d70b9c09ad31e37daedbe63a772ac4f34db52b72a244be8977d32cc5f78c4bc78a18e9b +MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625 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 -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 -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?= -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 - diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml index 39dcd3765107..55bc80b2f34f 100644 --- a/media-video/totem/metadata.xml +++ b/media-video/totem/metadata.xml @@ -17,8 +17,6 @@ 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. - Enable support for controlling Totem with a remote control - using app-misc/lirc Build dev-lang/python using plugins (dbusservice for notifications and MPRIS control, interactive python console and opensubtitles lookup) diff --git a/media-video/totem/totem-3.32.1-r2.ebuild b/media-video/totem/totem-3.32.1-r2.ebuild deleted file mode 100644 index dc7f5d912604..000000000000 --- a/media-video/totem/totem-3.32.1-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" - -inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1 - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Videos" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="cdr gtk-doc +introspection lirc +python test" -# see bug #359379 -REQUIRED_USE=" - python? ( introspection ${PYTHON_REQUIRED_USE} ) -" -RESTRICT="!test? ( test )" - -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" - -# FIXME: -# Runtime dependency on gnome-session-2.91 -DEPEND=" - >=dev-libs/glib-2.43.4:2 - >=x11-libs/gtk+-3.19.4:3[introspection?] - >=media-libs/gstreamer-1.6.0:1.0 - >=media-libs/gst-plugins-base-1.6.0:1.0[pango] - >=media-libs/gst-plugins-good-1.6.0:1.0 - >=media-libs/grilo-0.3.0:0.3[playlist] - >=dev-libs/libpeas-1.1.0[gtk] - >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] - >=media-libs/clutter-1.17.3:1.0[gtk] - >=media-libs/clutter-gst-2.99.2:3.0 - >=media-libs/clutter-gtk-1.8.1:1.0 - gnome-base/gnome-desktop:3= - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.14 - x11-libs/gdk-pixbuf:2 - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - - cdr? ( >=dev-libs/libxml2-2.6:2 ) - lirc? ( app-misc/lirc ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - media-plugins/grilo-plugins:0.3 - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-taglib:1.0 - x11-themes/adwaita-icon-theme - python? ( - >=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - ') - ) -" -BDEPEND=" - dev-lang/perl - gtk-doc? ( >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.5 ) - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto -" -# perl for pod2man -# Prevent dev-python/pylint dep, bug #482538 - -PATCHES=( - "${FILESDIR}"/${PV}-control-plugins.patch # Do not force all plugins - "${FILESDIR}"/3.26-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue) -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - # Disabled: samplepython - local plugins="apple-trailers,autoload-subtitles" - plugins+=",im-status,media-player-keys,properties" - plugins+=",recent,rotation,save-file,screensaver,screenshot" - plugins+=",skipto,variable-rate,vimeo" - use cdr && plugins+=",brasero-disc-recorder" - use lirc && plugins+=",lirc" - use python && plugins+=",dbusservice,pythonconsole,opensubtitles" - - local emesonargs=( - -Denable-easy-codec-installation=yes - -Denable-python=$(usex python yes no) - -Dwith-plugins=${plugins} - $(meson_use gtk-doc enable-gtk-doc) - -Denable-introspection=$(usex introspection yes no) - -Dgst-inspect=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - if use python ; then - python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/ - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} - -src_test() { - virtx meson_src_test -} -- cgit v1.2.3