[SCM] mixxx/master.jessie-bpo: Add patch to fix Mixxx version number

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Wed Nov 30 14:25:16 UTC 2016


The following commit has been merged in the master.jessie-bpo branch:
commit e5abc1eb889306f21fe872700322b543a4f890c0
Author: James Cowgill <jcowgill at debian.org>
Date:   Mon Nov 28 09:32:06 2016 +0000

    Add patch to fix Mixxx version number

diff --git a/debian/patches/0008-jessie-soundtouch-undef-version.patch b/debian/patches/0008-jessie-soundtouch-undef-version.patch
new file mode 100644
index 0000000..3bcc341
--- /dev/null
+++ b/debian/patches/0008-jessie-soundtouch-undef-version.patch
@@ -0,0 +1,25 @@
+Description: Fix Mixxx version number for jessie-backports
+ Soundtouch in jessie defines VERSION in its public headers which conficts with
+ the VERSION define in Mixxx. This causes version "1.8.0" (version of
+ soundtouch) to be reported as the version of Mixxx.
+ .
+ Force Mixxx's VERSION #define by #undefing Soundtouch's VERSION before
+ redefining it.
+ .
+ Note: Mixxx from Jessie (1.11) is not affected, and Soundtouch from stretch
+ (currently 1.9.2) fixed this bug so the patch is only applied to
+ jessie-backports.
+Author: James Cowgill <jcowgill at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/defs_version.h
++++ b/src/defs_version.h
+@@ -47,6 +47,7 @@
+ //
+ // $ dpkg --compare-versions 2.0.0~rc1-0ubuntu1 lt 2.0.0-0ubuntu1 && echo true
+ //
++#undef VERSION
+ #ifndef VERSION
+     #define VERSION "2.0.0"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index bef0e81..d61e9d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-hidapi.patch
 0006-opengles.patch
 0007-fix_gcc6_issue.patch
+0008-jessie-soundtouch-undef-version.patch

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list