diff options
Diffstat (limited to 'media-video/totem')
-rw-r--r-- | media-video/totem/Manifest | 8 | ||||
-rw-r--r-- | media-video/totem/files/3.30.0-control-plugins.patch | 199 | ||||
-rw-r--r-- | media-video/totem/files/3.30.0-vala-errormsg.patch | 31 | ||||
-rw-r--r-- | media-video/totem/metadata.xml | 2 | ||||
-rw-r--r-- | media-video/totem/totem-3.30.0.ebuild | 137 | ||||
-rw-r--r-- | media-video/totem/totem-3.32.1-r1.ebuild | 4 |
6 files changed, 4 insertions, 377 deletions
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index 2d272fa6d211..558dc9d96dee 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,9 +1,5 @@ AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b -AUX 3.30.0-control-plugins.patch 7048 BLAKE2B 6c40cfaa9b831ffd054ddf09482036d6b7c66693814fc798ec9e0f41a95163e3cad6474c346e55349172f6189d257c7630e6b51bf4c58c42212cc6f888ba6754 SHA512 410d78444b2f27b61e5a242ba9c4d93ab9eff02f7923129c286b2c482a36c8b799c53655a4e7bcf6ec89252537c7a62269296917378efcc015aa60bf7930705b -AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cbba583ec4c9bc7c7b05b18866e6b30f6ba140461dbaab4b9a56fd50e37a940a61c4d62b7b5132f97b1969e7a723f SHA512 f19bc0bc9e592f0e32cfb776d631acc9aef54d107ae22acf9ce29036dec0abf9b153c5a1a2e3c99e3f0d27d9ee504e4bf9dd91567318be1966f4f3fc157c16ce AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7 -DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67 -EBUILD totem-3.30.0.ebuild 3759 BLAKE2B 0889c571bb3129c65529e99fed4d8366b46751a0e815ad26d71e6f4ed3c272140c1c9ecded6a7f5fc881353d17de10722c56975413b2c05098686fea04fdb2e3 SHA512 9e1e598f00e5a33c0a51d5246f9a6dc38e4a47a8239021546c1bff0049970a5cf5e3c2ec9bf59cc217b9f13630ad40694b749fb84339b6cbbf58495e318bf59c -EBUILD totem-3.32.1-r1.ebuild 3103 BLAKE2B 200bd4012fa7d3563aad00a3907860b9fcc2427f075c4750f6e37553d550919c267587bb422b58ca955fbcb04650e12064e3dbe250caa2629c8f40ba61599b0a SHA512 5d1ce68941374b0f3de8a531dc05b3334a4d0c47b6d356316886b74f9bd0d9721c429a280fb473505218200f9f4ff9966c2fd9de53578fbf193eee07e62fa179 -MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be +EBUILD totem-3.32.1-r1.ebuild 3101 BLAKE2B 23892d3bc99c6de484934f5282f123774b99bffcbac1fdb0e0676af8c6565bd4189b6b3e6a52a7792965fd9e15d1b3e9c26875f8159efc3436e6057211c4ea66 SHA512 778619ac4ca20f3eb9197c0af9120dbbdf3225bfd9dec605a015d771cc19400f756eff9df2713c24dd0b3ce8fa5e5088bcf37063bafb00ccc0d00f85ac1dee0c +MISC metadata.xml 1137 BLAKE2B 4ea20f132e41d6a3d0ca93b5e104445e79ca5db7dbee4e64bdd017f1d5ed3ad3334cdb5ec7dbe1115633698a4ca3faa53ff2e9cffb06d9b83cc81d4955036a36 SHA512 382661d42acb8bc1b8831da810aba91127992530dd6b7677a23005355d70b9c09ad31e37daedbe63a772ac4f34db52b72a244be8977d32cc5f78c4bc78a18e9b diff --git a/media-video/totem/files/3.30.0-control-plugins.patch b/media-video/totem/files/3.30.0-control-plugins.patch deleted file mode 100644 index 4d57ad0971c0..000000000000 --- a/media-video/totem/files/3.30.0-control-plugins.patch +++ /dev/null @@ -1,199 +0,0 @@ -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.build | 2 +- - meson_options.txt | 28 ++++++++++++++++++++- - src/plugins/meson.build | 56 ++++++++++++++++++++++++++++++----------- - 3 files changed, 69 insertions(+), 17 deletions(-) - -diff --git a/meson.build b/meson.build -index 9c4797dd..aa91ae10 100644 ---- a/meson.build -+++ b/meson.build -@@ -3,7 +3,7 @@ project( - version: '3.30.0', - license: 'GPL2+ with exception', - default_options: 'buildtype=debugoptimized', -- meson_version: '>= 0.43.0' -+ meson_version: '>= 0.44.0' - ) - - totem_version = meson.project_version() -diff --git a/meson_options.txt b/meson_options.txt -index 3b6ff67b..6e056952 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,7 +1,33 @@ - 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('enable-vala', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'whether Vala plugin support is requested') --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', -+ 'gromit', -+ 'im-status', -+ 'lirc', -+ 'media-player-keys', -+ 'ontop', -+ 'opensubtitles', -+ 'properties', -+ 'pythonconsole', -+ 'recent', -+ 'rotation', -+ 'sample-vala', -+ 'samplepython', -+ 'save-file', -+ 'screensaver', -+ 'screenshot', -+ 'skipto', -+ 'variable-rate', -+ 'vimeo', -+ 'zeitgeist-dp' -+], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)') - option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'compile the nautilus plugin') - 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') -diff --git a/src/plugins/meson.build b/src/plugins/meson.build -index 95af6485..289ba811 100644 ---- a/src/plugins/meson.build -+++ b/src/plugins/meson.build -@@ -41,8 +41,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', -@@ -56,26 +56,38 @@ 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 - -- plugin_error = (plugins_option == 'all') -+ if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('gromit') -+ gdk_targets = gtk_dep.get_pkgconfig_variable('targets') -+ else -+ gdk_targets = [] -+ endif - -- gdk_targets = gtk_dep.get_pkgconfig_variable('targets') - if gdk_targets.contains('x11') - plugins += 'gromit' - else - str = 'the gromit plugin is not supported on non-X11 targets' -- if plugin_error -+ if plugins_option.contains('all') or plugins_option.contains('gromit') - error(str) - endif - message(str) - endif - -- lirc_dep = dependency('lirc', required: false) -+ 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 -+ - 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) -@@ -84,33 +96,38 @@ 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_nautilus -+ if have_nautilus and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('save-file')) - plugins += 'save-file' - else - str = 'you need libnautilus-extension to use the save-file plugin' -- if plugin_error -+ if plugins_option.contains('all') or plugins_option.contains('save-file') - 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 - - if have_vala -@@ -129,17 +146,26 @@ if plugins_option != 'none' - '--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version) - ] - -- plugins += [ -+ foreach plugin: [ - 'rotation', - 'sample-vala' - ] -+ 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('zeitgeist-dp') -+ zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false) -+ else -+ zeitgeist_dep = disabler() -+ endif - -- zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false) - if zeitgeist_dep.found() - plugins += 'zeitgeist-dp' - else - str = 'you need zeitgeist-2.0 >= 0.9.12 to use the zeitgeist-dp plugin' -- if plugin_error -+ if plugins_option.contains('all') or plugins_option.contains('zeitgeist-dp') - error(str) - endif - message(str) --- -2.17.1 - diff --git a/media-video/totem/files/3.30.0-vala-errormsg.patch b/media-video/totem/files/3.30.0-vala-errormsg.patch deleted file mode 100644 index 37816784ded8..000000000000 --- a/media-video/totem/files/3.30.0-vala-errormsg.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4fba51c82d855426ad73f8215d0ed7bfdfa4fae2 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 15 Dec 2018 20:50:34 +0200 -Subject: [PATCH] build: Fix error message with -Denable-vala without vala - found - -Fixes -ERROR: Unknown variable "vala_options" -to -ERROR: Problem encountered: you need vala >= 0.14.1 installed to use vala plugins -by correcting a typo. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c0679d25..5647376f 100644 ---- a/meson.build -+++ b/meson.build -@@ -230,7 +230,7 @@ if vala_option != 'no' - endif - - if not have_vala -- if vala_options == 'yes' or introspection_option == 'yes' -+ if vala_option == 'yes' or introspection_option == 'yes' - error(str) - endif - message(str) --- -2.17.0 - diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml index 1daea3f76b23..39dcd3765107 100644 --- a/media-video/totem/metadata.xml +++ b/media-video/totem/metadata.xml @@ -19,8 +19,6 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen <use> <flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag> - <flag name="nautilus">Enable the nautilus extension</flag> <flag name="python">Build <pkg>dev-lang/python</pkg> using plugins (dbusservice for notifications and MPRIS control, interactive python console and opensubtitles lookup)</flag> - <flag name="vala">Build the rotation plugin, which allows videos to be rotated if they are in the wrong orientation</flag> </use> </pkgmetadata> diff --git a/media-video/totem/totem-3.30.0.ebuild b/media-video/totem/totem-3.30.0.ebuild deleted file mode 100644 index 9506455784d7..000000000000 --- a/media-video/totem/totem-3.30.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6} ) -PYTHON_REQ_USE="threads" - -inherit gnome.org gnome2-utils meson vala 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 nautilus +python test vala" -RESTRICT="!test? ( test )" -# see bug #359379 -REQUIRED_USE=" - python? ( introspection ${PYTHON_REQUIRED_USE} ) - vala? ( introspection ) -" - -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" - -# FIXME: -# Runtime dependency on gnome-session-2.91 -COMMON_DEPEND=" - >=dev-libs/glib-2.43.4:2 - >=x11-libs/gtk+-3.19.4:3[X,introspection?] - >=media-libs/gstreamer-1.6.0:1.0 - >=media-libs/gst-plugins-base-1.6.0:1.0[X,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/libX11 - >=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 ) - nautilus? ( >=gnome-base/nautilus-2.91.3 ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] ) -" -RDEPEND="${COMMON_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_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] ) -" -DEPEND="${COMMON_DEPEND} - dev-lang/perl - app-text/docbook-xml-dtd:4.5 - gtk-doc? ( >=dev-util/gtk-doc-1.14 ) - dev-util/glib-utils - dev-util/itstool - >=dev-util/intltool-0.50.1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - vala? ( $(vala_depend) ) -" -# perl for pod2man -# docbook-xml-dtd is needed for user doc -# Prevent dev-python/pylint dep, bug #482538 - -PATCHES=( - "${FILESDIR}"/${PV}-vala-errormsg.patch - "${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_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - # Disabled: sample-python, sample-vala, zeitgeist-dp - # brasero-disc-recorder and gromit require gtk+[X], but totem itself does - # for now still too, so no point in optionality based on that yet. - local plugins="apple-trailers,autoload-subtitles" - plugins+=",im-status,gromit,media-player-keys,ontop" - plugins+=",properties,recent,screensaver,screenshot" - plugins+=",skipto,variable-rate,vimeo" - use cdr && plugins+=",brasero-disc-recorder" - use lirc && plugins+=",lirc" - use nautilus && plugins+=",save-file" - use python && plugins+=",dbusservice,pythonconsole,opensubtitles" - use vala && plugins+=",rotation" - - local emesonargs=( - -Denable-easy-codec-installation=yes - -Denable-python=$(usex python yes no) - -Denable-vala=$(usex vala yes no) - -Dwith-plugins=${plugins} - -Denable-nautilus=$(usex nautilus yes no) - $(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_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild index e3a3030b0181..0a1b3d38e9a1 100644 --- a/media-video/totem/totem-3.32.1-r1.ebuild +++ b/media-video/totem/totem-3.32.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)" inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1 |