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/files/, media-libs/phonon-vlc/
Date: Tue, 27 Feb 2018 09:31:31
Message-Id: 1519723874.b9984bee2edc819f61a616a8e71fd9ff43842f07.asturm@gentoo
1 commit: b9984bee2edc819f61a616a8e71fd9ff43842f07
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 27 09:31:14 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 27 09:31:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9984bee
7
8 media-libs/phonon-vlc: Drop old
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 media-libs/phonon-vlc/Manifest | 1 -
13 .../files/phonon-vlc-0.10.0-pre-vlc-3.patch | 34 ------------------
14 media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild | 41 ----------------------
15 3 files changed, 76 deletions(-)
16
17 diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
18 index 89e5113ad9e..707598f4ce6 100644
19 --- a/media-libs/phonon-vlc/Manifest
20 +++ b/media-libs/phonon-vlc/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST phonon-backend-vlc-0.10.0.tar.xz 61080 BLAKE2B 1397bff2791b6baf1de2967aeb5ee1a6d71dcd68cff937bd9d4e2de51d36d8f95db3095a8cbb0786c78b420d3b4a1d0e2e102051cc6458a2267aeea3b2e6aec5 SHA512 cfe2050ac4c9b43fdf33b3cee9d60e5f1e5702aed4b4f14ec915f84578dba08dd5375c2fba6d19817c34197575e29eb9ed5fd816ea753e2bc124d97ea71b0bc8
23 DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
24 DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa
25
26 diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
27 deleted file mode 100644
28 index c670da35738..00000000000
29 --- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
30 +++ /dev/null
31 @@ -1,34 +0,0 @@
32 -From ea4d78ac3fc01f33bc2c0f3fb4a44a4103196da5 Mon Sep 17 00:00:00 2001
33 -From: Antonio Rojas <arojas@×××××××××.org>
34 -Date: Fri, 23 Feb 2018 21:51:45 +0100
35 -Subject: Fix build with VLC<3
36 -
37 -libvlc_title_description_t and libvlc_chapter_description_t are not defined in vlc < 3
38 -
39 -Differential Revision: https://phabricator.kde.org/D10775
40 ----
41 - src/mediaplayer.h | 2 ++
42 - 1 file changed, 2 insertions(+)
43 -
44 -diff --git a/src/mediaplayer.h b/src/mediaplayer.h
45 -index 9d413d4..cd847db 100644
46 ---- a/src/mediaplayer.h
47 -+++ b/src/mediaplayer.h
48 -@@ -62,11 +62,13 @@ private:
49 - unsigned int m_size;
50 - };
51 -
52 -+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0))
53 - typedef Descriptions<libvlc_title_description_t> TitleDescriptions;
54 - typedef QSharedPointer<const TitleDescriptions> SharedTitleDescriptions;
55 -
56 - typedef Descriptions<libvlc_chapter_description_t> ChapterDescriptions;
57 - typedef QSharedPointer<ChapterDescriptions> SharedChapterDescriptions;
58 -+#endif
59 -
60 - class MediaPlayer : public QObject
61 - {
62 ---
63 -cgit v0.11.2
64 -
65 -
66
67 diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
68 deleted file mode 100644
69 index 6c36bbe135d..00000000000
70 --- a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
71 +++ /dev/null
72 @@ -1,41 +0,0 @@
73 -# Copyright 1999-2018 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -
76 -EAPI=6
77 -
78 -MY_PN="phonon-backend-vlc"
79 -
80 -if [[ ${PV} != *9999* ]]; then
81 - SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
82 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
83 -else
84 - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
85 - inherit git-r3
86 -fi
87 -
88 -inherit cmake-utils
89 -
90 -DESCRIPTION="Phonon VLC backend"
91 -HOMEPAGE="https://phonon.kde.org/"
92 -
93 -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
94 -SLOT="0"
95 -IUSE="debug"
96 -
97 -RDEPEND="
98 - dev-qt/qtcore:5
99 - dev-qt/qtgui:5
100 - dev-qt/qtwidgets:5
101 - >=media-libs/phonon-4.10.0
102 - media-video/vlc:=[dbus,ogg,vorbis]
103 -"
104 -DEPEND="${RDEPEND}
105 - virtual/pkgconfig
106 -"
107 -
108 -PATCHES=( "${FILESDIR}/${P}-pre-vlc-3.patch" )
109 -
110 -src_configure() {
111 - local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
112 - cmake-utils_src_configure
113 -}