[SCM] qtmultimedia packaging branch, master, updated. debian/5.5.1-3-2-g1f688d5

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=1f688d5

The following commit has been merged in the master branch:
commit 1f688d5522a87943454d9051bf410dd49d3e5e3c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Mar 5 10:52:57 2016 -0300

    Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
---
 debian/changelog                        |  3 +++
 debian/patches/fix_alsa_detection.patch | 21 +++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1f9d678..cb59d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtmultimedia-opensource-src (5.5.1-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 05 Mar 2016 10:45:10 -0300
 
 qtmultimedia-opensource-src (5.5.1-3) unstable; urgency=medium
diff --git a/debian/patches/fix_alsa_detection.patch b/debian/patches/fix_alsa_detection.patch
new file mode 100644
index 0000000..cdd58de
--- /dev/null
+++ b/debian/patches/fix_alsa_detection.patch
@@ -0,0 +1,21 @@
+Description: alsatest: fix the check to treat alsalib 1.1.x as correct version
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug: https://bugreports.qt.io/browse/QTBUG-51681
+Last-Update: 2016-03-05
+
+---
+ config.tests/alsa/alsatest.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/config.tests/alsa/alsatest.cpp
++++ b/config.tests/alsa/alsatest.cpp
+@@ -32,7 +32,7 @@
+ ****************************************************************************/
+ 
+ #include <alsa/asoundlib.h>
+-#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if SND_LIB_VERSION < 0x1000a  // 1.0.10
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1662367..00e675a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_alsa_detection.patch
 rpath_nonlinux.diff

-- 
qtmultimedia packaging