[SCM] mixxx/master: New upstream release
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Sun Jan 24 21:24:58 UTC 2016
The following commit has been merged in the master branch:
commit 78b232f97e13241be02365bb8bc9f56e610efc50
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Sun Jan 24 22:24:39 2016 +0100
New upstream release
diff --git a/debian/changelog b/debian/changelog
index f1470bb..8b1805a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-mixxx (1.11.0~dfsg-6) UNRELEASED; urgency=medium
+mixxx (2.0.0~dfsg-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release:
+ - Refresh patches.
+ - Remove 0001-update_configure.patch - no longer needed.
+ - Remove 9001-waveformsignalcolors_fix.patch - included upstream.
* Update debian/repack.sh script to latest version.
* Remove obsolete menu file.
* Update debian/repack.local for new upstream version.
diff --git a/debian/patches/0001-update_configure.patch b/debian/patches/0001-update_configure.patch
deleted file mode 100644
index e62923a..0000000
--- a/debian/patches/0001-update_configure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Patch config.sub and config.guess to use up-to-date versions.
-Author: Paul Brossier <piem at debian.org>
-Forwarded: no
----
- lib/gtest-1.5.0/build-aux/config.guess | 4 ++++
- lib/gtest-1.5.0/build-aux/config.sub | 4 ++++
- 2 files changed, 8 insertions(+)
-
---- mixxx.orig/lib/gtest-1.5.0/build-aux/config.guess
-+++ mixxx/lib/gtest-1.5.0/build-aux/config.guess
-@@ -1,4 +1,8 @@
- #! /bin/sh
-+if [ -x /usr/share/misc/config.guess ]; then
-+ exec /usr/share/misc/config.guess "$@"
-+fi
-+
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
---- mixxx.orig/lib/gtest-1.5.0/build-aux/config.sub
-+++ mixxx/lib/gtest-1.5.0/build-aux/config.sub
-@@ -1,4 +1,8 @@
- #! /bin/sh
-+if [ -x /usr/share/misc/config.sub ]; then
-+ exec /usr/share/misc/config.sub "$@"
-+fi
-+
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
diff --git a/debian/patches/0004-soundtouch.patch b/debian/patches/0004-soundtouch.patch
index de2a870..a98aaca 100644
--- a/debian/patches/0004-soundtouch.patch
+++ b/debian/patches/0004-soundtouch.patch
@@ -3,58 +3,45 @@ 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
-===================================================================
---- 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")
+
+--- a/build/depends.py
++++ b/build/depends.py
+@@ -400,33 +400,17 @@ class ReplayGain(Dependence):
- class SoundTouch(Dependence):
-- 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))
+ class SoundTouch(Dependence):
+- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sources(self, build):
-- sources = ['engine/enginebufferscalest.cpp',
-- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/BPMDetect.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.
-- 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,])
-+ sources = ['engine/enginebufferscalest.cpp']
- return sources
+- 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
-- if build.platform_is_windows:
-- # 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!')
++ 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')
- # Check if the compiler has SSE extention enabled
- # Allways the case on x64 (core instructions)
+ # Prevents circular import.
+ from features import Optimize
diff --git a/debian/patches/0091-desktop_file.patch b/debian/patches/0091-desktop_file.patch
index 32c65d9..7a40872 100644
--- a/debian/patches/0091-desktop_file.patch
+++ b/debian/patches/0091-desktop_file.patch
@@ -1,17 +1,14 @@
Description: Fix desktop file as per spec.
Author: Alessio Treglia <alessio at debian.org>
Forwarded: not-needed
----
- src/mixxx.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
---- mixxx.orig/src/mixxx.desktop
-+++ mixxx/src/mixxx.desktop
-@@ -3,7 +3,7 @@ Version=1.0
- Name=Mixxx
- GenericName=Digital DJ interface
+--- a/res/linux/mixxx.desktop
++++ b/res/linux/mixxx.desktop
+@@ -6,7 +6,7 @@ GenericName=Digital DJ interface
+ GenericName[de]=Digitales DJ-System
Comment=A digital DJ interface
--Exec=pasuspender mixxx
+ Comment[de]=Ein digitales DJ-System
+-Exec=sh -c "pasuspender mixxx || mixxx"
+Exec=mixxx
Terminal=false
Icon=mixxx-icon
diff --git a/debian/patches/1001-buildsystem.patch b/debian/patches/1001-buildsystem.patch
index 8d51f37..3e55108 100644
--- a/debian/patches/1001-buildsystem.patch
+++ b/debian/patches/1001-buildsystem.patch
@@ -3,21 +3,14 @@ Description: Switch builds on arm64, armhf,
Author: Alessio Treglia <alessio at debian.org>
---
-diff --git a/build/mixxx.py b/build/mixxx.py
-index 7a1b7b2..fa64ec5 100644
--- a/build/mixxx.py
+++ b/build/mixxx.py
-@@ -42,10 +42,12 @@ class MixxxBuild(object):
- if machine not in ['x86_64', 'x86', 'i686', 'i586',
- 'alpha', 'hppa', 'mips', 'mipsel', 's390',
- 'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386',
-+ 'arm64', 'armhf',
- 'sh3', 'sh4',
- 'kfreebsd-amd64', 'kfreebsd-i386',
- 'i486', 'i386', 'powerpc', 'powerpc64',
-- 'powerpcspe', 's390x',
-+ 'powerpcspe', 'ppc64el', 's390x', 'm68k',
-+ 'mips64', 'mips64el', 'mipsn32', 'mipsn32el',
- 'amd64', 'AMD64', 'EM64T', 'INTEL64']:
+@@ -53,7 +53,7 @@ class MixxxBuild(object):
+ 'i486', 'i386', 'ppc', 'ppc64', 'powerpc',
+ 'powerpc64', 'powerpcspe', 's390x',
+ 'amd64', 'em64t', 'intel64', 'arm64',
+- 'ppc64el']:
++ 'ppc64el', 'm68k', 'mips64', 'mips64el', 'mipsn32', 'mipsn32el']:
raise Exception("invalid machine type")
+ if toolchain not in ['gnu', 'msvs']:
diff --git a/debian/patches/9001-waveformsignalcolors_fix.patch b/debian/patches/9001-waveformsignalcolors_fix.patch
deleted file mode 100644
index 5e33271..0000000
--- a/debian/patches/9001-waveformsignalcolors_fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: On ARM, qreal is float, not double.
-Author: RJ Ryan <rryan at mixxx.org>
-Applied-Upstream: yes
----
- src/waveform/renderers/waveformrendererhsv.cpp | 2 +-
- src/waveform/renderers/waveformsignalcolors.cpp | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
---- mixxx.orig/src/waveform/renderers/waveformrendererhsv.cpp
-+++ mixxx/src/waveform/renderers/waveformrendererhsv.cpp
-@@ -69,7 +69,7 @@ void WaveformRendererHSV::draw(QPainter*
- allGain *= factory->getVisualGain(::WaveformWidgetFactory::All);
-
- // Save HSV of waveform color
-- double h,s,v;
-+ qreal h,s,v;
-
- // Get base color of waveform in the HSV format (s and v isn't use)
- m_pColors->getLowColor().getHsvF(&h,&s,&v);
---- mixxx.orig/src/waveform/renderers/waveformsignalcolors.cpp
-+++ mixxx/src/waveform/renderers/waveformsignalcolors.cpp
-@@ -68,14 +68,14 @@ void WaveformSignalColors::fallBackFromS
- qWarning() << "WaveformSignalColors::fallBackFromSignalColor - " \
- "skin do not provide low/mid/high signal colors";
-
-- double h,s,l,a;
-+ qreal h,s,l,a;
- m_signalColor.getHslF(&h,&s,&l,&a);
-
- const double analogousAngle = 1.0/12.0;
-
- if( s < 0.1) // gray
- {
-- const double sMax = 1.0 - h;
-+ const qreal sMax = 1.0 - h;
- m_lowColor.setHslF(h,s,l);
- m_midColor.setHslF(h,s+sMax*0.2,l);
- m_highColor.setHslF(h,s+sMax*0.4,l);
-@@ -84,28 +84,28 @@ void WaveformSignalColors::fallBackFromS
- {
- if( l < 0.1) // ~white
- {
-- const double lMax = 1.0 - l;
-+ const qreal lMax = 1.0 - l;
- m_lowColor.setHslF(h,s,l);
- m_midColor.setHslF(h,s,l+lMax*0.2);
- m_highColor.setHslF(h,s,l+lMax*0.4);
- }
- else if( l < 0.5)
- {
-- const double lMax = 1.0 - l;
-+ const qreal lMax = 1.0 - l;
- m_lowColor.setHslF(h,s,l);
- m_midColor.setHslF(stableHue(h-analogousAngle*0.3),s,l+lMax*0.1);
- m_highColor.setHslF(stableHue(h+analogousAngle*0.3),s,l+lMax*0.4);
- }
- else if ( l < 0.9)
- {
-- const double lMin = l;
-+ const qreal lMin = l;
- m_lowColor.setHslF(h,s,l);
- m_midColor.setHslF(stableHue(h-analogousAngle*0.3),s,l-lMin*0.1);
- m_highColor.setHslF(stableHue(h+analogousAngle*0.3),s,l-lMin*0.4);
- }
- else // ~black
- {
-- const double lMin = l;
-+ const qreal lMin = l;
- m_lowColor.setHslF(h,s,l);
- m_midColor.setHslF(h,s,l-lMin*0.2);
- m_highColor.setHslF(h,s,l-lMin*0.4);
diff --git a/debian/patches/series b/debian/patches/series
index 5797080..3f86660 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-0001-update_configure.patch
0003-disable_soundsourcem4a.patch
0004-soundtouch.patch
0091-desktop_file.patch
1001-buildsystem.patch
-9001-waveformsignalcolors_fix.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 99ce26b..65ae046 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,5 +1,3 @@
-0001-update_configure.patch
0003-disable_soundsourcem4a.patch
0004-soundtouch.patch
1001-buildsystem.patch
-9001-waveformsignalcolors_fix.patch
--
mixxx packaging
More information about the pkg-multimedia-commits
mailing list