1 |
commit: 06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f |
2 |
Author: civil@g.o <civil <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 29 23:18:56 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 4 07:14:35 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f9b9bb |
7 |
|
8 |
media-sound/cantata: version bump 2.0.0 |
9 |
|
10 |
Gentoo-bug: 544734 |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
15 |
|
16 |
media-sound/cantata/Manifest | 1 + |
17 |
media-sound/cantata/cantata-2.0.0.ebuild | 145 +++++++++++++++++++++ |
18 |
.../cantata/files/cantata-2.0.0-ffmpeg-3.0.patch | 12 ++ |
19 |
media-sound/cantata/files/cantata-2.0.0-gcc5.patch | 15 +++ |
20 |
4 files changed, 173 insertions(+) |
21 |
|
22 |
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest |
23 |
index 1db0610..b30446d 100644 |
24 |
--- a/media-sound/cantata/Manifest |
25 |
+++ b/media-sound/cantata/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST cantata-1.5.1.tar.bz2 1986772 SHA256 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78 SHA512 bd41bbe3a9c2fa6a4e653deb62a82b928febe3876a6023d4c9bff4fb71133aca5a8e34ae77b440d10ae42c0d024ebd1c460b367a75cefa29858275d707cf4e38 WHIRLPOOL 55054c1e8d95f1dc9322b7224dfa04fd8e8430b89c5a21883fdecf0829eca60720186e6b549d80216c4035429208e2191d2e5ae31608ede3a6afc8e5046e173f |
28 |
+DIST cantata-2.0.0.tar.bz2 2147821 SHA256 6817611652e3e37a221e7b68fb41223b421ccc09688bfd718b1f5a2e34e81fa8 SHA512 53cb56411bc6c79692e97d39d8d8cbf5cbbe683fe0c32a8f1222e477deba0ff0e71f5daf0a49cc9c72cefb113278692193964a99ad008a6f9fc0f59304482ed0 WHIRLPOOL bffdc313a97e979f28be4ec28c2a06bf0406e6f23ccf7be2403d9167638d806f5f3e1d5f2e1ca1b376285b6d1586b955be5ba60dd546299d8ef5309ef0878c92 |
29 |
|
30 |
diff --git a/media-sound/cantata/cantata-2.0.0.ebuild b/media-sound/cantata/cantata-2.0.0.ebuild |
31 |
new file mode 100644 |
32 |
index 0000000..09091f2 |
33 |
--- /dev/null |
34 |
+++ b/media-sound/cantata/cantata-2.0.0.ebuild |
35 |
@@ -0,0 +1,145 @@ |
36 |
+# Copyright 1999-2016 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+# $Id$ |
39 |
+ |
40 |
+EAPI=6 |
41 |
+ |
42 |
+PLOCALES="cs de en_GB es hu ko pl ru zh_CN" |
43 |
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg |
44 |
+ |
45 |
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" |
46 |
+HOMEPAGE="https://github.com/CDrummond/cantata" |
47 |
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2" |
48 |
+ |
49 |
+LICENSE="GPL-2" |
50 |
+SLOT="4" |
51 |
+KEYWORDS="~amd64 ~x86" |
52 |
+IUSE="cdda cddb http-server kde mtp musicbrainz qt5 replaygain taglib udisks" |
53 |
+REQUIRED_USE=" |
54 |
+ cdda? ( udisks || ( cddb musicbrainz ) ) |
55 |
+ cddb? ( cdda taglib ) |
56 |
+ mtp? ( taglib udisks ) |
57 |
+ musicbrainz? ( cdda taglib ) |
58 |
+ qt5? ( !kde ) |
59 |
+ replaygain? ( taglib ) |
60 |
+" |
61 |
+ |
62 |
+RDEPEND=" |
63 |
+ dev-db/sqlite:3 |
64 |
+ sys-libs/zlib |
65 |
+ x11-libs/libX11 |
66 |
+ || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) |
67 |
+ cdda? ( media-sound/cdparanoia ) |
68 |
+ cddb? ( media-libs/libcddb ) |
69 |
+ kde? ( kde-base/kdelibs:4 ) |
70 |
+ mtp? ( media-libs/libmtp ) |
71 |
+ musicbrainz? ( media-libs/musicbrainz:5 ) |
72 |
+ qt5? ( |
73 |
+ dev-qt/qtconcurrent:5 |
74 |
+ dev-qt/qtcore:5 |
75 |
+ dev-qt/qtdbus:5 |
76 |
+ dev-qt/qtgui:5 |
77 |
+ dev-qt/qtnetwork:5 |
78 |
+ dev-qt/qtsql:5 |
79 |
+ dev-qt/qtsvg:5 |
80 |
+ dev-qt/qtwidgets:5 |
81 |
+ dev-qt/qtxml:5 |
82 |
+ ) |
83 |
+ !qt5? ( |
84 |
+ dev-libs/qjson |
85 |
+ dev-qt/qtcore:4 |
86 |
+ dev-qt/qtdbus:4 |
87 |
+ dev-qt/qtgui:4 |
88 |
+ dev-qt/qtsql:4 |
89 |
+ dev-qt/qtsvg:4 |
90 |
+ ) |
91 |
+ replaygain? ( |
92 |
+ media-libs/libebur128 |
93 |
+ media-sound/mpg123 |
94 |
+ virtual/ffmpeg |
95 |
+ ) |
96 |
+ taglib? ( |
97 |
+ media-libs/taglib[asf,mp4] |
98 |
+ media-libs/taglib-extras |
99 |
+ !kde? ( udisks? ( sys-fs/udisks:2 ) ) |
100 |
+ ) |
101 |
+" |
102 |
+DEPEND="${RDEPEND} |
103 |
+ kde? ( sys-devel/gettext ) |
104 |
+ !kde? ( qt5? ( dev-qt/linguist-tools:5 ) ) |
105 |
+" |
106 |
+ |
107 |
+# cantata has no tests |
108 |
+RESTRICT="test" |
109 |
+PATCHES=( |
110 |
+ "${FILESDIR}/${P}-gcc5.patch" |
111 |
+ "${FILESDIR}/${P}-ffmpeg-3.0.patch" |
112 |
+) |
113 |
+ |
114 |
+src_prepare() { |
115 |
+ cmake-utils_src_prepare |
116 |
+ |
117 |
+ # Unbundle 3rd party libs |
118 |
+ rm -rf 3rdparty/qtsingleapplication/ || die |
119 |
+ rm -rf 3rdparty/libebur128/ || die |
120 |
+ # qjson ebuild does not support Qt5 yet |
121 |
+ use qt5 || { rm -rf 3rdparty/qjson/ || die ;} |
122 |
+ use kde && { rm -rf 3rdparty/solid-lite/ || die ;} |
123 |
+ |
124 |
+ l10n_find_plocales_changes 'po' '' '.po' |
125 |
+} |
126 |
+ |
127 |
+src_configure() { |
128 |
+ local langs="$(l10n_get_locales)" |
129 |
+ |
130 |
+ local mycmakeargs=( |
131 |
+ -DCANTATA_TRANSLATIONS="${langs// /;}" |
132 |
+ -DENABLE_CDPARANOIA=$(usex cdda) |
133 |
+ -DENABLE_CDDB=$(usex cddb) |
134 |
+ -DENABLE_HTTP_SERVER=$(usex http-server) |
135 |
+ -DENABLE_KDE=$(usex kde) |
136 |
+ -DENABLE_MTP=$(usex mtp) |
137 |
+ -DENABLE_MUSICBRAINZ=$(usex musicbrainz) |
138 |
+ -DENABLE_QT5=$(usex qt5) |
139 |
+ -DENABLE_FFMPEG=$(usex replaygain) |
140 |
+ -DENABLE_MPG123=$(usex replaygain) |
141 |
+ -DENABLE_TAGLIB=$(usex taglib) |
142 |
+ -DENABLE_TAGLIB_EXTRAS=$(usex taglib) |
143 |
+ -DENABLE_DEVICES_SUPPORT=$(usex udisks) |
144 |
+ -DENABLE_HTTP_STREAM_PLAYBACK=OFF |
145 |
+ -DENABLE_REMOTE_DEVICES=OFF |
146 |
+ -DENABLE_UDISKS2=ON |
147 |
+ -DUSE_SYSTEM_MENU_ICON=OFF |
148 |
+ ) |
149 |
+ |
150 |
+ if ! use kde; then |
151 |
+ if use qt5; then |
152 |
+ mycmakeargs+=( |
153 |
+ -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert" |
154 |
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" |
155 |
+ ) |
156 |
+ else |
157 |
+ mycmakeargs+=( |
158 |
+ -DLCONVERT_EXECUTABLE="$(qt4_get_bindir)/lconvert" |
159 |
+ -DLRELEASE_EXECUTABLE="$(qt4_get_bindir)/lrelease" |
160 |
+ ) |
161 |
+ fi |
162 |
+ fi |
163 |
+ |
164 |
+ cmake-utils_src_configure |
165 |
+} |
166 |
+ |
167 |
+pkg_preinst() { |
168 |
+ gnome2_icon_savelist |
169 |
+ xdg_pkg_preinst |
170 |
+} |
171 |
+ |
172 |
+pkg_postinst() { |
173 |
+ gnome2_icon_cache_update |
174 |
+ xdg_pkg_postinst |
175 |
+} |
176 |
+ |
177 |
+pkg_postrm() { |
178 |
+ gnome2_icon_cache_update |
179 |
+ xdg_pkg_postrm |
180 |
+} |
181 |
|
182 |
diff --git a/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch b/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch |
183 |
new file mode 100644 |
184 |
index 0000000..c0f3455 |
185 |
--- /dev/null |
186 |
+++ b/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch |
187 |
@@ -0,0 +1,12 @@ |
188 |
+diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp |
189 |
+index 375448d..ab07d5b 100644 |
190 |
+--- a/replaygain/ffmpeginput.cpp |
191 |
++++ b/replaygain/ffmpeginput.cpp |
192 |
+@@ -21,7 +21,6 @@ extern "C" { |
193 |
+ #include <libavcodec/avcodec.h> |
194 |
+ #include <libavformat/avformat.h> |
195 |
+ #if LIBAVFORMAT_VERSION_MAJOR >= 54 |
196 |
+-#include <libavutil/audioconvert.h> |
197 |
+ #include <libavutil/channel_layout.h> |
198 |
+ #endif |
199 |
+ #ifdef __cplusplus |
200 |
|
201 |
diff --git a/media-sound/cantata/files/cantata-2.0.0-gcc5.patch b/media-sound/cantata/files/cantata-2.0.0-gcc5.patch |
202 |
new file mode 100644 |
203 |
index 0000000..bebe3fe |
204 |
--- /dev/null |
205 |
+++ b/media-sound/cantata/files/cantata-2.0.0-gcc5.patch |
206 |
@@ -0,0 +1,15 @@ |
207 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
208 |
+index 48dd61c..1fe516a 100644 |
209 |
+--- a/CMakeLists.txt |
210 |
++++ b/CMakeLists.txt |
211 |
+@@ -279,7 +279,9 @@ if (ENABLE_QT5) |
212 |
+ set(QTINCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS} |
213 |
+ ${Qt5Svg_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS}) |
214 |
+ add_definitions(${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5Concurrent_DEFINITIONS} ${Qt5Svg_DEFINITIONS} ${Qt5Sql_DEFINITIONS}) |
215 |
+- set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") |
216 |
++ if (Qt5_POSITION_INDEPENDENT_CODE) |
217 |
++ set(CMAKE_POSITION_INDEPENDENT_CODE ON) |
218 |
++ endif (Qt5_POSITION_INDEPENDENT_CODE) |
219 |
+ if (NOT ENABLE_UBUNTU AND NOT APPLE AND NOT WIN32) |
220 |
+ # Does Ubuntu/Touch version need DBus? |
221 |
+ find_package(Qt5DBus) |