1 |
commit: 3c7bc4f6c5fe8e362e315e30a98ddb7177ea839e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 27 19:29:35 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 21:42:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7bc4f6 |
7 |
|
8 |
media-libs/phonon: Drop 4.10.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
media-libs/phonon/Manifest | 1 - |
13 |
.../phonon/files/phonon-4.10.0-qt-5.11.patch | 190 --------------------- |
14 |
media-libs/phonon/phonon-4.10.0.ebuild | 57 ------- |
15 |
3 files changed, 248 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest |
18 |
index 9731ecbd2fb..af16bdd2024 100644 |
19 |
--- a/media-libs/phonon/Manifest |
20 |
+++ b/media-libs/phonon/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST phonon-4.10.0.tar.xz 322072 BLAKE2B ba49893368fc13946e2e83a498787bf8fe605b2b3d8e2b1c28eacad5ec13d9679b8c9ddd2adc54c340bbc60a01c7c1143ccaca6f26b86be105cb7502de5f39fc SHA512 6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4 |
23 |
DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007 |
24 |
DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 |
25 |
|
26 |
diff --git a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch |
27 |
deleted file mode 100644 |
28 |
index f8444b343a4..00000000000 |
29 |
--- a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch |
30 |
+++ /dev/null |
31 |
@@ -1,190 +0,0 @@ |
32 |
-From 2670e33c418acdf6c08fd0cf5d238a4d93cc12e6 Mon Sep 17 00:00:00 2001 |
33 |
-From: Andreas Sturmlechner <asturm@g.o> |
34 |
-Date: Fri, 13 Apr 2018 22:35:30 +0200 |
35 |
-Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules) |
36 |
- |
37 |
---- |
38 |
- declarative/CMakeLists.txt | 10 ++++----- |
39 |
- demos/metadatareader/CMakeLists.txt | 7 ++++-- |
40 |
- demos/phota/CMakeLists.txt | 7 ++++-- |
41 |
- demos/simplecapture/CMakeLists.txt | 7 ++++-- |
42 |
- demos/simpleplayer/CMakeLists.txt | 7 ++++-- |
43 |
- designer/CMakeLists.txt | 10 ++++----- |
44 |
- phonon/CMakeLists.txt | 33 +++++++++++++++++------------ |
45 |
- phonon/experimental/CMakeLists.txt | 9 ++++++-- |
46 |
- 9 files changed, 57 insertions(+), 58 deletions(-) |
47 |
- |
48 |
-diff --git a/declarative/CMakeLists.txt b/declarative/CMakeLists.txt |
49 |
-index da2d2eb9..cdc1b842 100644 |
50 |
---- a/declarative/CMakeLists.txt |
51 |
-+++ b/declarative/CMakeLists.txt |
52 |
-@@ -19,11 +19,11 @@ set(declarative_SRCS |
53 |
- |
54 |
- phonon_add_declarative_plugin(phononqmlplugin ${declarative_SRCS}) |
55 |
- |
56 |
--target_link_libraries(phononqmlplugin |
57 |
-- ${PHONON_LIBS} |
58 |
--) |
59 |
-- |
60 |
--qt5_use_modules(phononqmlplugin Core Gui Declarative) |
61 |
-+if(PHONON_BUILD_PHONON4QT5) |
62 |
-+ target_link_libraries(phononqmlplugin Qt5::Core Qt5::Gui Qt5::Declarative ${PHONON_LIBS}) |
63 |
-+else() |
64 |
-+ target_link_libraries(phononqmlplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${PHONON_LIBS}) |
65 |
-+endif() |
66 |
- |
67 |
- install(TARGETS phononqmlplugin DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon) |
68 |
- install(FILES ${phonon_QMLS} DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon) |
69 |
-diff --git a/demos/metadatareader/CMakeLists.txt b/demos/metadatareader/CMakeLists.txt |
70 |
-index a307c071..69e2b3a6 100644 |
71 |
---- a/demos/metadatareader/CMakeLists.txt |
72 |
-+++ b/demos/metadatareader/CMakeLists.txt |
73 |
-@@ -13,5 +13,8 @@ set(metadatareader_SRCS |
74 |
- |
75 |
- phonon_add_executable(metadatareader ${metadatareader_SRCS}) |
76 |
- |
77 |
--qt5_use_modules(metadatareader Core Widgets) |
78 |
--target_link_libraries(metadatareader ${PHONON_LIBRARY}) |
79 |
-+if(PHONON_BUILD_PHONON4QT5) |
80 |
-+ target_link_libraries(metadatareader Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) |
81 |
-+else() |
82 |
-+ target_link_libraries(metadatareader ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) |
83 |
-+endif() |
84 |
-diff --git a/demos/phota/CMakeLists.txt b/demos/phota/CMakeLists.txt |
85 |
-index e9a4ee34..aa70cf39 100644 |
86 |
---- a/demos/phota/CMakeLists.txt |
87 |
-+++ b/demos/phota/CMakeLists.txt |
88 |
-@@ -17,5 +17,8 @@ qt5_wrap_ui(phota_SRCS videoeffects.ui) |
89 |
- |
90 |
- phonon_add_executable(phota ${phota_SRCS}) |
91 |
- |
92 |
--qt5_use_modules(phota Core Widgets) |
93 |
--target_link_libraries(phota ${PHONON_LIBRARY}) |
94 |
-+if(PHONON_BUILD_PHONON4QT5) |
95 |
-+ target_link_libraries(phota Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) |
96 |
-+else() |
97 |
-+ target_link_libraries(phota ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) |
98 |
-+endif() |
99 |
-diff --git a/demos/simplecapture/CMakeLists.txt b/demos/simplecapture/CMakeLists.txt |
100 |
-index cd910707..811d29c6 100644 |
101 |
---- a/demos/simplecapture/CMakeLists.txt |
102 |
-+++ b/demos/simplecapture/CMakeLists.txt |
103 |
-@@ -13,5 +13,8 @@ set(simplecapture_SRCS |
104 |
- |
105 |
- phonon_add_executable(simplecapture ${simplecapture_SRCS}) |
106 |
- |
107 |
--qt5_use_modules(simplecapture Core Widgets) |
108 |
--target_link_libraries(simplecapture ${PHONON_LIBRARY}) |
109 |
-+if(PHONON_BUILD_PHONON4QT5) |
110 |
-+ target_link_libraries(simplecapture Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) |
111 |
-+else() |
112 |
-+ target_link_libraries(simplecapture ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) |
113 |
-+endif() |
114 |
-diff --git a/demos/simpleplayer/CMakeLists.txt b/demos/simpleplayer/CMakeLists.txt |
115 |
-index 3d66c74e..f759224f 100644 |
116 |
---- a/demos/simpleplayer/CMakeLists.txt |
117 |
-+++ b/demos/simpleplayer/CMakeLists.txt |
118 |
-@@ -13,5 +13,8 @@ set(simpleplayer_SRCS |
119 |
- |
120 |
- phonon_add_executable(simpleplayer ${simpleplayer_SRCS}) |
121 |
- |
122 |
--qt5_use_modules(simpleplayer Core Widgets) |
123 |
--target_link_libraries(simpleplayer ${PHONON_LIBRARY}) |
124 |
-+if(PHONON_BUILD_PHONON4QT5) |
125 |
-+ target_link_libraries(simpleplayer Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) |
126 |
-+else() |
127 |
-+ target_link_libraries(simpleplayer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) |
128 |
-+endif() |
129 |
-diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt |
130 |
-index 9d437547..e9d2e982 100644 |
131 |
---- a/designer/CMakeLists.txt |
132 |
-+++ b/designer/CMakeLists.txt |
133 |
-@@ -11,10 +11,10 @@ set(phononwidgetsplugin_SRCS |
134 |
- |
135 |
- phonon_add_designer_plugin(phononwidgets phononwidgets.qrc ${phononwidgetsplugin_SRCS}) |
136 |
- |
137 |
--qt5_use_modules(phononwidgets Core Gui Widgets Designer) |
138 |
-- |
139 |
--target_link_libraries(phononwidgets |
140 |
-- ${PHONON_LIBS} |
141 |
--) |
142 |
-+if(PHONON_BUILD_PHONON4QT5) |
143 |
-+ target_link_libraries(phononwidgets Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Designer ${PHONON_LIBS}) |
144 |
-+else() |
145 |
-+ target_link_libraries(phononwidgets ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${PHONON_LIBS}) |
146 |
-+endif() |
147 |
- |
148 |
- install(TARGETS phononwidgets DESTINATION ${PHONON_QT_PLUGIN_INSTALL_DIR}) |
149 |
-diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt |
150 |
-index f9ae09e5..b80c96d8 100644 |
151 |
---- a/phonon/CMakeLists.txt |
152 |
-+++ b/phonon/CMakeLists.txt |
153 |
-@@ -137,25 +137,32 @@ add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_ |
154 |
- add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/") |
155 |
- |
156 |
- add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS}) |
157 |
--qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets) |
158 |
- |
159 |
--if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) |
160 |
-- qt5_use_modules(${PHONON_LIB_SONAME} DBus) |
161 |
--endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) |
162 |
-+if(PHONON_BUILD_PHONON4QT5) |
163 |
-+ target_link_libraries(${PHONON_LIB_SONAME} Qt5::Core Qt5::Widgets) |
164 |
-+ if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) |
165 |
-+ target_link_libraries(${PHONON_LIB_SONAME} Qt5::DBus) |
166 |
-+ endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) |
167 |
-+ if(NOT PHONON_NO_GRAPHICSVIEW) |
168 |
-+ target_link_libraries(${PHONON_LIB_SONAME} Qt5::OpenGL ${OPENGL_gl_LIBRARY}) |
169 |
-+ endif() |
170 |
-+else() |
171 |
-+ target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) |
172 |
-+ if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) |
173 |
-+ target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTDBUS_LIBRARY}) |
174 |
-+ endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) |
175 |
-+ if(NOT PHONON_NO_GRAPHICSVIEW) |
176 |
-+ target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) |
177 |
-+ endif() |
178 |
-+ if (QZEITGEIST_FOUND) |
179 |
-+ target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY}) |
180 |
-+ endif(QZEITGEIST_FOUND) |
181 |
-+endif() |
182 |
- |
183 |
- if (PHONON_PULSESUPPORT) |
184 |
- target_link_libraries(${PHONON_LIB_SONAME} ${GOBJECT_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY}) |
185 |
- endif (PHONON_PULSESUPPORT) |
186 |
- |
187 |
--if(NOT PHONON_NO_GRAPHICSVIEW) |
188 |
-- qt5_use_modules(${PHONON_LIB_SONAME} OpenGL) |
189 |
-- target_link_libraries(${PHONON_LIB_SONAME} ${OPENGL_gl_LIBRARY}) |
190 |
--endif() |
191 |
-- |
192 |
--if (QZEITGEIST_FOUND) |
193 |
-- target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY}) |
194 |
--endif(QZEITGEIST_FOUND) |
195 |
-- |
196 |
- if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") |
197 |
- # We need to explicitly link libm to phonon in Solaris |
198 |
- target_link_libraries(${PHONON_LIB_SONAME} m) |
199 |
-diff --git a/phonon/experimental/CMakeLists.txt b/phonon/experimental/CMakeLists.txt |
200 |
-index e44cb7ac..13101ec9 100644 |
201 |
---- a/phonon/experimental/CMakeLists.txt |
202 |
-+++ b/phonon/experimental/CMakeLists.txt |
203 |
-@@ -20,8 +20,13 @@ set(phononexperimental_LIB_SRCS |
204 |
- ../abstractvideooutput_p.cpp |
205 |
- ) |
206 |
- add_library(${PHONON_LIB_SONAME}experimental SHARED ${phononexperimental_LIB_SRCS}) |
207 |
--qt5_use_modules(${PHONON_LIB_SONAME}experimental Core Widgets) |
208 |
--target_link_libraries(${PHONON_LIB_SONAME}experimental ${PHONON_LIBS}) |
209 |
-+ |
210 |
-+if(PHONON_BUILD_PHONON4QT5) |
211 |
-+ target_link_libraries(${PHONON_LIB_SONAME}experimental Qt5::Core Qt5::Widgets ${PHONON_LIBS}) |
212 |
-+else() |
213 |
-+ target_link_libraries(${PHONON_LIB_SONAME}experimental ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBS}) |
214 |
-+endif() |
215 |
-+ |
216 |
- set_target_properties(${PHONON_LIB_SONAME}experimental PROPERTIES |
217 |
- VERSION ${PHONON_LIB_VERSION} |
218 |
- SOVERSION ${PHONON_LIB_SOVERSION} |
219 |
--- |
220 |
-2.17.0 |
221 |
- |
222 |
|
223 |
diff --git a/media-libs/phonon/phonon-4.10.0.ebuild b/media-libs/phonon/phonon-4.10.0.ebuild |
224 |
deleted file mode 100644 |
225 |
index 5da7537646b..00000000000 |
226 |
--- a/media-libs/phonon/phonon-4.10.0.ebuild |
227 |
+++ /dev/null |
228 |
@@ -1,57 +0,0 @@ |
229 |
-# Copyright 1999-2018 Gentoo Foundation |
230 |
-# Distributed under the terms of the GNU General Public License v2 |
231 |
- |
232 |
-EAPI=6 |
233 |
- |
234 |
-if [[ ${PV} != *9999* ]]; then |
235 |
- SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" |
236 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd" |
237 |
-else |
238 |
- EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) |
239 |
- inherit git-r3 |
240 |
-fi |
241 |
- |
242 |
-inherit cmake-utils qmake-utils |
243 |
- |
244 |
-DESCRIPTION="KDE multimedia API" |
245 |
-HOMEPAGE="https://phonon.kde.org/" |
246 |
- |
247 |
-LICENSE="|| ( LGPL-2.1 LGPL-3 )" |
248 |
-SLOT="0" |
249 |
-IUSE="debug designer gstreamer pulseaudio +vlc" |
250 |
- |
251 |
-RDEPEND=" |
252 |
- !!dev-qt/qtphonon:4 |
253 |
- dev-qt/qtcore:5 |
254 |
- dev-qt/qtdbus:5 |
255 |
- dev-qt/qtgui:5 |
256 |
- dev-qt/qtwidgets:5 |
257 |
- designer? ( dev-qt/designer:5 ) |
258 |
- pulseaudio? ( |
259 |
- dev-libs/glib:2 |
260 |
- >=media-sound/pulseaudio-0.9.21[glib] |
261 |
- ) |
262 |
-" |
263 |
-DEPEND="${RDEPEND} |
264 |
- kde-frameworks/extra-cmake-modules:5 |
265 |
- virtual/pkgconfig |
266 |
-" |
267 |
-PDEPEND=" |
268 |
- gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) |
269 |
- vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] ) |
270 |
-" |
271 |
- |
272 |
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
273 |
- |
274 |
-src_configure() { |
275 |
- local mycmakeargs=( |
276 |
- -DPHONON_BUILD_PHONON4QT5=ON |
277 |
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE |
278 |
- -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) |
279 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON |
280 |
- -DWITH_GLIB2=$(usex pulseaudio) |
281 |
- -DWITH_PulseAudio=$(usex pulseaudio) |
282 |
- -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake |
283 |
- ) |
284 |
- cmake-utils_src_configure |
285 |
-} |