[SCM] mixxx/master: debian/patches/: patchset updated
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Mon Sep 30 15:40:04 UTC 2013
The following commit has been merged in the master branch:
commit adb6985071aa27a62ec3b9f387257ee56212edde
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Mon Sep 30 16:11:18 2013 +0200
debian/patches/: patchset updated
- 0002-norpath.patch dropped
- 0004-soundtouch.patch refreshed
- 1001-ftbfs_gcc47.patch dropped
diff --git a/debian/patches/0002-norpath.patch b/debian/patches/0002-norpath.patch
deleted file mode 100644
index 17aff5c..0000000
--- a/debian/patches/0002-norpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Drop -Wl,-rpath from LINKFLAGS.
-Origin: Debian
-Bug-Debian: http://bugs.debian.org/599978
-Forwarded: no
----
- build/depends.py | 2 --
- 1 file changed, 2 deletions(-)
-
---- mixxx.orig/build/depends.py
-+++ mixxx/build/depends.py
-@@ -179,8 +179,6 @@ class Qt(Dependence):
- compiling_on_104 = False
- if build.platform_is_osx:
- compiling_on_104 = (os.popen('sw_vers').readlines()[1].find('10.4') >= 0)
-- if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
-- build.env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
-
- #QtSQLite DLL
- if build.platform_is_windows:
diff --git a/debian/patches/0004-soundtouch.patch b/debian/patches/0004-soundtouch.patch
index 3aee2c8..de2a870 100644
--- a/debian/patches/0004-soundtouch.patch
+++ b/debian/patches/0004-soundtouch.patch
@@ -3,17 +3,19 @@ Origin: http://bugs.gentoo.org/attachment.cgi?id=257798
Bug: https://bugs.launchpad.net/mixxx/+bug/562007
Bug-Gentoo: http://bugs.gentoo.org/show_bug.cgi?id=310821
Forwarded: yes
----
- build/depends.py | 53 +++++------------------------------------------------
- 1 file changed, 5 insertions(+), 48 deletions(-)
-
---- mixxx.orig/build/depends.py
-+++ mixxx/build/depends.py
-@@ -224,60 +224,17 @@ class ReplayGain(Dependence):
+===================================================================
+--- mixxx.orig/build/depends.py 2013-09-30 16:00:18.577597568 +0200
++++ mixxx/build/depends.py 2013-09-30 16:07:47.663951788 +0200
+@@ -327,7 +327,6 @@
build.env.Append(CPPPATH="#lib/replaygain")
class SoundTouch(Dependence):
-- SOUNDTOUCH_PATH = 'soundtouch-1.5.0'
+- SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
+
+ def sse_enabled(self, build):
+ optimize = int(util.get_flags(build.env, 'optimize', 1))
+@@ -336,38 +335,16 @@
+ (build.toolchain_is_gnu and optimize > 1))
def sources(self, build):
- sources = ['engine/enginebufferscalest.cpp',
@@ -25,53 +27,34 @@ Forwarded: yes
- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
-- if build.platform_is_windows and build.toolchain_is_msvs:
-- if build.machine_is_64bit:
-- sources.append(
-- '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
-- elif build.machine == 'x86':
-- sources.append(
-- '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
-- else:
-- raise Exception("Unhandled CPU configuration for SoundTouch")
-- elif build.toolchain_is_gnu:
-- if build.machine == 'x86_64':
-- sources.append(
-- '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
-- else:
-- sources.append(
-- '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
-- else:
-- raise Exception("Unhandled CPU configuration for SoundTouch")
-
-- # TODO(XXX) when we figure out a better way to represent features, fix
-- # this.
-- optimize = int(util.get_flags(build.env, 'optimize', 1))
-- if build.machine_is_64bit or \
-- (build.toolchain_is_msvs and optimize > 1) or \
-- (build.toolchain_is_gnu and optimize > 2):
+- # 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.
+- cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
+- '#lib/%s/cpu_detect_x86_gcc.cpp'
+- sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
+-
+- # Check if the compiler has SSE extention enabled
+- # Allways the case on x64 (core instructions)
+- if self.sse_enabled(build):
- sources.extend(
- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
-- ])
-- if build.toolchain_is_msvs and not build.machine_is_64bit:
-- sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
-- else:
-- # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
-- # it.
-- pass
+- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
+ sources = ['engine/enginebufferscalest.cpp']
-
return sources
- def configure(self, build, conf):
+ def configure(self, build, conf, env=None):
+ if env is None:
+ env = build.env
- if build.platform_is_windows:
-- build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
-- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+- # Regardless of the bitwidth, ST checks for WIN32
+- env.Append(CPPDEFINES = 'WIN32')
+- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+ if not conf.CheckLib(['SoundTouch','libSoundTouch']):
+ raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
+ build.env.Append(LIBS='SoundTouch')
- # TODO(XXX) when we figure out a better way to represent features, fix
- # this.
+ # Check if the compiler has SSE extention enabled
+ # Allways the case on x64 (core instructions)
diff --git a/debian/patches/1001-ftbfs_gcc47.patch b/debian/patches/1001-ftbfs_gcc47.patch
deleted file mode 100644
index e5fcdf4..0000000
--- a/debian/patches/1001-ftbfs_gcc47.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with GCC 4.7.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674335
-Forwarded: no
----
- src/engine/engineshoutcast.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- mixxx.orig/src/engine/engineshoutcast.cpp
-+++ mixxx/src/engine/engineshoutcast.cpp
-@@ -18,6 +18,7 @@
- #include <QDebug>
- #include <QMutexLocker>
- #include <stdio.h> // currently used for writing to stdout
-+#include <unistd.h>
-
- #ifdef __WINDOWS__
- #include <windows.h>
diff --git a/debian/patches/series b/debian/patches/series
index fb470f2..904947d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
0001-update_configure.patch
-0002-norpath.patch
0003-disable_soundsourcem4a.patch
0004-soundtouch.patch
0091-desktop_file.patch
-1001-ftbfs_gcc47.patch
--
mixxx packaging
More information about the pkg-multimedia-commits
mailing list