Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/, media-libs/phonon-vlc/files/
Date: Tue, 03 Dec 2019 05:04:21
Message-Id: 1575349389.88c540678a467264e346c93731c6b2669324faf3.asturm@gentoo
1 commit: 88c540678a467264e346c93731c6b2669324faf3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 2 17:21:05 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 3 05:03:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c54067
7
8 media-libs/phonon-vlc: Drop 0.10.2
9
10 Package-Manager: Portage-2.3.80, Repoman-2.3.19
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/phonon-vlc/Manifest | 1 -
14 .../files/phonon-vlc-0.10.1-qt-5.11.patch | 32 ----------------
15 media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild | 44 ----------------------
16 3 files changed, 77 deletions(-)
17
18 diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
19 index 58aecd23397..6204601f199 100644
20 --- a/media-libs/phonon-vlc/Manifest
21 +++ b/media-libs/phonon-vlc/Manifest
22 @@ -1,2 +1 @@
23 -DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
24 DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e
25
26 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
27 deleted file mode 100644
28 index b87a1e17577..00000000000
29 --- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
30 +++ /dev/null
31 @@ -1,32 +0,0 @@
32 -From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001
33 -From: Andreas Sturmlechner <asturm@g.o>
34 -Date: Fri, 13 Apr 2018 23:16:52 +0200
35 -Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
36 -
37 -Also replace automoc4_add_library with add_library.
38 ----
39 - src/CMakeLists.txt | 8 ++++++--
40 - 1 file changed, 6 insertions(+), 2 deletions(-)
41 -
42 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
43 -index 47427b2..f91975e 100644
44 ---- a/src/CMakeLists.txt
45 -+++ b/src/CMakeLists.txt
46 -@@ -80,8 +80,12 @@ if(APPLE)
47 - video/mac/vlcmacwidget.mm)
48 - endif(APPLE)
49 -
50 --automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
51 --qt5_use_modules(phonon_vlc Core Widgets)
52 -+add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
53 -+if(PHONON_BUILD_PHONON4QT5)
54 -+ target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets)
55 -+else()
56 -+ target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
57 -+endif()
58 -
59 - set_target_properties(phonon_vlc PROPERTIES
60 - PREFIX ""
61 ---
62 -2.17.0
63 -
64
65 diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
66 deleted file mode 100644
67 index 9480384f2a5..00000000000
68 --- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
69 +++ /dev/null
70 @@ -1,44 +0,0 @@
71 -# Copyright 1999-2019 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=7
75 -
76 -MY_PN="phonon-backend-vlc"
77 -
78 -if [[ ${PV} != *9999* ]]; then
79 - SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
80 - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
81 -else
82 - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
83 - inherit git-r3
84 -fi
85 -
86 -inherit cmake-utils
87 -
88 -DESCRIPTION="Phonon VLC backend"
89 -HOMEPAGE="https://phonon.kde.org/"
90 -
91 -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
92 -SLOT="0"
93 -IUSE="debug"
94 -
95 -RDEPEND="
96 - dev-qt/qtcore:5
97 - dev-qt/qtgui:5
98 - dev-qt/qtwidgets:5
99 - >=media-libs/phonon-4.10.0
100 - media-video/vlc:=[dbus,ogg,vorbis]
101 -"
102 -DEPEND="${RDEPEND}"
103 -BDEPEND="
104 - virtual/pkgconfig
105 -"
106 -
107 -PATCHES=( "${FILESDIR}/${PN}-0.10.1-qt-5.11.patch" )
108 -
109 -S="${WORKDIR}/${MY_PN}-${PV}"
110 -
111 -src_configure() {
112 - local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
113 - cmake-utils_src_configure
114 -}