Gentoo Archives: gentoo-commits

From: gerion <gerion.entrup@×××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/gerislay:master commit in: media-sound/mixxx/
Date: Fri, 13 Jul 2018 21:40:45
Message-Id: 1529680157.a1a3fa3fc937f3c1d7fe72ad9761bd753245d85b.gerion@gentoo
1 commit: a1a3fa3fc937f3c1d7fe72ad9761bd753245d85b
2 Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
3 AuthorDate: Fri Jun 1 21:21:50 2018 +0000
4 Commit: gerion <gerion.entrup <AT> flump <DOT> de>
5 CommitDate: Fri Jun 22 15:09:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=a1a3fa3f
7
8 media-sound/mixxx: drop, since it is in the tree
9
10 media-sound/mixxx/ChangeLog | 195 ------------------------------------
11 media-sound/mixxx/Manifest | 3 -
12 media-sound/mixxx/metadata.xml | 16 ---
13 media-sound/mixxx/mixxx-9999.ebuild | 149 ---------------------------
14 4 files changed, 363 deletions(-)
15
16 diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
17 deleted file mode 100644
18 index 5415d35..0000000
19 --- a/media-sound/mixxx/ChangeLog
20 +++ /dev/null
21 @@ -1,195 +0,0 @@
22 -# ChangeLog for media-sound/mixxx
23 -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
24 -# $Header: $
25 -
26 - 11 Apr 2015; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
27 - mixxx-1.11.0.ebuild, mixxx-1.11.9999.ebuild, mixxx-9999.ebuild:
28 - repoman payment
29 - mixxx-9999: added ffmpeg use flag, fixes #184, thanks gerion for report
30 -
31 - 16 Mar 2015; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
32 - files/mixxx-9999-system-libs.patch:
33 - updated mixxx-9999-system-libs.patch, thanks to Alex Barker for the patch
34 -
35 - 20 Dec 2014; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
36 - mixxx-9999.ebuild, -files/mixxx-9999-cflags.patch,
37 - files/mixxx-9999-system-libs.patch:
38 - update system-libs patch
39 - remove cflags patch
40 - depend on newer version of fidlib
41 -
42 - 02 Mar 2014; Dominique Michel <dominique_libre@×××××××××××××××××.net>
43 - mixxx-9999-system-libs.patch: updated for new offsets.
44 - Thanks to Alex Barker for the updated patch.
45 -
46 - 08 Mar 2014; Matt Henley (nwmatt) <nwmatt@×××××.com>
47 - mixxx-9999-docs.patch: updated for new offset.
48 - Thanks to Alex Barker for updated patch.
49 -
50 - 08 Dec 2013; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
51 - mixxx-9999.ebuild, files/mixxx-9999-cflags.patch,
52 - -files/mixxx-9999-no-bzr.patch, files/mixxx-9999-system-libs.patch:
53 - Updated patches and removed 9999-no-bzr patch because it functions
54 - correctly upstream. Thanks to Alex Barker for updated ebuild and patches.
55 - Added missing dependency on dev-qt/qttest.
56 -
57 - 08 Dec 2013; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
58 - mixxx-9999.ebuild:
59 - Added dependency on media-libs/rubberband. Thanks to Alex Barker for updated
60 - ebuild.
61 -
62 - 25 Jul 2013; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
63 - mixxx-1.11.0.ebuild, mixxx-1.11.9999.ebuild, mixxx-9999.ebuild:
64 - Correct HOMEPAGE (www.mixxx.org).
65 - Depend on >=media-libs/fidlib-0.9.10-r1.
66 - Follow mixxx's git repository in mixxx-9999.ebuild.
67 - Comment out non-working mixxx-1.11.9999-no-bzr.patch.
68 - Thanks to Alex Barker for the fixed ebuild.
69 -
70 - 23 Jun 2013; Hakan Demiralp (keenblade) <keenblade@×××××××××.org>
71 - mixxx-1.11.0.ebuild, mixxx-1.11.9999.ebuild, mixxx-9999.ebuild:
72 - mixxx: for all mixxx ebuilds, fidlib dependency version is adjusted to the
73 - available portage version
74 -
75 -*mixxx-1.11.0 (23 May 2013)
76 -
77 - 23 May 2013; Karl Linden (lilrc) <lilrc@×××××××××××××××××.net>
78 - +mixxx-1.11.0.ebuild, mixxx-1.11.9999.ebuild, mixxx-9999.ebuild,
79 - +files/mixxx-1.11.0-cflags.patch, +files/mixxx-1.11.0-docs.patch,
80 - +files/mixxx-1.11.0-no-bzr.patch, +files/mixxx-1.11.0-system-libs.patch,
81 - files/mixxx-1.11.9999-no-bzr.patch, files/mixxx-1.11.9999-system-libs.patch,
82 - files/mixxx-9999-no-bzr.patch, files/mixxx-9999-system-libs.patch,
83 - metadata.xml:
84 - Move to EAPI 5.
85 - Respect EPREFIX.
86 - Use an array for the arguments to escons.
87 - Added missing dependencies.
88 - Added a hid USE flag.
89 - All patches now work.
90 - Thanks a lot to Alex Barker for submitting his work on the ML.
91 -
92 - 10 Mar 2013; Dominique Michel <dominique@×××××××××.org>
93 - mixx-1.11.9999.ebuild, mixx-9999.ebuild: Commented out system-libs.patch
94 - that doesn't apply anymore.
95 -
96 - 09 Mar 2013; Dominique Michel <dominique@×××××××××.org>
97 - mixx-1.11.9999.ebuild, mixx-9999.ebuild: Moved QT deps to /dev-qt/*
98 -
99 - 01 Oct 2012; Gavin Pryke (gavlee) <gavinlee303@××××××××××.com>
100 - files/mixxx-1.11.9999-no-bzr.patch, files/mixxx-9999-no-bzr.patch:
101 - apply patches thanks to Alex Barker. small repoman payments.
102 - dev-util/pkgconfig -> virtual/pkgconfig
103 -
104 - 11 Aug 2012; Dominique Michel <dominique@×××××××××.org>
105 - -mixxx-1.10.ebuild: removed outdated version
106 - +mixxx-1.11.9999.ebuild, -mixxx-1.10.9999.ebuild: bumped live ebuild
107 - mixxx-9999.ebuild: dependencies fix
108 - Thanks to Alex Barker for those fixes
109 -
110 - The reason to have to live ebuilds is than the 1.x.9999 is updated more often
111 - and than it can contain updates that fix bugs in the last official release
112 -
113 - 25 May 2012; Hakan Demiralp <keenblade@×××××××××.org> mixxx-1.10.0.ebuild:
114 - mixxx-1.10.0: missing fidlib dependency added wrt bug report at f.g.o. by
115 - woelfl
116 -
117 - 05 May 2012; Hakan Demiralp <keenblade@×××××××××.org> mixxx-1.10.9999.ebuild:
118 - mixxx--1.10.9999: removed keywords. Live ebuilds shoud not define keywords
119 -
120 -*mixxx-1.10.9999 (05 May 2012)
121 -
122 - 05 May 2012; Hakan Demiralp <keenblade@×××××××××.org>
123 - +mixxx-1.10.9999.ebuild, +files/mixxx-1.10.9999-cflags.patch,
124 - +files/mixxx-1.10.9999-docs.patch, +files/mixxx-1.10.9999-no-bzr.patch,
125 - +files/mixxx-1.10.9999-system-libs.patch, mixxx-9999.ebuild,
126 - -files/mixxx-9999-m4a.patch, -files/mixxx-9999-wavpack.patch:
127 - mixxx ebuilds: new ebuild mixxx-1.10.9999. Also m4a and wavpack patch
128 - removed. Thanks to Alex Barker
129 -
130 - 27 Apr 2012; Hakan Demiralp <keenblade@×××××××××.org>
131 - files/mixxx-9999-docs.patch:
132 - mixxx-9999.ebuild: docs.patch is updated. Thanks to Alex Barker
133 -
134 - 24 Apr 2012; Hakan Demiralp <keenblade@×××××××××.org>
135 - files/mixxx-9999-system-libs.patch:
136 - mixxx-9999.ebuild: system-libs.patch is updated. Thanks to Alex Barker
137 -
138 - 21 Apr 2012; Hakan Demiralp <keenblade@×××××××××.org> mixxx-9999.ebuild,
139 - +files/mixxx-9999-m4a.patch, +files/mixxx-9999-wavpack.patch:
140 - mixxx-9999.ebuild: ebuild updated and new patches. Thanks to Alex Barker
141 -
142 - 21 Apr 2012; Hakan Demiralp <keenblade@×××××××××.org> mixxx-1.10.0.ebuild,
143 - +files/mixxx-1.10.0-cflags.patch, +files/mixxx-1.10.0-docs.patch,
144 - +files/mixxx-1.10.0-libmp4v2_r479_compat.patch,
145 - +files/mixxx-1.10.0-m4a.patch, +files/mixxx-1.10.0-no-bzr.patch,
146 - +files/mixxx-1.10.0-system-libs.patch, +files/mixxx-1.10.0-wavpack.patch:
147 - mixxx-1.10.0.ebuild: ebuild updated and added new patches
148 -
149 - 21 Apr 2012; Hakan Demiralp <keenblade@×××××××××.org> -mixxx-1.7.0.ebuild:
150 - mixxx: update v1.10.0 and remove v1.7.0 wrt #125 by kwhat
151 -
152 - 25 Mar 2012; Hakan Demiralp <keenblade@×××××××××.org> mixxx-9999.ebuild,
153 - +files/mixxx-9999-cflags.patch, +files/mixxx-9999-docs.patch,
154 - +files/mixxx-9999-no-bzr.patch, -files/mixxx-9999-qt4_paths.patch,
155 - +files/mixxx-9999-system-libs.patch, metadata.xml:
156 - mixxx-9999.ebuild: ebuild and patches are updated. Thanks to Alex Barker
157 -
158 -*mixxx-1.10.0 (25 Dec 2011)
159 -
160 - 25 Dec 2011; Hakan Demiralp <keenblade@×××××××××.org> +mixxx-1.10.0.ebuild:
161 - media-sound/mixxx: version bump to 1.10.0, removed older ebuilds
162 -
163 -*mixxx-1.7.0 (28 Aug 2009)
164 -
165 - 28 Aug 2009; Gavin Pryke <gavinlee303@××××××××××.com> +mixxx-1.7.0.ebuild,
166 - mixxx-9999.ebuild:
167 - add latest 1.7.0 release, change bzr url in live ebuild, fix some deps
168 -
169 - 10 Jun 2009; Gavin Pryke <gavinlee303@××××××××××.com> ChangeLog:
170 - +mixxx-1.6.1-r1.ebuild: latest stable release with herc support
171 - +mixxx-1.7.0_beta1.ebuild: latest beta
172 - ~mixxx-9999.ebuild: live ebuild changed from old svn to new bzr 1.7 branch
173 - ~mixxx-1.6.1.ebuild: repoman cosmetic fixes
174 - -mixxx-1.5.0.1.ebuild, -mixxx-1.6.0_beta4.ebuild: removed older ebuilds
175 - amended metadata.xml and USE flags to match what each mixxx version expects
176 - and match current gentoo ebuilds
177 -
178 - 11 Oct 2008; Frieder Buerzele <evermind@×××××××××.org;
179 - +mixxx-1.6.1.ebuild:
180 - bumped
181 -
182 - 06 Aug 2008; Frieder Buerzele <evermind@×××××××××.org>;
183 - mixxx-1.5.0.1.ebuild, mixxx-1.6.0_beta4.ebuild, mixxx-9999.ebuild:
184 - fixed qt4_min... QA msg
185 -
186 - 26 Jul 2008; Thomas Kuther <gimpel@××××××××××××.org>
187 - +files/mixxx-1.6.0_beta4-debug.patch, -mixxx-1.5.0.ebuild,
188 - -mixxx-1.6.0_beta1.ebuild, -mixxx-1.6.0_beta2.ebuild,
189 - +mixxx-1.6.0_beta4.ebuild:
190 - version bump
191 -
192 - 09 Apr 2008; Thomas Kuther <gimpel@××××××××××××.org>
193 - -mixxx-1.5.0_beta1.ebuild, +mixxx-1.6.0_beta2.ebuild:
194 - version bump
195 -
196 - 18 Jan 2008; Frieder Buerzele <evermind@×××××××××.org>;
197 - mixxx-1.6.0_beta1.ebuild:
198 - fixed libdca dependency
199 -
200 - 06 Jan 2008; Frieder Buerzele <evermind@×××××××××.org> ChangeLog:
201 - we need to pass the same config to src_install
202 - as if not the whole code will be recompiled to
203 - met the standard settings
204 - fix mixxx-1.6.0beta1 and mixxx-9999
205 -
206 - 04 Jan 2008; Thomas Kuther <gimpel@××××××××××××.org>
207 - mixxx-1.6.0_beta1.ebuild:
208 - fix mixxx-1.6.0beta1 install_root and prefix
209 -
210 - 04 Jan 2008; Frieder Buerzele <evermind@×××××××××.org> ChangeLog:
211 - bumped mixxx-1.6.0_beta1
212 - fix own cflags and USE flag selection in (1.6.0_beta1 and 9999)
213 -
214 - 17 Dec 2007; Thomas Kuther <gimpel@××××××××××××.org> ChangeLog:
215 - added a changelog
216 -
217
218 diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
219 deleted file mode 100644
220 index c09179e..0000000
221 --- a/media-sound/mixxx/Manifest
222 +++ /dev/null
223 @@ -1,3 +0,0 @@
224 -EBUILD mixxx-9999.ebuild 3797 SHA256 18fd5243a40073a1d4e03d1e54ea23fd651dbd61f698f0b4f48b7e6b72d0f98a SHA512 1d75063e28546b2197d5d9b8f482f7928197a2ffefa5c42c8d091d4da81a46f0fcf9d44e5e24b14d4b26d36ece9efb04ad9fec63787308c6579970b318f83f2b WHIRLPOOL f979a1fb2fa97ea2b06066adcab2b8ac54063543726bc91ea475a0f61b3a009d48c1824354cc62d9450a387eeaa41ef04e9d14862450189407f652ac3ab07520
225 -MISC ChangeLog 8257 SHA256 aadd55750770c6faed596e1935ad00f9af1ac5a17ec3592a8fae1b746c21b434 SHA512 f705341e0dec49311df72e4308e1a413af53197bd5846728bf8a78652542cf5251bf8ccadb54e56fba9e1faf09ea24728f975d2fa2ff023e8692355b240279db WHIRLPOOL 1ebb24fe84bda384708e6bf415ad7d8109be5b9f7e765446af81a4fb517d13e17344a43fddd922be8faa771db5c979b88c8a9055bee1e38013022d6be5899b7e
226 -MISC metadata.xml 549 SHA256 7021bc46cf6acdd5fa15dfbe03aee4afd97ff5b2c7f1b4165f673d659761c95b SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296 WHIRLPOOL fc44885e723d1fa6e1799b293d110ea5268d9da79136cf2358f6eff026d495c113af785ee7ee0384f4b0d4b44ef5a48741f73da9709f4dc846c1008e57a29615
227
228 diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
229 deleted file mode 100644
230 index 4627d1b..0000000
231 --- a/media-sound/mixxx/metadata.xml
232 +++ /dev/null
233 @@ -1,16 +0,0 @@
234 -<?xml version='1.0' encoding='UTF-8'?>
235 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
236 -<pkgmetadata>
237 - <maintainer type="project">
238 - <email>proaudio@g.o</email>
239 - <name>Gentoo ProAudio Project</name>
240 - </maintainer>
241 - <use>
242 - <flag name="hid">Enable HID controller support</flag>
243 - <flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
244 - </use>
245 - <upstream>
246 - <remote-id type="sourceforge">mixxx</remote-id>
247 - <remote-id type="github">mixxxdj/mixxx</remote-id>
248 - </upstream>
249 -</pkgmetadata>
250
251 diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
252 deleted file mode 100644
253 index 14e9030..0000000
254 --- a/media-sound/mixxx/mixxx-9999.ebuild
255 +++ /dev/null
256 @@ -1,149 +0,0 @@
257 -# Copyright 1999-2017 Gentoo Foundation
258 -# Distributed under the terms of the GNU General Public License v2
259 -
260 -EAPI=6
261 -
262 -inherit flag-o-matic scons-utils toolchain-funcs
263 -
264 -DESCRIPTION="Advanced Digital DJ tool based on Qt"
265 -HOMEPAGE="https://www.mixxx.org/"
266 -
267 -if [[ ${PV} == "9999" ]]; then
268 - EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
269 - inherit git-r3
270 - KEYWORDS=""
271 -else
272 - SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz"
273 -
274 - # Upstream patches
275 - SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch"
276 - SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch"
277 - KEYWORDS="amd64 x86"
278 -
279 - PATCHES=(
280 - "${FILESDIR}"/${PN}-2.0.0-docs.patch
281 -
282 - "${DISTDIR}"/${P}-ffmpeg30.patch
283 - "${DISTDIR}"/${P}-ffmpeg31.patch
284 -
285 - "${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
286 - "${FILESDIR}"/${P}-gcc62.patch #595090
287 -
288 - "${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776
289 -
290 - # The following patches were taken from sunny-overlay (bug #608430)
291 - "${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch
292 - "${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch
293 - "${FILESDIR}"/${P}-fix-missing-pointer-initialization.patch
294 - "${FILESDIR}"/${P}-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
295 - "${FILESDIR}"/${P}-fix-formatting-of-time-durations2.patch
296 - "${FILESDIR}"/${P}-rmx2-backport-controller-scripts.patch
297 - )
298 -fi
299 -
300 -LICENSE="GPL-2"
301 -SLOT="0"
302 -IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"
303 -
304 -# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
305 -# got fixed
306 -RDEPEND="
307 - dev-db/sqlite
308 - dev-libs/protobuf:0=
309 - dev-qt/qtconcurrent:5
310 - dev-qt/qtcore:5
311 - dev-qt/qtgui:5
312 - dev-qt/qtnetwork:5
313 - dev-qt/qtopengl:5
314 - dev-qt/qtscript:5[scripttools]
315 - dev-qt/qtsql:5
316 - dev-qt/qtsvg:5
317 - dev-qt/qtwidgets:5
318 - dev-qt/qtxml:5
319 - media-libs/chromaprint
320 - media-libs/flac
321 - media-libs/libid3tag
322 - media-libs/libogg
323 - media-libs/libsndfile
324 - >=media-libs/libsoundtouch-1.5
325 - media-libs/libvorbis
326 - >=media-libs/portaudio-19_pre
327 - media-libs/portmidi
328 - media-libs/rubberband
329 - media-libs/taglib
330 - media-libs/vamp-plugin-sdk
331 - sci-libs/fftw:3.0=
332 - virtual/libusb:1
333 - virtual/opengl
334 - x11-libs/libX11
335 - aac? (
336 - media-libs/faad2
337 - media-libs/libmp4v2:0
338 - )
339 - hid? ( dev-libs/hidapi )
340 - mp3? ( media-libs/libmad )
341 - mp4? ( media-libs/libmp4v2:= )
342 - shout? ( media-libs/libshout )
343 - wavpack? ( media-sound/wavpack )
344 - ffmpeg? ( media-video/ffmpeg:0= )
345 -"
346 -# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
347 -DEPEND="
348 - ${RDEPEND}
349 - virtual/pkgconfig
350 - dev-qt/qttest:5
351 - dev-qt/qtxmlpatterns:5
352 -"
353 -
354 -src_prepare() {
355 - # use multilib compatible directory for plugins
356 - sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
357 -
358 - default
359 -}
360 -
361 -src_configure() {
362 - local myoptimize=0
363 -
364 - # Required for >=qt-5.7.0 (bug #590690)
365 - append-cxxflags -std=c++11
366 -
367 - # Try to get cpu type based on CFLAGS.
368 - # Bug #591968
369 - for i in $(get-flag mcpu) $(get-flag march) ; do
370 - if [[ ${i} = native ]] ; then
371 - myoptimize="native"
372 - break
373 - fi
374 - done
375 -
376 - myesconsargs=(
377 - prefix="${EPREFIX}/usr"
378 - qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
379 - faad="$(usex aac 1 0)"
380 - ffmpeg="$(usex ffmpeg 1 0)"
381 - hid="$(usex hid 1 0)"
382 - hifieq=1
383 - m4a="$(usex mp4 1 0)"
384 - mad="$(usex mp3 1 0)"
385 - optimize="${myoptimize}"
386 - qdebug="$(usex debug 1 0)"
387 - qt5=1
388 - shoutcast="$(usex shout 1 0)"
389 - vinylcontrol=1
390 - wv="$(usex wavpack 1 0)"
391 - )
392 -}
393 -
394 -src_compile() {
395 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
396 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
397 -}
398 -
399 -src_install() {
400 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
401 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
402 - install_root="${ED}"/usr install
403 -
404 - dodoc README Mixxx-Manual.pdf
405 -}