dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 11:42:40 +01:00
Code Issues Releases Wiki Activity

- media-sound/mixxx: bump to 2.0.0, remove old

Browse Source
This commit is contained in:
David GUGLIELMI
2015-12-30 15:38:53 +00:00
parent a750554c47
commit 51bf2801b7
10 changed files with 4 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media-sound/mixxx/Manifest
View File

@@ -1,15 +1,7 @@
AUX mixxx-1.12.0_beta1-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
AUX mixxx-1.12.0_beta1-use-cpp-built-in-types.patch 944 SHA256 69e1e1af26f0893ea7d5a3c2eb0cd8207e50b9a0de30194dc7719d3057cd1540 SHA512 6d0750bb3d1261602af99d401b63183d1c2380cd4958c1236fe1d4f618f541b3e77ed00ea14b341a474fc929c21b9ce20f8cb051de7f23db002d2d1c0c68a357 WHIRLPOOL e0294c52f45309bad2f07120c4480690d3373810689166ee7b328f689ddb93a1e50d44570dc7e81426dec8827cd4b476527772a6ef60936f6656288d47bdc024
AUX mixxx-1.12.9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
AUX mixxx-1.12.9999-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36f5ca24ba22cd1f7d82dd264b9762081a5b SHA512 44e71b5e02a32fa2f533dc07d4d320d18fe112e7e1342db594e49080ec987ae389b696f5f7ed17cb3b101789916936367b88a6aa0fd755b8d0e7028741c46bc2 WHIRLPOOL f810b7254de4421eebc28c12e7255d3b05f95e93758d51c8bd992fd9d4152537448eebaeaf7703f15d032e139276503ccae360a49c8766395988b67729b345d1
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
AUX mixxx-2.0.0-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
AUX mixxx-2.0.0-system-libs.patch 5879 SHA256 daca3a3662ecf4fedffdc610199d36f5ca24ba22cd1f7d82dd264b9762081a5b SHA512 44e71b5e02a32fa2f533dc07d4d320d18fe112e7e1342db594e49080ec987ae389b696f5f7ed17cb3b101789916936367b88a6aa0fd755b8d0e7028741c46bc2 WHIRLPOOL f810b7254de4421eebc28c12e7255d3b05f95e93758d51c8bd992fd9d4152537448eebaeaf7703f15d032e139276503ccae360a49c8766395988b67729b345d1
DIST mixxx-2.0.0.tar.gz 25075794 SHA256 688d87d907f3ad3721602f44295a4d0caa41502df8504ca9264ca0c87d8818f1 SHA512 c0ae850408a63c1b916bde6adaadd5860277f1d8fefbed8bf385c4cc7f5b898bcf220d82eba6942493b8551031907160ecf2cb53a1201a8e82726303e6c23149 WHIRLPOOL 6044379535f0d966485f37bb0da9d476230a902dae034b305742e616ac730780e62e29022ec8e40125d229c1b81d9b7cfc030f5f3f7ebc23cbcf301983cd6a70
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
EBUILD mixxx-2.0.0.ebuild 2722 SHA256 9ce4dbc96e73824e579e0e5d1e978afd04013398086f0b7f60ec158a68624505 SHA512 5512b6f0f901c6cc15712dcbf4d71f39ce5113eeafbbe74a24155e40886ef4cad2002ced4d3d80ad7f6b02864c7678da28288276774266ccace23cd456fbf357 WHIRLPOOL 26bc20e830900f44f917082b01322937333c5222b6252f6f8d32560ff10db881cf04154c21b80b782ed86a8f3711b020a9be95974fa3beba62f43386c5ee4494

139
media-sound/mixxx/files/mixxx-1.12.0_beta1-system-libs.patch
View File

@@ -1,139 +0,0 @@
diff --git a/build/depends.py b/build/depends.py
index 77f4c4f..a3d0df0 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -378,42 +363,17 @@ class ReplayGain(Dependence):
class SoundTouch(Dependence):
- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sources(self, build):
- return ['engine/enginebufferscalest.cpp',
- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
- # SoundTouch CPU optimizations are only for x86
- # architectures. SoundTouch automatically ignores these files
- # when it is not being built for an architecture that supports
- # them.
- '#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH]
+ return ['engine/enginebufferscalest.cpp']
def configure(self, build, conf, env=None):
if env is None:
env = build.env
- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
-
- # Prevents circular import.
- from features import Optimize
-
- # If we do not want optimizations then disable them.
- optimize = (build.flags['optimize'] if 'optimize' in build.flags
- else Optimize.get_optimization_level())
- if optimize == Optimize.LEVEL_OFF:
- env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
+ if not conf.CheckLib(['SoundTouch','libSoundTouch']):
+ raise Exception('Did not find SoundTouch library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
+ build.env.Append(LIBS='SoundTouch')
class RubberBand(Dependence):
diff --git a/build/features.py b/build/features.py
index 2ef1ecd..c100f3b 100644
--- a/build/features.py
+++ b/build/features.py
@@ -45,7 +45,6 @@ class HSS1394(Feature):
class HID(Feature):
- HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
def description(self):
return "HID controller support"
@@ -62,10 +61,6 @@ class HID(Feature):
def configure(self, build, conf):
if not self.enabled(build):
return
- # TODO(XXX) allow external hidapi install, but for now we just use our
- # internal one.
- build.env.Append(
- CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
if build.platform_is_linux:
build.env.ParseConfig(
@@ -89,23 +84,18 @@ class HID(Feature):
build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
build.env.Append(CPPDEFINES='__HID__')
+
+ if not conf.CheckLib('hidapi-libusb'):
+ raise Exception('Did not find HID API library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
+ build.env.Append(LIBS='hidapi-libusb')
+
def sources(self, build):
sources = ['controllers/hid/hidcontroller.cpp',
'controllers/hid/hidenumerator.cpp',
'controllers/hid/hidcontrollerpresetfilehandler.cpp']
- if build.platform_is_windows:
- # Requires setupapi.lib which is included by the above check for
- # setupapi.
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
- elif build.platform_is_linux:
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
- elif build.platform_is_osx:
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
return sources
@@ -717,24 +707,15 @@ class TestSuite(Feature):
test_env.Append(CCFLAGS='-pthread')
test_env.Append(LINKFLAGS='-pthread')
- test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
- gtest_dir = test_env.Dir("#lib/gtest-1.7.0")
- # gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
- # build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example,
- # optional
- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.7.0/lib'
-
- env = test_env
- SCons.Export('env')
- env.SConscript(env.File('SConscript', gtest_dir))
-
- # build and configure gmock
- test_env.Append(CPPPATH="#lib/gmock-1.7.0/include")
- gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
- # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
-
- env.SConscript(env.File('SConscript', gmock_dir))
+ if not conf.CheckLib('gtest'):
+ raise Exception('Did not find gtest library, exiting!')
+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
+ test_env.Append(LIBS='gtest')
+
+ if not conf.CheckLib('gmock'):
+ raise Exception('Did not find gmock library, exiting!')
+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
+ test_env.Append(LIBS='gmock')
return []

35
media-sound/mixxx/files/mixxx-1.12.0_beta1-use-cpp-built-in-types.patch
View File

@@ -1,35 +0,0 @@
diff -dNur a/src/soundsourceffmpeg.cpp b/src/soundsourceffmpeg.cpp
--- a/src/soundsourceffmpeg.cpp 2015-09-18 11:48:36.423194604 +0000
+++ b/src/soundsourceffmpeg.cpp 2015-09-18 11:56:15.933501047 +0000
@@ -509,7 +509,7 @@
m_iCurrentMixxTs = filepos;
- m_bIsSeeked = TRUE;
+ m_bIsSeeked = true;
return filepos;
}
@@ -521,7 +521,7 @@
// Make sure we allways start at begining and cache have some
// material that we can consume.
seek(0);
- m_bIsSeeked = FALSE;
+ m_bIsSeeked = false;
}
getBytesFromCache((char *)destination, m_iCurrentMixxTs, size);
@@ -530,11 +530,11 @@
// As this is also Hack
// If we don't seek like we don't on analyzer.. keep
// place in mind..
- if (m_bIsSeeked == FALSE) {
+ if (m_bIsSeeked == false) {
m_iCurrentMixxTs += size;
}
- m_bIsSeeked = FALSE;
+ m_bIsSeeked = false;
return size;
}

0
media-sound/mixxx/files/mixxx-2.0.0_rc1-docs.patch → media-sound/mixxx/files/mixxx-2.0.0-docs.patch
View File

0
media-sound/mixxx/files/mixxx-2.0.0_rc1-system-libs.patch → media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch
View File

54
media-sound/mixxx/files/mixxx-2.0.0_rc1-prevent-null-networkstreamworker.patch
View File

@@ -1,54 +0,0 @@
From 6aeea5f8ec42c6d99cd5610d24673978c5e80a28 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rryan@mixxx.org>
Date: Sat, 5 Dec 2015 17:32:06 -0800
Subject: [PATCH] Add protection against null NetworkStreamWorker in
EngineNetworkStream. Fixes segfault on startup when built with broadcasting
disabled.
---
src/engine/sidechain/enginenetworkstream.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp
index 1b5b11e..88734b4 100644
--- a/src/engine/sidechain/enginenetworkstream.cpp
+++ b/src/engine/sidechain/enginenetworkstream.cpp
@@ -92,6 +92,9 @@ int EngineNetworkStream::getReadExpected() {
}
void EngineNetworkStream::write(const CSAMPLE* buffer, int frames) {
+ if (m_pWorker.isNull()) {
+ return;
+ }
//qDebug() << "EngineNetworkStream::write()" << frames;
if (!m_pWorker->threadWaiting()) {
@@ -119,6 +122,9 @@ void EngineNetworkStream::write(const CSAMPLE* buffer, int frames) {
}
void EngineNetworkStream::writeSilence(int frames) {
+ if (m_pWorker.isNull()) {
+ return;
+ }
//qDebug() << "EngineNetworkStream::writeSilence()" << frames;
if (!m_pWorker->threadWaiting()) {
// no thread waiting, so we can advance the stream without
@@ -152,6 +158,9 @@ void EngineNetworkStream::writeSilence(int frames) {
}
void EngineNetworkStream::scheduleWorker() {
+ if (m_pWorker.isNull()) {
+ return;
+ }
if (m_pOutputFifo->readAvailable()
>= m_numOutputChannels * kNetworkLatencyFrames) {
m_pWorker->outputAvailable();
@@ -237,5 +246,7 @@ qint64 EngineNetworkStream::getNetworkTimeUs() {
void EngineNetworkStream::addWorker(QSharedPointer<NetworkStreamWorker> pWorker) {
m_pWorker = pWorker;
- m_pWorker->setOutputFifo(m_pOutputFifo);
+ if (m_pWorker) {
+ m_pWorker->setOutputFifo(m_pOutputFifo);
+ }
}

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

@@ -1,66 +0,0 @@
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;

124
media-sound/mixxx/mixxx-1.12.0_beta1.ebuild
View File

@@ -1,124 +0,0 @@
# 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}-1.12.0_beta1-system-libs.patch
epatch "${FILESDIR}"/${PN}-1.12.9999-docs.patch
epatch "${FILESDIR}"/${PN}-1.12.0_beta1-use-cpp-built-in-types.patch
# use multilib compatible directory for plugins
sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
# alter startup command when pulseaudio support is disabled
if ! use pulseaudio ; then
sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
fi
}
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
}

1
media-sound/mixxx/mixxx-2.0.0_rc1.ebuild → media-sound/mixxx/mixxx-2.0.0.ebuild
View File

@@ -74,7 +74,6 @@ S="${WORKDIR}/${PN}-release-${PV/_/-}"
src_prepare() {
epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-prevent-null-networkstreamworker.patch
# use multilib compatible directory for plugins
sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die

119
media-sound/mixxx/mixxx-2.0.0_rc2.ebuild
View File

@@ -1,119 +0,0 @@
# 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
}