1 |
commit: 97782e5e71bcbba3bd8d0be9566c569613046bfc |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 17:49:51 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 17:50:03 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97782e5e |
7 |
|
8 |
media-sound/amarok: Version bump 2.8.90 (2.9 beta) |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
media-sound/amarok/Manifest | 1 + |
13 |
media-sound/amarok/amarok-2.8.90.ebuild | 128 +++++++++++++++++++++ |
14 |
.../files/amarok-2.8.90-mysql-embedded.patch | 34 ++++++ |
15 |
3 files changed, 163 insertions(+) |
16 |
|
17 |
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest |
18 |
index 5ab676d..164d0d3 100644 |
19 |
--- a/media-sound/amarok/Manifest |
20 |
+++ b/media-sound/amarok/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad |
23 |
+DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c |
24 |
|
25 |
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild |
26 |
new file mode 100644 |
27 |
index 0000000..4db4e97 |
28 |
--- /dev/null |
29 |
+++ b/media-sound/amarok/amarok-2.8.90.ebuild |
30 |
@@ -0,0 +1,128 @@ |
31 |
+# Copyright 1999-2016 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+# $Id$ |
34 |
+ |
35 |
+EAPI=6 |
36 |
+ |
37 |
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja |
38 |
+lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin |
39 |
+sv tr uk zh_CN zh_TW" |
40 |
+KDE_REQUIRED="never" |
41 |
+KDE_HANDBOOK="optional" |
42 |
+VIRTUALX_REQUIRED="test" |
43 |
+VIRTUALDBUS_TEST="true" |
44 |
+inherit flag-o-matic kde4-base pax-utils |
45 |
+ |
46 |
+DESCRIPTION="Advanced audio player based on KDE framework" |
47 |
+HOMEPAGE="http://amarok.kde.org/" |
48 |
+if [[ ${PV} != *9999* ]]; then |
49 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" |
50 |
+ KEYWORDS="~amd64 ~ppc ~x86" |
51 |
+else |
52 |
+ KEYWORDS="" |
53 |
+fi |
54 |
+ |
55 |
+LICENSE="GPL-2" |
56 |
+SLOT="4" |
57 |
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils" |
58 |
+ |
59 |
+if [[ ${KDE_BUILD_TYPE} == live ]]; then |
60 |
+ RESTRICT="test" |
61 |
+fi |
62 |
+ |
63 |
+# ipod requires gdk enabled and also gtk compiled in libgpod |
64 |
+COMMONDEPEND=" |
65 |
+ app-crypt/qca:2[qt4(+)] |
66 |
+ $(add_kdebase_dep kdelibs 'opengl?' 4.8.4) |
67 |
+ $(add_kdeapps_dep kdebase-kioslaves) |
68 |
+ >=media-libs/taglib-1.7[asf,mp4] |
69 |
+ >=media-libs/taglib-extras-1.0.1 |
70 |
+ sys-libs/zlib |
71 |
+ >=virtual/mysql-5.1[embedded?] |
72 |
+ >=dev-qt/qtcore-4.8:4 |
73 |
+ >=dev-qt/qtdbus-4.8:4 |
74 |
+ >=dev-qt/qtscript-4.8:4 |
75 |
+ >=x11-libs/qtscriptgenerator-0.1.0 |
76 |
+ cdda? ( |
77 |
+ $(add_kdeapps_dep libkcddb) |
78 |
+ $(add_kdeapps_dep libkcompactdisc) |
79 |
+ $(add_kdeapps_dep audiocd-kio) |
80 |
+ ) |
81 |
+ ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) |
82 |
+ lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] ) |
83 |
+ mp3tunes? ( |
84 |
+ dev-libs/glib:2 |
85 |
+ dev-libs/libxml2 |
86 |
+ dev-libs/openssl:0 |
87 |
+ net-libs/loudmouth |
88 |
+ net-misc/curl |
89 |
+ >=dev-qt/qtcore-4.8.4:4[glib] |
90 |
+ ) |
91 |
+ mtp? ( >=media-libs/libmtp-1.0.0 ) |
92 |
+ ofa? ( >=media-libs/libofa-0.9.0 ) |
93 |
+ opengl? ( virtual/opengl ) |
94 |
+" |
95 |
+DEPEND="${COMMONDEPEND} |
96 |
+ dev-util/automoc |
97 |
+ virtual/pkgconfig |
98 |
+ test? ( dev-cpp/gmock ) |
99 |
+" |
100 |
+RDEPEND="${COMMONDEPEND} |
101 |
+ !media-sound/amarok-utils |
102 |
+ $(add_kdeapps_dep phonon-kde) |
103 |
+" |
104 |
+ |
105 |
+PATCHES=( |
106 |
+ "${FILESDIR}/${PN}-2.8.0-taglib110.patch" |
107 |
+ "${FILESDIR}/${P}-mysql-embedded.patch" |
108 |
+) |
109 |
+ |
110 |
+src_configure() { |
111 |
+ # Append minimal-toc cflag for ppc64, see bug 280552 and 292707 |
112 |
+ use ppc64 && append-flags -mminimal-toc |
113 |
+ |
114 |
+ local mycmakeargs=( |
115 |
+ -DWITH_PLAYER=ON |
116 |
+ -DWITH_Libgcrypt=OFF |
117 |
+ -DWITH_SPECTRUM_ANALYZER=OFF |
118 |
+ -DWITH_NepomukCore=OFF |
119 |
+ -DWITH_Soprano=OFF |
120 |
+ -DWITH_MYSQL_EMBEDDED=$(usex embedded) |
121 |
+ -DWITH_IPOD=$(usex ipod) |
122 |
+ -DWITH_GDKPixBuf=$(usex ipod) |
123 |
+ -DWITH_LibLastFm=$(usex lastfm) |
124 |
+ -DWITH_MP3Tunes=$(usex mp3tunes) |
125 |
+ -DWITH_Mtp=$(usex mtp) |
126 |
+ -DWITH_LibOFA=$(usex ofa) |
127 |
+ -DWITH_UTILITIES=$(usex utils) |
128 |
+ ) |
129 |
+ |
130 |
+ kde4-base_src_configure |
131 |
+} |
132 |
+ |
133 |
+src_install() { |
134 |
+ kde4-base_src_install |
135 |
+ |
136 |
+ # bug 481592 |
137 |
+ pax-mark m "${ED}"/usr/bin/amarok |
138 |
+} |
139 |
+ |
140 |
+pkg_postinst() { |
141 |
+ kde4-base_pkg_postinst |
142 |
+ |
143 |
+ if ! use embedded; then |
144 |
+ echo |
145 |
+ elog "You've disabled the amarok support for embedded mysql DBs." |
146 |
+ elog "You'll have to configure amarok to use an external db server." |
147 |
+ echo |
148 |
+ elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how" |
149 |
+ elog "to configure the external db and migrate your data from the embedded database." |
150 |
+ echo |
151 |
+ |
152 |
+ if has_version "virtual/mysql[minimal]"; then |
153 |
+ elog "You built mysql with the minimal use flag, so it doesn't include the server." |
154 |
+ elog "You won't be able to use the local mysql installation to store your amarok collection." |
155 |
+ echo |
156 |
+ fi |
157 |
+ fi |
158 |
+} |
159 |
|
160 |
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch |
161 |
new file mode 100644 |
162 |
index 0000000..b03aa18 |
163 |
--- /dev/null |
164 |
+++ b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch |
165 |
@@ -0,0 +1,34 @@ |
166 |
+From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001 |
167 |
+From: Matt Whitlock <kde@××××××××××××.name> |
168 |
+Date: Tue, 29 Mar 2016 12:22:41 -0400 |
169 |
+Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if |
170 |
+ WITH_MYSQL_EMBEDDED |
171 |
+ |
172 |
+REVIEW: 127523 |
173 |
+--- |
174 |
+ src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++- |
175 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
176 |
+ |
177 |
+diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt |
178 |
+index 244cde1..4c618fc 100644 |
179 |
+--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt |
180 |
++++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt |
181 |
+@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection |
182 |
+ ${KDE4_KDECORE_LIBS} |
183 |
+ ${QT_QTCORE_LIBRARY} |
184 |
+ ${QT_QTGUI_LIBRARY} |
185 |
+- ${MYSQL_EMBEDDED_LIBRARIES} |
186 |
+ ${CMAKE_DL_LIBS} |
187 |
+ ${ZLIB_LIBRARIES} |
188 |
+ ) |
189 |
+ |
190 |
++if(WITH_MYSQL_EMBEDDED) |
191 |
++ target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} ) |
192 |
++endif(WITH_MYSQL_EMBEDDED) |
193 |
++ |
194 |
+ if(NOT WIN32 AND NOT APPLE) |
195 |
+ target_link_libraries( amarok_collection-mysqlcollection crypt pthread ) |
196 |
+ endif(NOT WIN32 AND NOT APPLE) |
197 |
+-- |
198 |
+2.8.1 |
199 |
+ |