[SCM] giada/master: Fixed FTBFS due to parenthesization (Closes: #791544)

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue Jul 7 09:28:05 UTC 2015


The following commit has been merged in the master branch:
commit 24585233a8385ca952c9635f35494c723f3d7a1c
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Jul 7 11:17:30 2015 +0200

    Fixed FTBFS due to parenthesization (Closes: #791544)

diff --git a/debian/patches/default-soundsystem_parentheses.patch b/debian/patches/default-soundsystem_parentheses.patch
new file mode 100644
index 0000000..e68b28b
--- /dev/null
+++ b/debian/patches/default-soundsystem_parentheses.patch
@@ -0,0 +1,20 @@
+Description: proper parentheses around bitwise operations
+ the original "(!soundSystem & (SYS_API_ANY))" is
+ a) wrong
+ b) FTBFS on g++5
+Author: IOhannes m zmölnig
+Forwarded: https://github.com/monocasual/giada/pull/50
+Last-Update: 2015-07-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- giada.orig/src/conf.cpp
++++ giada/src/conf.cpp
+@@ -207,7 +207,7 @@
+ 	logMode = atoi(getValue("logMode").c_str());
+ 
+ 	soundSystem = atoi(getValue("soundSystem").c_str());
+-	if (!soundSystem & (SYS_API_ANY)) soundSystem = DEFAULT_SOUNDSYS;
++	if (!(soundSystem & SYS_API_ANY)) soundSystem = DEFAULT_SOUNDSYS;
+ 
+ 	soundDeviceOut = atoi(getValue("soundDeviceOut").c_str());
+ 	if (soundDeviceOut < 0) soundDeviceOut = DEFAULT_SOUNDDEV_OUT;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..69ca90a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+default-soundsystem_parentheses.patch

-- 
giada packaging



More information about the pkg-multimedia-commits mailing list