Control: tags 853672 + pending
Dear maintainer,
I've prepared an NMU for svxlink (versioned as 15.11-2.1) and uploaded
it to DELAYED/10. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru svxlink-15.11/debian/changelog svxlink-15.11/debian/changelog
--- svxlink-15.11/debian/changelog 2016-12-10 02:45:49.000000000 +0200
+++ svxlink-15.11/debian/changelog 2017-09-01 16:15:22.000000000 +0300
@@ -1,3 +1,10 @@
+svxlink (15.11-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream patch to fix FTBFS with gcc 7. (Closes: #853672)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 01 Sep 2017 16:15:22 +0300
+
svxlink (15.11-2) unstable; urgency=medium
* Bugfix release
diff -Nru svxlink-15.11/debian/patches/0001-Fix-compilation-problem-in-Async-AudioDeviceAlsa.patch svxlink-15.11/debian/patches/0001-Fix-compilation-problem-in-Async-AudioDeviceAlsa.patch
--- svxlink-15.11/debian/patches/0001-Fix-compilation-problem-in-Async-AudioDeviceAlsa.patch 1970-01-01 02:00:00.000000000 +0200
+++ svxlink-15.11/debian/patches/0001-Fix-compilation-problem-in-Async-AudioDeviceAlsa.patch 2017-08-17 18:05:06.000000000 +0300
@@ -0,0 +1,26 @@
+From 611cc5cc134f710f94fc8987375259bd8af34604 Mon Sep 17 00:00:00 2001
+From: Tobias Blomberg <g...@sm0svx.shacknet.nu>
+Date: Mon, 19 Jun 2017 22:04:20 +0200
+Subject: Fix compilation problem in Async::AudioDeviceAlsa
+
+- On newer compilers the compilation would fail on ambiguous call to abs
+---
+ src/async/audio/AsyncAudioDeviceAlsa.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/async/audio/AsyncAudioDeviceAlsa.cpp b/src/async/audio/AsyncAudioDeviceAlsa.cpp
+index 17d255e8..15d760d5 100644
+--- a/src/async/audio/AsyncAudioDeviceAlsa.cpp
++++ b/src/async/audio/AsyncAudioDeviceAlsa.cpp
+@@ -548,7 +548,7 @@ bool AudioDeviceAlsa::initParams(snd_pcm_t *pcm_handle)
+ return false;
+ }
+
+- if (::abs(real_rate - sample_rate) > 100)
++ if (::abs(static_cast<int>(real_rate) - sample_rate) > 100)
+ {
+ cerr << "*** ERROR: The sample rate could not be set to "
+ << sample_rate << "Hz for ALSA device \"" << dev_name << "\". "
+--
+2.11.0
+
diff -Nru svxlink-15.11/debian/patches/series svxlink-15.11/debian/patches/series
--- svxlink-15.11/debian/patches/series 2016-01-13 20:50:43.000000000 +0200
+++ svxlink-15.11/debian/patches/series 2017-08-17 18:06:19.000000000 +0300
@@ -10,3 +10,4 @@
enable-static-libs.patch
use-default-compile-flags.patch
enable-verbose-output.patch
+0001-Fix-compilation-problem-in-Async-AudioDeviceAlsa.patch
