-media-sound/mixxx: bump to 2.0.0-rc2

media-sound/mixxx/Manifest

@@ -5,8 +5,11 @@ AUX mixxx-1.12.9999-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36
 AUX mixxx-2.0.0_rc1-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
 AUX mixxx-2.0.0_rc1-prevent-null-networkstreamworker.patch 1958 SHA256 5255b05521e7337586aafa9c20401d7a244f488f2e239dc757afc9e2f2ce9801 SHA512 f9dfba6e2ab6ad475d4ad195be01e60a960ebeb7bf3c4b3e9a90377cfa5dc683182b6d9ba72e8f657eb3e0d5fc26270ca9b391ded770e43b63ae54dda5f8f775 WHIRLPOOL ded9bea39c21fdaeda3c5eb367c1186697e6dbe6eba7c582964b76c76e175f132712d1a8b03505394593b4b8b4674eec59047c07219e64ce7b6567d5bd2c3956
 AUX mixxx-2.0.0_rc1-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36f5ca24ba22cd1f7d82dd264b9762081a5b SHA512 44e71b5e02a32fa2f533dc07d4d320d18fe112e7e1342db594e49080ec987ae389b696f5f7ed17cb3b101789916936367b88a6aa0fd755b8d0e7028741c46bc2 WHIRLPOOL f810b7254de4421eebc28c12e7255d3b05f95e93758d51c8bd992fd9d4152537448eebaeaf7703f15d032e139276503ccae360a49c8766395988b67729b345d1
+AUX mixxx-2.0.0_rc2-fix-qtgl-build.patch 1680 SHA256 a3f264464eff8730ed1d9a78cf391059851907a6e9b2238035942464e0c1f7ca SHA512 93ae0cdb814a00516128540e8d08add5cd368007d51f0633a02088c4d02540ea6bc75f334ad5a9caf572556c9c4c63aa06a82702e1501e884eef854db767983d WHIRLPOOL 618c9488054f62950eeb102e2829eb5b9895e2d2d23763d2a55e4bef48f7dffdf4b8bfd808f0f7d0106bc8f3384dbc2d1285258f2d8e70e7d7c5cdfa9583e6ea
 DIST mixxx-1.12.0_beta1.tar.gz 24780154 SHA256 1204b04044b090b297c2863118dde4f2962d557f9bf606b1069efe824e18616f SHA512 1fe6ca8c876b2a33c3e0a329ddf53856e037f2e8e6574dae86c46a364cf604f124d0f8e2f5abd150307c4baeeeb7cf9c516d681989d2f7cf54c421ce7ddb76bb WHIRLPOOL e4e970e301509d36d555d07b317828f81734509f739bebeac174007048a800910eecd546c8e1beacb2baec7a96220a35012abdde4703b7c67e497843d915bb53
 DIST mixxx-2.0.0_rc1.tar.gz 25148494 SHA256 00d8de512e21ea1787676392df935e698eba5c21599703eb6ff16a5ef9527352 SHA512 dc46a0a27d48ca0f4319590dcacffd548051f8f9619b6e775b09efff7ef5795cfae62d83ae9daecede11c197640617f41f5f5fce2c997c33048f9e59ac4a58a9 WHIRLPOOL c258e753ef212f4b78618f39abc6fcce6e9e181359f6a0156a476eea6b857f1220ede1a99b7dda6f3b4865c35420f083e6742fdfc52a9cf31efd222ab8afd437
+DIST mixxx-2.0.0_rc2.tar.gz 25443582 SHA256 0ac46ad679f52d8c39470dd469da95c9f56f8b9491f8441dd3f2fffcee82970a SHA512 dcdc532175bc38ddf9f7cbec612c2cb5edb75f4998c4506298a766f0f7ea4cb340cefeb4eccaa572c94a63a1feedc068b77f6674ecc5ea1e7553f6d951c18fb4 WHIRLPOOL 262aed0a9aae8e8e87b16947a33eeae6a75a06c9c36b2a735357f0f909f3e207e4895c1b096a163e0ab86bee51064bb4b13f5caa8c1d791935c30f76c8b2d863
 EBUILD mixxx-1.12.0_beta1.ebuild 2967 SHA256 f3f6f0ace4be8d81bc845a0f6b14863b87f6ea646591e9074603c955d8d696cd SHA512 dba6f02ea2f9e314e1a323a3130448daddd0301f1387691b737a5cdc2363d50b5471360a5e2982e9ace2c8f237ecfa793c46405c6998edb1618afe38deb5602a WHIRLPOOL 1d2468c49cccc84b03c705672a33dcf5ff33fe5755908ca99a6a2eaf534c39550cdad50cfcb9cfe93dbb2fe9ebdc2e108baa39dd1b2498d366024ba810d661e0
 EBUILD mixxx-1.12.9999.ebuild 2679 SHA256 cbc078e3536fb0a3b1ce02fa478b99aaafb2ffd666c8cbe38ff99333fdd4f7fc SHA512 485cfde679e9501a2f7a1467bf76ed9c1ba408fdc40e6ec8f55517f41ae7d970255a25954b5a992c7eb3b5fab8b1a69d195cead73726190b104618d8cc7d6202 WHIRLPOOL 4ea86a7690d5cb0ec9334f51d05cea0bf317e0f7e1589fc2ea348d2ba8b49682820024328db3031372d075cc5eb15de0b2f4e7b6835cbba876ed78a30a6a2e44
 EBUILD mixxx-2.0.0_rc1.ebuild 2788 SHA256 d4f403ac78289ce25e8dbbedf5de355134361fd83075ee19ac7e99a7d7d78c59 SHA512 5e6ff81c6e3b6971c9d8e739a7cc455ef547a9aa69d183e08ba165b7d9a0c213d71c16a2f378b316267f964f78d6865e1a2e113e876b1f2ff4ce8416c304664d WHIRLPOOL 1b91f783ae32f0cf5bad32f15f42bed349de738e6f95cb201aede4baa4c8d363c721c2610b3f5dfa1c393f5f316402f3f37504d679a2b30c60f240e763f1a92c
+EBUILD mixxx-2.0.0_rc2.ebuild 2792 SHA256 0c52fc066340e2068b90f97e227defd387db70e6d5ddfce73bf89148af464219 SHA512 7a03a539a9808c139d7c0e6fb225654803e6421fcab34bd3f31680743ea01798a193957edab91a652a37d1994fbe836fe526b86eb2c88d44eccae63cb748e41b WHIRLPOOL 116cfcf497da05fba33e561a63d2602c6baa47f1690c1cc55254aec64afb86f0ec2f9de7f8fceed16acdf092c97cf4f3bd07ba4f7807947d7fa987fac1a63b26

media-sound/mixxx/files/mixxx-2.0.0_rc2-fix-qtgl-build.patch

@@ -0,0 +1,66 @@
+diff -dNur a/src/waveform/vsyncthread.cpp b/src/waveform/vsyncthread.cpp
+--- a/src/waveform/vsyncthread.cpp	2015-12-17 02:44:04.000000000 +0100
++++ b/src/waveform/vsyncthread.cpp	2015-12-19 17:29:19.449521628 +0100
+@@ -1,4 +1,5 @@
+ #include <QThread>
++#include <QGLWidget>
+ #include <QGLFormat>
+ #include <QTime>
+ #include <QtDebug>
+@@ -131,12 +132,8 @@
+     glw->swapBuffers();
+ #else
+ #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+-#ifdef QT_OPENGL_ES_2
+-    glw->swapBuffers();
+-#else
+     const QX11Info *xinfo = qt_x11Info(glw);
+     glXSwapBuffers(xinfo->display(), glw->winId());
+-#endif
+ #else
+     glw->swapBuffers();
+ #endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+diff -dNur a/src/waveform/vsyncthread.h b/src/waveform/vsyncthread.h
+--- a/src/waveform/vsyncthread.h	2015-12-17 02:44:04.000000000 +0100
++++ b/src/waveform/vsyncthread.h	2015-12-19 17:29:19.449521628 +0100
+@@ -5,7 +5,6 @@
+ #include <QThread>
+ #include <QSemaphore>
+ #include <QPair>
+-#include <QGLWidget>
+ 
+ #if defined(__APPLE__)
+ 
+@@ -13,19 +12,26 @@
+ 
+ #else
+ #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+-#ifndef QT_OPENGL_ES_2
+     #include <qx11info_x11.h>
++#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
++#endif
++
++#include "util/performancetimer.h"
++
++
++#if defined(__APPLE__)
++
++#elif defined(__WINDOWS__)
++
++#else
+     #include <GL/glx.h>
+-    //#include "GL/glxext.h"
++    #include "GL/glxext.h"
+     // clean up after Xlib.h, which #defines values that conflict with QT.
+     #undef Bool
+     #undef Unsorted
+-#endif // QT_OPENGL_ES_2
+-#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #endif
+ 
+-#include "util/performancetimer.h"
+-
++class QGLWidget;
+ class GuiTick;
+ class MixxxMainWindow;
+ 

media-sound/mixxx/mixxx-2.0.0_rc2.ebuild

@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://www.mixxx.org/"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio +qt4 qt5 shout wavpack"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="dev-libs/protobuf
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0
+	virtual/glu
+	virtual/opengl
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtsql:4
+		dev-qt/qtsvg:4
+		dev-qt/qttest:4
+		dev-qt/qtwebkit:4
+		dev-qt/qtxmlpatterns:4
+	)
+	qt5? (
+		>=dev-qt/qtscript-5.4.2:5[scripttools]
+		>=dev-qt/qtsvg-5.4.2:5
+		>=dev-qt/qtsql-5.4.2:5
+		>=dev-qt/qtxml-5.4.2:5
+		>=dev-qt/qtopengl-5.4.2:5
+		>=dev-qt/qtgui-5.4.2:5
+		>=dev-qt/qtnetwork-5.4.2:5
+		>=dev-qt/qtcore-5.4.2:5
+		>=dev-qt/qtwidgets-5.4.2:5
+		>=dev-qt/qttest-5.4.2:5
+		>=dev-qt/qtxmlpatterns-5.4.2:5
+		>=dev-qt/qtconcurrent-5.4.2:5
+	)
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	ffmpeg? ( virtual/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-release-${PV/_/-}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.0_rc1-system-libs.patch
+	epatch "${FILESDIR}"/${PN}-2.0.0_rc1-docs.patch
+	epatch "${FILESDIR}"/${P}-fix-qtgl-build.patch
+
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt5
+	else
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4
+	fi
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${QTDIR}"
+		hifieq=1
+		vinylcontrol=1
+		optimize=0
+		$(use_scons qt5)
+		$(use_scons aac faad)
+		$(use_scons debug qdebug)
+		$(use_scons hid hid)
+		$(use_scons mp3 mad)
+		$(use_scons mp4 m4a)
+		$(use_scons ffmpeg)
+		$(use_scons shout shoutcast)
+		$(use_scons wavpack wv)
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons install \
+		install_root="${ED}"/usr
+
+	dodoc README Mixxx-Manual.pdf
+}