commit: 243fcfbf47eab7e0d27322146b9f9f99f999ea02 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 9 18:42:29 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 9 18:42:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243fcfbf
media-libs/phonon-vlc: Drop 0.10.1-r1 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../phonon-vlc-0.10.1-screensaver-inhibitor.patch | 31 --------------- media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild | 45 ---------------------- 2 files changed, 76 deletions(-) diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch deleted file mode 100644 index 1e482a027e5..00000000000 --- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cb7c2b74b25380b49b2bb7bbfb7ac3fb37f1cd28 Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sit...@kde.org> -Date: Tue, 9 Oct 2018 13:22:30 +0200 -Subject: disable the builtin vlc screen saver inhibitor - -from a phonon perspective we expect the application to inhibit. -additionally destructing a player may attempt to uninhibit and block -on dbus not responding because the call is too late in the lifecycle or -to an unresponsive remote (all of which the app would ordinarily -deal with) ---- - src/utils/libvlc.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp -index 39e831c..3a33d9a 100644 ---- a/src/utils/libvlc.cpp -+++ b/src/utils/libvlc.cpp -@@ -90,6 +90,10 @@ bool LibVLC::init() - args << "--no-xlib"; - // Do not preload services discovery modules, we don't use them. - args << "--services-discovery=''"; -+ // The application is meant to manage this. Also, using the builtin -+ // inhibitor may cause problems on shutdown if VLC tries to uninhibit too -+ // late in the application lifecycle. -+ args << "--no-disable-screensaver"; - // Allow multiple starts (one gets to wonder whether that makes a difference). - #if !defined(Q_OS_MAC) && (defined(Q_OS_WIN) || !defined(PHONON_NO_DBUS)) - args << "--no-one-instance"; --- -cgit v1.1 diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild deleted file mode 100644 index 9c4a65c6754..00000000000 --- a/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="phonon-backend-vlc" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -else - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) - inherit git-r3 -fi - -inherit cmake-utils - -DESCRIPTION="Phonon VLC backend" -HOMEPAGE="https://phonon.kde.org/" - -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" -SLOT="0" -IUSE="debug" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - >=media-libs/phonon-4.10.0 - media-video/vlc:=[dbus,ogg,vorbis] -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-screensaver-inhibitor.patch" -) - -src_configure() { - local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) - cmake-utils_src_configure -}