| 1 |
ssuominen 10/04/27 18:47:49 |
| 2 |
|
| 3 |
Added: mixxx-1.7.2-external_libsoundtouch.patch |
| 4 |
Log: |
| 5 |
Use external libsoundtouch wrt #315349 by Alex Barker. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/mixxx/files/mixxx-1.7.2-external_libsoundtouch.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mixxx/files/mixxx-1.7.2-external_libsoundtouch.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mixxx/files/mixxx-1.7.2-external_libsoundtouch.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mixxx-1.7.2-external_libsoundtouch.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/show_bug.cgi?id=315349 |
| 17 |
|
| 18 |
--- src/SConscript |
| 19 |
+++ src/SConscript |
| 20 |
@@ -737,9 +737,6 @@ |
| 21 |
else: |
| 22 |
env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax |
| 23 |
env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g""")) |
| 24 |
- if platform != 'osx': |
| 25 |
- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") |
| 26 |
- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") |
| 27 |
env.Append(CPPDEFINES = "_REENTRANT") |
| 28 |
|
| 29 |
#Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms |
| 30 |
@@ -772,29 +769,9 @@ |
| 31 |
|
| 32 |
#SoundTouch |
| 33 |
#XXX this should be done with a subsconscript |
| 34 |
-env.Append(CPPPATH=['#lib/soundtouch-1.4.1']) |
| 35 |
-sources += Split("""engine/enginebufferscalest.cpp |
| 36 |
- #lib/soundtouch-1.4.1/SoundTouch.cpp |
| 37 |
- #lib/soundtouch-1.4.1/TDStretch.cpp |
| 38 |
- #lib/soundtouch-1.4.1/RateTransposer.cpp |
| 39 |
- #lib/soundtouch-1.4.1/AAFilter.cpp |
| 40 |
- #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp |
| 41 |
- #lib/soundtouch-1.4.1/FIRFilter.cpp |
| 42 |
- #lib/soundtouch-1.4.1/PeakFinder.cpp |
| 43 |
- #lib/soundtouch-1.4.1/BPMDetect.cpp |
| 44 |
- """) |
| 45 |
- |
| 46 |
-if 'win' in platform: |
| 47 |
- if platform == 'win32': |
| 48 |
- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""") |
| 49 |
- if platform == 'win64': |
| 50 |
- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""") |
| 51 |
-else: |
| 52 |
- if machine == 'x86_64': |
| 53 |
- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""") |
| 54 |
- else: |
| 55 |
- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""") |
| 56 |
- |
| 57 |
+sources += Split("""engine/enginebufferscalest.cpp""") |
| 58 |
+env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ]) |
| 59 |
+env.Append(LIBS = 'SoundTouch') |
| 60 |
|
| 61 |
#KissFFT |
| 62 |
env.Append(CPPPATH=['#lib/kissfft']) |
Archives