[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/, media-libs/phonon-vlc/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/, media-libs/phonon-vlc/files/

[Andreas Sturmlechner]

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 <sitter@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
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/, media-libs/phonon-vlc/files/

[Andreas Sturmlechner]

commit:     88c540678a467264e346c93731c6b2669324faf3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  2 17:21:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 05:03:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c54067

media-libs/phonon-vlc: Drop 0.10.2

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/Manifest                     |  1 -
 .../files/phonon-vlc-0.10.1-qt-5.11.patch          | 32 ----------------
 media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild     | 44 ----------------------
 3 files changed, 77 deletions(-)

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 58aecd23397..6204601f199 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,2 +1 @@
-DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
 DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e

diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
deleted file mode 100644
index b87a1e17577..00000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 23:16:52 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
-Also replace automoc4_add_library with add_library.
----
- src/CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 47427b2..f91975e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -80,8 +80,12 @@ if(APPLE)
-         video/mac/vlcmacwidget.mm)
- endif(APPLE)
- 
--automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
--qt5_use_modules(phonon_vlc Core Widgets)
-+add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets)
-+else()
-+    target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+endif()
- 
- set_target_properties(phonon_vlc PROPERTIES
-     PREFIX ""
--- 
-2.17.0
-

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
deleted file mode 100644
index 9480384f2a5..00000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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}/${PN}-0.10.1-qt-5.11.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}