Attachment 163588 Details for Bug 204488 – Fix Alsa version checking

[patch] Fix Alsa version checking

alsa-port.patch (text/plain), 6.81 KB, created by Stephen Hurd on 2015-11-27 18:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Hurd

Created: 2015-11-27 18:37:52 UTC

Size: 6.81 KB

patch

obsolete

>Index: files/patch-config.tests_alsa_alsatest.cpp
>===================================================================
>--- files/patch-config.tests_alsa_alsatest.cpp	(nonexistent)
>+++ files/patch-config.tests_alsa_alsatest.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- config.tests/alsa/alsatest.cpp.orig	2015-02-17 04:57:20 UTC
>++++ 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_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
>+ #error "Alsa version found too old, require >= 1.0.10"
>+ #endif
>+ 
>
>Property changes on: files/patch-config.tests_alsa_alsatest.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_plugins_alsa_qalsaaudiodeviceinfo.cpp
>===================================================================
>--- files/patch-src_plugins_alsa_qalsaaudiodeviceinfo.cpp	(nonexistent)
>+++ files/patch-src_plugins_alsa_qalsaaudiodeviceinfo.cpp	(working copy)
>@@ -0,0 +1,38 @@
>+--- src/plugins/alsa/qalsaaudiodeviceinfo.cpp.orig	2015-11-27 18:32:25 UTC
>++++ src/plugins/alsa/qalsaaudiodeviceinfo.cpp
>+@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open()
>+     QList<QByteArray> devices = availableDevices(mode);
>+ 
>+     if(dev.compare(QLatin1String("default")) == 0) {
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+         if (devices.size() > 0)
>+             dev = QLatin1String(devices.first().constData());
>+         else
>+@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open()
>+         dev = QLatin1String("hw:0,0");
>+ #endif
>+     } else {
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+         dev = device;
>+ #else
>+         int idx = 0;
>+@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(
>+     snd_pcm_hw_params_t *params;
>+     QString dev;
>+ 
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+     dev = device;
>+     if (dev.compare(QLatin1String("default")) == 0) {
>+         QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
>+@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::
>+     QList<QByteArray> devices;
>+     QByteArray filter;
>+ 
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+     // Create a list of all current audio devices that support mode
>+     void **hints;
>+     char *name, *descr, *io;
>
>Property changes on: files/patch-src_plugins_alsa_qalsaaudiodeviceinfo.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_plugins_alsa_qalsaaudioinput.cpp
>===================================================================
>--- files/patch-src_plugins_alsa_qalsaaudioinput.cpp	(nonexistent)
>+++ files/patch-src_plugins_alsa_qalsaaudioinput.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/plugins/alsa/qalsaaudioinput.cpp.orig	2015-11-27 18:29:56 UTC
>++++ src/plugins/alsa/qalsaaudioinput.cpp
>+@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open()
>+     QString dev = QString(QLatin1String(m_device.constData()));
>+     QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput);
>+     if(dev.compare(QLatin1String("default")) == 0) {
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+         if (devices.size() > 0)
>+             dev = QLatin1String(devices.first());
>+         else
>+@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
>+         dev = QLatin1String("hw:0,0");
>+ #endif
>+     } else {
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+         dev = QLatin1String(m_device);
>+ #else
>+         int idx = 0;
>
>Property changes on: files/patch-src_plugins_alsa_qalsaaudioinput.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_plugins_alsa_qalsaaudiooutput.cpp
>===================================================================
>--- files/patch-src_plugins_alsa_qalsaaudiooutput.cpp	(nonexistent)
>+++ files/patch-src_plugins_alsa_qalsaaudiooutput.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/plugins/alsa/qalsaaudiooutput.cpp.orig	2015-11-27 18:31:39 UTC
>++++ src/plugins/alsa/qalsaaudiooutput.cpp
>+@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open()
>+     QString dev = QString(QLatin1String(m_device.constData()));
>+     QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
>+     if(dev.compare(QLatin1String("default")) == 0) {
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+         if (devices.size() > 0)
>+             dev = QLatin1String(devices.first());
>+         else
>+@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open()
>+         dev = QLatin1String("hw:0,0");
>+ #endif
>+     } else {
>+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
>++#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
>+         dev = QLatin1String(m_device);
>+ #else
>+         int idx = 0;
>
>Property changes on: files/patch-src_plugins_alsa_qalsaaudiooutput.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 204488: 163033 | 163579 | 163588