commit: 8f8e4d3a59037e34ed579e70ea9651fcbbd6836a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 19:18:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 19:29:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8e4d3a
media-libs/phonon-vlc: Disable vlc screensaver inhibitor, EAPI-7 bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../phonon-vlc-0.10.1-screensaver-inhibitor.patch | 31 ++++++++++++++++++++++
...vlc-9999.ebuild => phonon-vlc-0.10.1-r1.ebuild} | 12 ++++++---
media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 7 ++---
3 files changed, 44 insertions(+), 6 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
new file mode 100644
index 00000000000..1e482a027e5
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
@@ -0,0 +1,31 @@
+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-9999.ebuild
b/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
similarity index 81%
copy from media-libs/phonon-vlc/phonon-vlc-9999.ebuild
copy to media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
index 18a2f10173c..9c4a65c6754 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="phonon-backend-vlc"
@@ -29,10 +29,16 @@ RDEPEND="
>=media-libs/phonon-4.10.0
media-video/vlc:=[dbus,ogg,vorbis]
"
-DEPEND="${RDEPEND}
+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
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 18a2f10173c..0cf441288e1 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="phonon-backend-vlc"
@@ -29,7 +29,8 @@ RDEPEND="
>=media-libs/phonon-4.10.0
media-video/vlc:=[dbus,ogg,vorbis]
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
