diff mbox

[1/1] qt5base: fix alsa-lib version check during configure Current version check ignores MINOR version number

Message ID 1463643250-13396-1-git-send-email-jiri.novotny@logicelements.cz
State Accepted
Headers show

Commit Message

Jiri Novotny May 19, 2016, 7:34 a.m. UTC 
Signed-off-by: Jiri Novotny <jiri.novotny@logicelements.cz>
---
 .../qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch    | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 package/qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch

Comments

Thomas Petazzoni June 11, 2016, 2:33 p.m. UTC | #1 
Hello,

On Thu, 19 May 2016 09:34:10 +0200, Jiri Novotny wrote:
> Signed-off-by: Jiri Novotny <jiri.novotny@logicelements.cz>
> ---
>  .../qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch    | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>  create mode 100644 package/qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch

Thanks for your contribution! I assume that what this is fixing is the
build with ALSA >= 1.1.x, like we have in Buildroot. So there is a
better fix already merged upstream:
https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066.
So I've used that one instead. See:

  https://git.buildroot.org/buildroot/commit/?id=97959eec223a3708ab67510ea98e2c9e52e7e98f

Let me know if that works for you (or not).

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch b/package/qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch
new file mode 100644
index 0000000..17da58f
--- /dev/null
+++ b/package/qt5/qt5base/0002-qtmultimedia-fix-alsa-version.patch
@@ -0,0 +1,13 @@ 
+diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
+index cab6533..90dc9d0 100644
+--- a/config.tests/unix/alsa/alsatest.cpp
++++ b/config.tests/unix/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_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10) || (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 1 && SND_LIB_SUBMINOR >= 0)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+