[SCM] ardour/master: Add patch to build with gcc6. (Closes: #831133)
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Wed Jul 27 15:28:38 UTC 2016
The following commit has been merged in the master branch:
commit c913a82fd4fbc6b6195aa6ce3e3398b7b0e671ee
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Wed Jul 27 17:17:11 2016 +0200
Add patch to build with gcc6. (Closes: #831133)
diff --git a/debian/patches/0200-gcc6.patch b/debian/patches/0200-gcc6.patch
new file mode 100644
index 0000000..68f9484
--- /dev/null
+++ b/debian/patches/0200-gcc6.patch
@@ -0,0 +1,19 @@
+Description: Fix build with gcc6
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: ardour/libs/ardour/parameter_descriptor.cc
+===================================================================
+--- ardour.orig/libs/ardour/parameter_descriptor.cc
++++ ardour/libs/ardour/parameter_descriptor.cc
+@@ -178,8 +178,8 @@ ParameterDescriptor::update_steps()
+ largestep = largestep / logf(30.0f);
+ } else if (integer_step) {
+ smallstep = 1.0;
+- step = std::max(1.0, rint(step));
+- largestep = std::max(1.0, rint(largestep));
++ step = std::max(1.f, rintf (step));
++ largestep = std::max(1.f, rintf (largestep));
+ }
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 428dc97..68d2087 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0030-wscript.patch
0050-log-stdout.patch
0100-fix-typos.patch
+0200-gcc6.patch
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list