dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 13:52: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

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;