aboutsummaryrefslogtreecommitdiff
path: root/audio/mixxx
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mixxx')
-rw-r--r--audio/mixxx/files/patch-build_depends.py (renamed from audio/mixxx/files/patch-build__depends.py)18
-rw-r--r--audio/mixxx/files/patch-build_features.py (renamed from audio/mixxx/files/patch-build__features.py)8
-rw-r--r--audio/mixxx/files/patch-build_qt4.py (renamed from audio/mixxx/files/patch-build__qt4.py)6
-rw-r--r--audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c (renamed from audio/mixxx/files/patch-lib__hidapi-0.8.0-pre__linux__hid-libusb.c)8
-rw-r--r--audio/mixxx/files/patch-src_controllers_controllermanager.cpp (renamed from audio/mixxx/files/patch-src__controllers__controllermanager.cpp)4
-rw-r--r--audio/mixxx/files/patch-src_defs.h (renamed from audio/mixxx/files/patch-src__defs.h)6
-rw-r--r--audio/mixxx/files/patch-src_recording_encodermp3.cpp (renamed from audio/mixxx/files/patch-src__recording__encodermp3.cpp)8
-rw-r--r--audio/mixxx/files/patch-src_sounddeviceportaudio.cpp (renamed from audio/mixxx/files/patch-src__sounddeviceportaudio.cpp)6
-rw-r--r--audio/mixxx/files/patch-src_soundmanager.cpp (renamed from audio/mixxx/files/patch-src__soundmanager.cpp)8
-rw-r--r--audio/mixxx/files/patch-src_soundmanagerconfig.cpp (renamed from audio/mixxx/files/patch-src__soundmanagerconfig.cpp)6
-rw-r--r--audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp (renamed from audio/mixxx/files/patch-src__soundsourceoggvorbis.cpp)4
-rw-r--r--audio/mixxx/files/patch-src_soundsourceproxy.cpp (renamed from audio/mixxx/files/patch-src__soundsourceproxy.cpp)6
12 files changed, 44 insertions, 44 deletions
diff --git a/audio/mixxx/files/patch-build__depends.py b/audio/mixxx/files/patch-build_depends.py
index e638fe61a289..2125e9f8771e 100644
--- a/audio/mixxx/files/patch-build__depends.py
+++ b/audio/mixxx/files/patch-build_depends.py
@@ -1,6 +1,6 @@
---- build/depends.py.orig 2012-01-16 06:02:51.000000000 +0900
-+++ build/depends.py 2012-01-16 06:04:08.000000000 +0900
-@@ -150,7 +150,7 @@
+--- build/depends.py.orig 2013-05-08 23:20:26 UTC
++++ build/depends.py
+@@ -150,7 +150,7 @@ class FLAC(Dependence):
class Qt(Dependence):
DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
@@ -9,7 +9,7 @@
'osx': '/Library/Frameworks',
'windows': 'C:\\qt\\4.6.0'}
-@@ -219,6 +219,7 @@
+@@ -219,6 +219,7 @@ class Qt(Dependence):
build.env.Append(LIBS = 'QtOpenGL')
build.env.Append(LIBS = 'QtXml')
build.env.Append(LIBS = 'QtNetwork')
@@ -17,7 +17,7 @@
build.env.Append(LIBS = 'QtScript')
if use_qtwebkit:
build.env.Append(LIBS = 'QtWebKit')
-@@ -264,16 +265,16 @@
+@@ -264,16 +265,16 @@ class Qt(Dependence):
# Set Qt include paths for non-OSX
if not build.platform_is_osx:
@@ -43,7 +43,7 @@
build.env.Append(CPPPATH=include_paths)
# Set the rpath for linux/bsd/osx.
-@@ -387,7 +388,7 @@
+@@ -387,7 +388,7 @@ class TagLib(Dependence):
# the files correctly. Adding this folder ot the include path should fix
# it, though might cause issues. This is safe to remove once we
# deprecate Karmic support. rryan 2/2011
@@ -52,7 +52,7 @@
if build.platform_is_windows and build.static_dependencies:
build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
-@@ -782,14 +783,9 @@
+@@ -782,14 +783,9 @@ class MixxxCore(Feature):
if build.toolchain_is_gnu:
# Default GNU Options
# TODO(XXX) always generate debugging info?
@@ -67,7 +67,7 @@
elif build.toolchain_is_msvs:
# Validate the specified winlib directory exists
mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')
-@@ -851,16 +847,19 @@
+@@ -851,16 +847,19 @@ class MixxxCore(Feature):
elif build.platform_is_bsd:
build.env.Append(CPPDEFINES='__BSD__')
@@ -94,7 +94,7 @@
# Define for things that would like to special case UNIX (Linux or BSD)
if build.platform_is_bsd or build.platform_is_linux:
-@@ -897,14 +896,14 @@
+@@ -897,14 +896,14 @@ class MixxxCore(Feature):
# Say where to find resources on Unix. TODO(XXX) replace this with a
# RESOURCE_PATH that covers Win and OSX too:
if build.platform_is_linux or build.platform_is_bsd:
diff --git a/audio/mixxx/files/patch-build__features.py b/audio/mixxx/files/patch-build_features.py
index 262fe600e5c7..e86985c496d3 100644
--- a/audio/mixxx/files/patch-build__features.py
+++ b/audio/mixxx/files/patch-build_features.py
@@ -1,6 +1,6 @@
---- build/features.py.orig
+--- build/features.py.orig 2013-05-08 23:20:26 UTC
+++ build/features.py
-@@ -83,6 +83,9 @@
+@@ -83,6 +83,9 @@ class HID(Feature):
elif build.platform_is_osx:
build.env.Append(LINKFLAGS='-framework IOKit')
build.env.Append(LINKFLAGS='-framework CoreFoundation')
@@ -10,7 +10,7 @@
build.env.Append(CPPDEFINES = '__HID__')
-@@ -95,7 +98,7 @@
+@@ -95,7 +98,7 @@ class HID(Feature):
# Requires setupapi.lib which is included by the above check for
# setupapi.
sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
@@ -19,7 +19,7 @@
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'))
-@@ -108,24 +111,27 @@
+@@ -108,24 +111,27 @@ class Bulk(Feature):
def enabled(self, build):
# For now only make Bulk default on Linux only. Turn on for all
# platforms after the 1.11.0 release.
diff --git a/audio/mixxx/files/patch-build__qt4.py b/audio/mixxx/files/patch-build_qt4.py
index e19f9b9b3630..2a3ccd22bce1 100644
--- a/audio/mixxx/files/patch-build__qt4.py
+++ b/audio/mixxx/files/patch-build_qt4.py
@@ -1,6 +1,6 @@
---- build/qt4.py.orig 2011-12-24 11:53:19.000000000 +0900
-+++ build/qt4.py 2012-01-16 06:10:09.000000000 +0900
-@@ -245,8 +245,8 @@
+--- build/qt4.py.orig 2013-05-08 23:20:26 UTC
++++ build/qt4.py
+@@ -246,8 +246,8 @@ def generate(env):
env.Replace(
# QTDIR = _detect(env),
QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
diff --git a/audio/mixxx/files/patch-lib__hidapi-0.8.0-pre__linux__hid-libusb.c b/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c
index 98d89c21be99..9ef29ab1275b 100644
--- a/audio/mixxx/files/patch-lib__hidapi-0.8.0-pre__linux__hid-libusb.c
+++ b/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c
@@ -1,4 +1,4 @@
---- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig
+--- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig 2013-05-08 23:20:26 UTC
+++ lib/hidapi-0.8.0-pre/linux/hid-libusb.c
@@ -48,6 +48,12 @@
@@ -13,7 +13,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-@@ -264,7 +270,7 @@
+@@ -264,7 +270,7 @@ static uint16_t get_first_language(libus
int len;
/* Get the string from libusb. */
@@ -22,7 +22,7 @@
0x0, /* String ID */
0x0, /* Language */
(unsigned char*)buf,
-@@ -282,7 +288,7 @@
+@@ -282,7 +288,7 @@ static int is_language_supported(libusb_
int i;
/* Get the string from libusb. */
@@ -31,7 +31,7 @@
0x0, /* String ID */
0x0, /* Language */
(unsigned char*)buf,
-@@ -327,7 +333,7 @@
+@@ -327,7 +333,7 @@ static wchar_t *get_usb_string(libusb_de
lang = get_first_language(dev);
/* Get the string from libusb. */
diff --git a/audio/mixxx/files/patch-src__controllers__controllermanager.cpp b/audio/mixxx/files/patch-src_controllers_controllermanager.cpp
index ca6f652786c3..be14f60d1d0e 100644
--- a/audio/mixxx/files/patch-src__controllers__controllermanager.cpp
+++ b/audio/mixxx/files/patch-src_controllers_controllermanager.cpp
@@ -1,4 +1,4 @@
---- src/controllers/controllermanager.cpp.orig
+--- src/controllers/controllermanager.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/controllers/controllermanager.cpp
@@ -12,7 +12,10 @@
#include "controllers/defs_controllers.h"
@@ -11,7 +11,7 @@
#ifdef __HSS1394__
#include "controllers/midi/hss1394enumerator.h"
#endif
-@@ -78,7 +81,9 @@
+@@ -78,7 +81,9 @@ ControllerManager::ControllerManager(Con
m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig);
// Instantiate all enumerators
diff --git a/audio/mixxx/files/patch-src__defs.h b/audio/mixxx/files/patch-src_defs.h
index d15e24eabc9d..04ef41da2eb8 100644
--- a/audio/mixxx/files/patch-src__defs.h
+++ b/audio/mixxx/files/patch-src_defs.h
@@ -1,6 +1,6 @@
---- src/defs.h.orig
+--- src/defs.h.orig 2013-05-08 23:20:26 UTC
+++ src/defs.h
-@@ -87,6 +87,8 @@
+@@ -87,6 +87,8 @@ inline double zap_denormal(double x)
#define math_min(a,b) (((a) < (b)) ? (a) : (b))
#endif
@@ -9,7 +9,7 @@
// MSVC 2005/2008 needs these
#ifndef fmax
#define fmax math_max
-@@ -98,3 +100,5 @@
+@@ -98,3 +100,5 @@ inline double zap_denormal(double x)
#endif
diff --git a/audio/mixxx/files/patch-src__recording__encodermp3.cpp b/audio/mixxx/files/patch-src_recording_encodermp3.cpp
index 8ce01c4d4ca7..5c4c83fd9b30 100644
--- a/audio/mixxx/files/patch-src__recording__encodermp3.cpp
+++ b/audio/mixxx/files/patch-src_recording_encodermp3.cpp
@@ -1,6 +1,6 @@
---- src/recording/encodermp3.cpp.orig 2012-06-26 05:23:37.000000000 +0900
-+++ src/recording/encodermp3.cpp 2012-08-09 09:06:21.000000000 +0900
-@@ -85,7 +85,7 @@
+--- src/recording/encodermp3.cpp.orig 2013-05-08 23:20:26 UTC
++++ src/recording/encodermp3.cpp
+@@ -85,7 +85,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
*/
QStringList libnames;
QString libname = "";
@@ -9,7 +9,7 @@
libnames << "mp3lame";
#elif __WINDOWS__
libnames << "lame_enc.dll";
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
props->setType(DLG_WARNING);
props->setTitle(tr("Encoder"));
QString key = "";
diff --git a/audio/mixxx/files/patch-src__sounddeviceportaudio.cpp b/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp
index 802c2b3a8a23..ff34f62cef20 100644
--- a/audio/mixxx/files/patch-src__sounddeviceportaudio.cpp
+++ b/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp
@@ -1,6 +1,6 @@
---- src/sounddeviceportaudio.cpp.orig 2011-12-24 11:53:20.000000000 +0900
-+++ src/sounddeviceportaudio.cpp 2012-01-16 06:10:09.000000000 +0900
-@@ -182,10 +182,10 @@
+--- src/sounddeviceportaudio.cpp.orig 2013-05-08 23:20:26 UTC
++++ src/sounddeviceportaudio.cpp
+@@ -182,10 +182,10 @@ int SoundDevicePortAudio::open()
qDebug() << "Opened PortAudio stream successfully... starting";
}
diff --git a/audio/mixxx/files/patch-src__soundmanager.cpp b/audio/mixxx/files/patch-src_soundmanager.cpp
index 546f5462f65d..626f63cb0d0b 100644
--- a/audio/mixxx/files/patch-src__soundmanager.cpp
+++ b/audio/mixxx/files/patch-src_soundmanager.cpp
@@ -1,6 +1,6 @@
---- src/soundmanager.cpp.orig 2011-12-24 11:53:20.000000000 +0900
-+++ src/soundmanager.cpp 2012-01-16 06:10:09.000000000 +0900
-@@ -309,7 +309,7 @@
+--- src/soundmanager.cpp.orig 2013-05-08 23:20:26 UTC
++++ src/soundmanager.cpp
+@@ -234,7 +234,7 @@ void SoundManager::queryDevices() {
#ifdef __PORTAUDIO__
PaError err = paNoError;
if (!m_paInitialized) {
@@ -9,7 +9,7 @@
setJACKName();
#endif
err = Pa_Initialize();
-@@ -702,9 +702,9 @@
+@@ -626,9 +626,9 @@ QList<AudioInput> SoundManager::register
void SoundManager::setJACKName() const {
#ifdef __PORTAUDIO__
diff --git a/audio/mixxx/files/patch-src__soundmanagerconfig.cpp b/audio/mixxx/files/patch-src_soundmanagerconfig.cpp
index 0f5246c41040..3eb0c22cfdd8 100644
--- a/audio/mixxx/files/patch-src__soundmanagerconfig.cpp
+++ b/audio/mixxx/files/patch-src_soundmanagerconfig.cpp
@@ -1,6 +1,6 @@
---- src/soundmanagerconfig.cpp.orig 2011-12-24 11:53:20.000000000 +0900
-+++ src/soundmanagerconfig.cpp 2012-01-16 06:10:09.000000000 +0900
-@@ -290,7 +290,7 @@
+--- src/soundmanagerconfig.cpp.orig 2013-05-08 23:20:26 UTC
++++ src/soundmanagerconfig.cpp
+@@ -290,7 +290,7 @@ void SoundManagerConfig::loadDefaults(So
if (flags & SoundManagerConfig::API) {
QList<QString> apiList = soundManager->getHostAPIList();
if (!apiList.isEmpty()) {
diff --git a/audio/mixxx/files/patch-src__soundsourceoggvorbis.cpp b/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp
index 89ee7978514a..5e3d66439f1b 100644
--- a/audio/mixxx/files/patch-src__soundsourceoggvorbis.cpp
+++ b/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp
@@ -1,5 +1,5 @@
---- src/soundsourceoggvorbis.cpp.orig 2011-12-24 11:53:20.000000000 +0900
-+++ src/soundsourceoggvorbis.cpp 2012-01-16 06:10:09.000000000 +0900
+--- src/soundsourceoggvorbis.cpp.orig 2013-05-08 23:20:26 UTC
++++ src/soundsourceoggvorbis.cpp
@@ -32,6 +32,15 @@
#endif
#endif
diff --git a/audio/mixxx/files/patch-src__soundsourceproxy.cpp b/audio/mixxx/files/patch-src_soundsourceproxy.cpp
index 8809f02491dc..56423ca4d62b 100644
--- a/audio/mixxx/files/patch-src__soundsourceproxy.cpp
+++ b/audio/mixxx/files/patch-src_soundsourceproxy.cpp
@@ -1,6 +1,6 @@
---- src/soundsourceproxy.cpp.orig 2011-12-24 11:53:20.000000000 +0900
-+++ src/soundsourceproxy.cpp 2012-01-16 06:10:09.000000000 +0900
-@@ -84,7 +84,7 @@
+--- src/soundsourceproxy.cpp.orig 2013-05-08 23:20:26 UTC
++++ src/soundsourceproxy.cpp
+@@ -84,7 +84,7 @@ void SoundSourceProxy::loadPlugins()
qDebug() << "Adding plugin path from commandline arg:" << pluginPath;
pluginDirs.append(QDir(pluginPath));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 03:10:07 +0000