1 |
commit: bb7eb5e793651709ca29431a1933d01c86e890a5 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Dec 3 08:56:24 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 3 23:39:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7eb5e7 |
7 |
|
8 |
media-sound/mixxx: remove unused patches. |
9 |
|
10 |
media-sound/mixxx/files/mixxx-1.10.0-cflags.patch | 13 -- |
11 |
media-sound/mixxx/files/mixxx-1.10.0-docs.patch | 10 - |
12 |
media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch | 37 ---- |
13 |
.../mixxx/files/mixxx-1.10.0-system-libs.patch | 172 ---------------- |
14 |
media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch | 35 ---- |
15 |
.../mixxx/files/mixxx-1.11.0-system-libs.patch | 223 --------------------- |
16 |
6 files changed, 490 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch |
19 |
deleted file mode 100644 |
20 |
index b6c8655a73a..00000000000 |
21 |
--- a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch |
22 |
+++ /dev/null |
23 |
@@ -1,13 +0,0 @@ |
24 |
---- mixxx-1.10.0/build/depends.py |
25 |
-+++ mixxx-1.10.0/build/depends.py |
26 |
-@@ -623,10 +555,8 @@ |
27 |
- if build.toolchain_is_gnu: |
28 |
- # Default GNU Options |
29 |
- # TODO(XXX) always generate debugging info? |
30 |
-- build.env.Append(CCFLAGS = '-pipe') |
31 |
- build.env.Append(CCFLAGS = '-Wall') |
32 |
- build.env.Append(CCFLAGS = '-Wextra') |
33 |
-- build.env.Append(CCFLAGS = '-g') |
34 |
- |
35 |
- # Check that g++ is present (yeah, SCONS is a bit dumb here) |
36 |
- if os.system("which g++ > /dev/null"): #Checks for non-zero return code |
37 |
|
38 |
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch |
39 |
deleted file mode 100644 |
40 |
index c9205179881..00000000000 |
41 |
--- a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch |
42 |
+++ /dev/null |
43 |
@@ -1,10 +0,0 @@ |
44 |
---- mixxx-1.10.0/src/SConscript |
45 |
-+++ mixxx-1.10.0/src/SConscript |
46 |
-@@ -219,7 +218,6 @@ |
47 |
- env.Alias('install', keyboardmappings) |
48 |
- if int(flags['ladspa']): |
49 |
- env.Alias('install', ladspapresets) |
50 |
-- env.Alias('install', docs) |
51 |
- env.Alias('install', dotdesktop) |
52 |
- env.Alias('install', icon) |
53 |
- env.Alias('install', promotracks) |
54 |
|
55 |
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch |
56 |
deleted file mode 100644 |
57 |
index 40f32266bb5..00000000000 |
58 |
--- a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch |
59 |
+++ /dev/null |
60 |
@@ -1,37 +0,0 @@ |
61 |
---- mixxx-1.10.0/src/SConscript.env |
62 |
-+++ mixxx-1.10.0/src/SConscript.env |
63 |
-@@ -19,21 +19,6 @@ |
64 |
- print "Deleting deprecated build file: %s" % defs |
65 |
- os.remove(defs) |
66 |
- |
67 |
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun |
68 |
--## instead, embed BZR version into build |
69 |
--## Put version info into a file, so it doesn't force a rebuild of everything :) |
70 |
--f = open("build.h","w") |
71 |
--try: |
72 |
-- branch_name = util.get_bzr_branch_name() |
73 |
-- modified = util.get_bzr_modified() > 0 |
74 |
-- # Do not emit BUILD_BRANCH on release branches. |
75 |
-- if not branch_name.startswith('release'): |
76 |
-- f.write('#define BUILD_BRANCH "%s"\n' % branch_name) |
77 |
-- f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(), |
78 |
-- '+' if modified else '')) |
79 |
--finally: |
80 |
-- f.close() |
81 |
-- |
82 |
- #Check for dependencies if we're not doing a clean... |
83 |
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']): |
84 |
- conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig, |
85 |
---- mixxx-1.10.0/src/SConscript |
86 |
-+++ mixxx-1.10.0/src/SConscript |
87 |
-@@ -12,8 +12,8 @@ |
88 |
- from build import util |
89 |
- |
90 |
- mixxx_version = util.get_mixxx_version() |
91 |
--branch_name = util.get_bzr_branch_name() |
92 |
--bazaar_revision = util.get_bzr_revision() |
93 |
-+#branch_name = util.get_bzr_branch_name() |
94 |
-+#bazaar_revision = util.get_bzr_revision() |
95 |
- print "WE ARE IN:", os.getcwd() |
96 |
- |
97 |
- plugins = [] |
98 |
|
99 |
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch |
100 |
deleted file mode 100644 |
101 |
index d2e21f3e005..00000000000 |
102 |
--- a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch |
103 |
+++ /dev/null |
104 |
@@ -1,172 +0,0 @@ |
105 |
---- mixxx-1.10.0/build/depends.py |
106 |
-+++ mixxx-1.10.0/build/depends.py |
107 |
-@@ -21,7 +21,7 @@ |
108 |
- |
109 |
- def configure(self, build, conf): |
110 |
- #Check for PortTime |
111 |
-- if not conf.CheckLib(['porttime', 'libporttime']) and \ |
112 |
-+ if not conf.CheckLib(['porttime', 'libportmidi']) and \ |
113 |
- not conf.CheckHeader(['porttime.h']): |
114 |
- raise Exception("Did not find PortTime or its development headers.") |
115 |
- if not conf.CheckLib(['portmidi', 'libportmidi']) and \ |
116 |
-@@ -189,25 +189,10 @@ |
117 |
- |
118 |
- class FidLib(Dependence): |
119 |
- |
120 |
-- def sources(self, build): |
121 |
-- symbol = None |
122 |
-- if build.platform_is_windows: |
123 |
-- if build.toolchain_is_msvs: |
124 |
-- symbol = 'T_MSVC' |
125 |
-- elif build.crosscompile: |
126 |
-- # Not sure why, but fidlib won't build with mingw32msvc and |
127 |
-- # T_MINGW |
128 |
-- symbol = 'T_LINUX' |
129 |
-- elif build.toolchain_is_gnu: |
130 |
-- symbol = 'T_MINGW' |
131 |
-- else: |
132 |
-- symbol = 'T_LINUX' |
133 |
-- |
134 |
-- return [build.env.StaticObject('#lib/fidlib-0.9.9/fidlib.c', |
135 |
-- CPPDEFINES=symbol)] |
136 |
-- |
137 |
- def configure(self, build, conf): |
138 |
-- build.env.Append(CPPPATH='#lib/fidlib-0.9.9/') |
139 |
-+ if not conf.CheckLib('fidlib'): |
140 |
-+ raise Exception('Did not find fidlib library, exiting!') |
141 |
-+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib']) |
142 |
- |
143 |
- class KissFFT(Dependence): |
144 |
- |
145 |
-@@ -226,68 +211,15 @@ |
146 |
- build.env.Append(CPPPATH="#lib/replaygain") |
147 |
- |
148 |
- class SoundTouch(Dependence): |
149 |
-- SOUNDTOUCH_PATH = 'soundtouch-1.5.0' |
150 |
- |
151 |
- def sources(self, build): |
152 |
-- sources = ['engine/enginebufferscalest.cpp', |
153 |
-- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH, |
154 |
-- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH, |
155 |
-- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH, |
156 |
-- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH, |
157 |
-- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH, |
158 |
-- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH, |
159 |
-- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH, |
160 |
-- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH] |
161 |
-- if build.platform_is_windows and build.toolchain_is_msvs: |
162 |
-- if build.machine_is_64bit: |
163 |
-- sources.append( |
164 |
-- '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH) |
165 |
-- elif build.machine == 'x86': |
166 |
-- sources.append( |
167 |
-- '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH) |
168 |
-- else: |
169 |
-- raise Exception("Unhandled CPU configuration for SoundTouch") |
170 |
-- elif build.toolchain_is_gnu: |
171 |
-- if build.machine == 'x86_64': |
172 |
-- sources.append( |
173 |
-- '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH) |
174 |
-- else: |
175 |
-- sources.append( |
176 |
-- '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH) |
177 |
-- else: |
178 |
-- raise Exception("Unhandled CPU configuration for SoundTouch") |
179 |
-- |
180 |
-- # TODO(XXX) when we figure out a better way to represent features, fix |
181 |
-- # this. |
182 |
-- optimize = int(util.get_flags(build.env, 'optimize', 1)) |
183 |
-- if build.machine_is_64bit or \ |
184 |
-- (build.toolchain_is_msvs and optimize > 1) or \ |
185 |
-- (build.toolchain_is_gnu and optimize > 2): |
186 |
-- sources.extend( |
187 |
-- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH, |
188 |
-- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH, |
189 |
-- ]) |
190 |
-- if build.toolchain_is_msvs and not build.machine_is_64bit: |
191 |
-- sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH) |
192 |
-- else: |
193 |
-- # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have |
194 |
-- # it. |
195 |
-- pass |
196 |
-- |
197 |
-- return sources |
198 |
-+ return ['engine/enginebufferscalest.cpp'] |
199 |
- |
200 |
- def configure(self, build, conf): |
201 |
-- if build.platform_is_windows: |
202 |
-- build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth) |
203 |
-- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH]) |
204 |
-- |
205 |
-- # TODO(XXX) when we figure out a better way to represent features, fix |
206 |
-- # this. |
207 |
-- optimize = int(util.get_flags(build.env, 'optimize', 1)) |
208 |
-- if build.machine_is_64bit or \ |
209 |
-- (build.toolchain_is_msvs and optimize > 1) or \ |
210 |
-- (build.toolchain_is_gnu and optimize > 2): |
211 |
-- build.env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS') |
212 |
-+ if not conf.CheckLib(['SoundTouch','libSoundTouch']): |
213 |
-+ raise Exception('Did not find SoundTouch library, exiting!') |
214 |
-+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch']) |
215 |
-+ build.env.Append(LIBS='SoundTouch') |
216 |
- |
217 |
- class TagLib(Dependence): |
218 |
- def configure(self, build, conf): |
219 |
---- mixxx-1.10.0/build/features.py |
220 |
-+++ mixxx-1.10.0/build/features.py |
221 |
-@@ -665,25 +659,15 @@ |
222 |
- test_env.Append(CCFLAGS = '-pthread') |
223 |
- test_env.Append(LINKFLAGS = '-pthread') |
224 |
- |
225 |
-- test_env.Append(CPPPATH="#lib/gtest-1.5.0/include") |
226 |
-- gtest_dir = test_env.Dir("#lib/gtest-1.5.0") |
227 |
-- #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0')) |
228 |
-- #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example, optional |
229 |
-- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib' |
230 |
-- |
231 |
-- env = test_env |
232 |
-- SCons.Export('env') |
233 |
-- env.SConscript(env.File('SConscript', gtest_dir)) |
234 |
-- |
235 |
-- # build and configure gmock |
236 |
-- test_env.Append(CPPPATH="#lib/gmock-1.5.0/include") |
237 |
-- gmock_dir = test_env.Dir("#lib/gmock-1.5.0") |
238 |
-- #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0')) |
239 |
-- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib' |
240 |
-- |
241 |
-- env.SConscript(env.File('SConscript', gmock_dir)) |
242 |
-- |
243 |
-- return [] |
244 |
-+ if not conf.CheckLib('gtest'): |
245 |
-+ raise Exception('Did not find gtest library, exiting!') |
246 |
-+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest']) |
247 |
-+ test_env.Append(LIBS='gtest') |
248 |
-+ |
249 |
-+ if not conf.CheckLib('gmock'): |
250 |
-+ raise Exception('Did not find gmock library, exiting!') |
251 |
-+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock']) |
252 |
-+ test_env.Append(LIBS='gmock') |
253 |
- |
254 |
- class Shoutcast(Feature): |
255 |
- def description(self): |
256 |
---- mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp |
257 |
-+++ mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp |
258 |
-@@ -20,7 +20,6 @@ |
259 |
- #include "engine/enginefilterbutterworth8.h" |
260 |
- #include "engine/enginefilter.h" |
261 |
- #include "engine/engineobject.h" |
262 |
--#include "../lib/fidlib-0.9.9/fidlib.h" |
263 |
- |
264 |
- /* Local Prototypes */ |
265 |
- inline double _processLowpass(double *coef, double *buf, register double val); |
266 |
---- mixxx-1.10.0/src/engine/enginefilter.h |
267 |
-+++ mixxx-1.10.0/src/engine/enginefilter.h |
268 |
-@@ -20,7 +20,7 @@ |
269 |
- |
270 |
- #define MIXXX |
271 |
- #include "engine/engineobject.h" |
272 |
--#include "../lib/fidlib-0.9.9/fidlib.h" |
273 |
-+#include "fidlib.h" |
274 |
- #include "defs.h" |
275 |
- |
276 |
- enum filterType{ |
277 |
|
278 |
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch |
279 |
deleted file mode 100644 |
280 |
index b89d7f92f76..00000000000 |
281 |
--- a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch |
282 |
+++ /dev/null |
283 |
@@ -1,35 +0,0 @@ |
284 |
---- mixxx-1.11.0/src/SConscript |
285 |
-+++ mixxx-1.11.0/src/SConscript |
286 |
-@@ -12,8 +12,8 @@ |
287 |
- from build import util, depends |
288 |
- |
289 |
- mixxx_version = util.get_mixxx_version() |
290 |
--branch_name = util.get_bzr_branch_name() |
291 |
--bazaar_revision = util.get_bzr_revision() |
292 |
-+#branch_name = util.get_bzr_branch_name() |
293 |
-+#bazaar_revision = util.get_bzr_revision() |
294 |
- print "WE ARE IN:", os.getcwd() |
295 |
- |
296 |
- plugins = [] |
297 |
---- mixxx-1.11.0/src/SConscript.env |
298 |
-+++ mixxx-1.11.0/src/SConscript.env |
299 |
-@@ -20,19 +20,6 @@ |
300 |
- print "Deleting deprecated build file: %s" % defs |
301 |
- os.remove(defs) |
302 |
- |
303 |
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun |
304 |
--## instead, embed BZR version into build |
305 |
--## Put version info into a file, so it doesn't force a rebuild of everything :) |
306 |
-- |
307 |
--if os.path.exists(os.path.join('..', 'build.h')): |
308 |
-- # If a build.h exists in the project root mixxx/ directory then use that |
309 |
-- # instead of writing our own. This is mostly since when we build Debian |
310 |
-- # packages we don't have any of the Bazaar metadata so we can't write one |
311 |
-- # ourselves. |
312 |
-- shutil.copy(os.path.join('..', 'build.h'), 'build.h') |
313 |
--else: |
314 |
-- util.write_build_header('build.h') |
315 |
-- |
316 |
- |
317 |
- #Check for dependencies if we're not doing a clean... |
318 |
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']): |
319 |
|
320 |
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch |
321 |
deleted file mode 100644 |
322 |
index 2f6b62c3440..00000000000 |
323 |
--- a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch |
324 |
+++ /dev/null |
325 |
@@ -1,223 +0,0 @@ |
326 |
---- mixxx-1.11.0/build/depends.py |
327 |
-+++ mixxx-1.11.0/build/depends.py |
328 |
-@@ -179,8 +179,8 @@ |
329 |
- # times. |
330 |
- |
331 |
- qt_modules = [ |
332 |
-- 'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg', |
333 |
-- 'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork' |
334 |
-+ 'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', |
335 |
-+ 'QtSql', 'QtScript', 'QtNetwork' |
336 |
- #'QtUiTools', #'QtDesigner', |
337 |
- ] |
338 |
- |
339 |
-@@ -298,25 +298,10 @@ |
340 |
- |
341 |
- class FidLib(Dependence): |
342 |
- |
343 |
-- def sources(self, build): |
344 |
-- symbol = None |
345 |
-- if build.platform_is_windows: |
346 |
-- if build.toolchain_is_msvs: |
347 |
-- symbol = 'T_MSVC' |
348 |
-- elif build.crosscompile: |
349 |
-- # Not sure why, but fidlib won't build with mingw32msvc and |
350 |
-- # T_MINGW |
351 |
-- symbol = 'T_LINUX' |
352 |
-- elif build.toolchain_is_gnu: |
353 |
-- symbol = 'T_MINGW' |
354 |
-- else: |
355 |
-- symbol = 'T_LINUX' |
356 |
-- |
357 |
-- return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c', |
358 |
-- CPPDEFINES=symbol)] |
359 |
-- |
360 |
- def configure(self, build, conf): |
361 |
-- build.env.Append(CPPPATH='#lib/fidlib-0.9.10/') |
362 |
-+ if not conf.CheckLib('fidlib'): |
363 |
-+ raise Exception('Did not find fidlib library, exiting!') |
364 |
-+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib']) |
365 |
- |
366 |
- class ReplayGain(Dependence): |
367 |
- |
368 |
-@@ -327,7 +312,6 @@ |
369 |
- build.env.Append(CPPPATH="#lib/replaygain") |
370 |
- |
371 |
- class SoundTouch(Dependence): |
372 |
-- SOUNDTOUCH_PATH = 'soundtouch-1.6.0' |
373 |
- |
374 |
- def sse_enabled(self, build): |
375 |
- optimize = int(util.get_flags(build.env, 'optimize', 1)) |
376 |
-@@ -336,30 +320,7 @@ |
377 |
- (build.toolchain_is_gnu and optimize > 1)) |
378 |
- |
379 |
- def sources(self, build): |
380 |
-- sources = ['engine/enginebufferscalest.cpp', |
381 |
-- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH, |
382 |
-- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH, |
383 |
-- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH, |
384 |
-- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH, |
385 |
-- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH, |
386 |
-- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH, |
387 |
-- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH, |
388 |
-- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH] |
389 |
-- |
390 |
-- # SoundTouch CPU optimizations are only for x86 |
391 |
-- # architectures. SoundTouch automatically ignores these files when it is |
392 |
-- # not being built for an architecture that supports them. |
393 |
-- cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \ |
394 |
-- '#lib/%s/cpu_detect_x86_gcc.cpp' |
395 |
-- sources.append(cpu_detection % self.SOUNDTOUCH_PATH) |
396 |
-- |
397 |
-- # Check if the compiler has SSE extention enabled |
398 |
-- # Allways the case on x64 (core instructions) |
399 |
-- if self.sse_enabled(build): |
400 |
-- sources.extend( |
401 |
-- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH, |
402 |
-- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]) |
403 |
-- return sources |
404 |
-+ return ['engine/enginebufferscalest.cpp'] |
405 |
- |
406 |
- def configure(self, build, conf, env=None): |
407 |
- if env is None: |
408 |
-@@ -367,13 +328,10 @@ |
409 |
- if build.platform_is_windows: |
410 |
- # Regardless of the bitwidth, ST checks for WIN32 |
411 |
- env.Append(CPPDEFINES = 'WIN32') |
412 |
-- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH]) |
413 |
-- |
414 |
-- # Check if the compiler has SSE extention enabled |
415 |
-- # Allways the case on x64 (core instructions) |
416 |
-- optimize = int(util.get_flags(env, 'optimize', 1)) |
417 |
-- if self.sse_enabled(build): |
418 |
-- env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS') |
419 |
-+ if not conf.CheckLib(['SoundTouch','libSoundTouch']): |
420 |
-+ raise Exception('Did not find SoundTouch library, exiting!') |
421 |
-+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch']) |
422 |
-+ build.env.Append(LIBS='SoundTouch') |
423 |
- |
424 |
- class TagLib(Dependence): |
425 |
- def configure(self, build, conf): |
426 |
---- mixxx-1.11.0/build/features.py |
427 |
-+++ mixxx-1.11.0/build/features.py |
428 |
-@@ -48,7 +48,6 @@ |
429 |
- 'controllers/midi/hss1394enumerator.cpp'] |
430 |
- |
431 |
- class HID(Feature): |
432 |
-- HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre' |
433 |
- def description(self): |
434 |
- return "HID controller support" |
435 |
- |
436 |
-@@ -64,9 +63,6 @@ |
437 |
- def configure(self, build, conf): |
438 |
- if not self.enabled(build): |
439 |
- return |
440 |
-- # TODO(XXX) allow external hidapi install, but for now we just use our |
441 |
-- # internal one. |
442 |
-- build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')]) |
443 |
- |
444 |
- if build.platform_is_linux: |
445 |
- build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs') |
446 |
-@@ -86,19 +82,17 @@ |
447 |
- |
448 |
- build.env.Append(CPPDEFINES = '__HID__') |
449 |
- |
450 |
-+ if not conf.CheckLib('hidapi-libusb'): |
451 |
-+ raise Exception('Did not find HID API library, exiting!') |
452 |
-+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi']) |
453 |
-+ build.env.Append(LIBS='hidapi-libusb') |
454 |
-+ |
455 |
-+ |
456 |
- def sources(self, build): |
457 |
- sources = ['controllers/hid/hidcontroller.cpp', |
458 |
- 'controllers/hid/hidenumerator.cpp', |
459 |
- 'controllers/hid/hidcontrollerpresetfilehandler.cpp'] |
460 |
- |
461 |
-- if build.platform_is_windows: |
462 |
-- # Requires setupapi.lib which is included by the above check for |
463 |
-- # setupapi. |
464 |
-- sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c")) |
465 |
-- elif build.platform_is_linux: |
466 |
-- sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c')) |
467 |
-- elif build.platform_is_osx: |
468 |
-- sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c')) |
469 |
- return sources |
470 |
- |
471 |
- class Bulk(Feature): |
472 |
-@@ -455,19 +449,6 @@ |
473 |
- |
474 |
- build.env.Append(CPPDEFINES = '__VAMP__') |
475 |
- |
476 |
-- # Needed on Linux at least. Maybe needed elsewhere? |
477 |
-- if build.platform_is_linux: |
478 |
-- # Optionally link libdl and libX11. Required for some distros. |
479 |
-- conf.CheckLib(['dl', 'libdl']) |
480 |
-- conf.CheckLib(['X11', 'libX11']) |
481 |
-- |
482 |
-- # FFTW3 support |
483 |
-- have_fftw3_h = conf.CheckHeader('fftw3.h') |
484 |
-- have_fftw3 = conf.CheckLib('fftw3', autoadd=False) |
485 |
-- if(have_fftw3_h and have_fftw3 and build.platform_is_linux): |
486 |
-- build.env.Append(CPPDEFINES = 'HAVE_FFTW3') |
487 |
-- build.env.ParseConfig('pkg-config fftw3 --silence-errors --cflags --libs') |
488 |
-- |
489 |
- def sources(self, build): |
490 |
- sources = ['vamp/vampanalyser.cpp', |
491 |
- 'vamp/vamppluginloader.cpp', |
492 |
-@@ -725,25 +706,15 @@ |
493 |
- test_env.Append(CCFLAGS = '-pthread') |
494 |
- test_env.Append(LINKFLAGS = '-pthread') |
495 |
- |
496 |
-- test_env.Append(CPPPATH="#lib/gtest-1.5.0/include") |
497 |
-- gtest_dir = test_env.Dir("#lib/gtest-1.5.0") |
498 |
-- #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0')) |
499 |
-- #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example, optional |
500 |
-- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib' |
501 |
-- |
502 |
-- env = test_env |
503 |
-- SCons.Export('env') |
504 |
-- env.SConscript(env.File('SConscript', gtest_dir)) |
505 |
-- |
506 |
-- # build and configure gmock |
507 |
-- test_env.Append(CPPPATH="#lib/gmock-1.5.0/include") |
508 |
-- gmock_dir = test_env.Dir("#lib/gmock-1.5.0") |
509 |
-- #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0')) |
510 |
-- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib' |
511 |
-- |
512 |
-- env.SConscript(env.File('SConscript', gmock_dir)) |
513 |
-- |
514 |
-- return [] |
515 |
-+ if not conf.CheckLib('gtest'): |
516 |
-+ raise Exception('Did not find gtest library, exiting!') |
517 |
-+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest']) |
518 |
-+ test_env.Append(LIBS='gtest') |
519 |
-+ |
520 |
-+ if not conf.CheckLib('gmock'): |
521 |
-+ raise Exception('Did not find gmock library, exiting!') |
522 |
-+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock']) |
523 |
-+ test_env.Append(LIBS='gmock') |
524 |
- |
525 |
- class Shoutcast(Feature): |
526 |
- def description(self): |
527 |
---- mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp |
528 |
-+++ mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp |
529 |
-@@ -20,7 +20,7 @@ |
530 |
- #include "engine/enginefilterbutterworth8.h" |
531 |
- #include "engine/enginefilter.h" |
532 |
- #include "engine/engineobject.h" |
533 |
--#include "../lib/fidlib-0.9.10/fidlib.h" |
534 |
-+#include <fidlib.h> |
535 |
- |
536 |
- /* Local Prototypes */ |
537 |
- inline double _processLowpass(double *coef, double *buf, register double val); |
538 |
---- mixxx-1.11.0/src/engine/enginefilter.h |
539 |
-+++ mixxx-1.11.0/src/engine/enginefilter.h |
540 |
-@@ -20,7 +20,7 @@ |
541 |
- |
542 |
- #define MIXXX |
543 |
- #include "engine/engineobject.h" |
544 |
--#include "../lib/fidlib-0.9.10/fidlib.h" |
545 |
-+#include <fidlib.h> |
546 |
- #include "defs.h" |
547 |
- |
548 |
- enum filterType{ |