forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-qt/qtmultimedia: backport alsa detection patch to Qt4
Gentoo-Bug: 572426 Package-Manager: portage-2.2.27
- Loading branch information
Showing
3 changed files
with
158 additions
and
1 deletion.
There are no files selected for viewing
155 changes: 155 additions & 0 deletions
155
dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,155 @@ | ||
From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001 | ||
From: Davide Pesavento <[email protected]> | ||
Date: Fri, 22 Jan 2016 23:17:16 +0100 | ||
Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0 | ||
|
||
Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159 | ||
--- | ||
config.tests/unix/alsa/alsatest.cpp | 2 +- | ||
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16 ++++++++-------- | ||
src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 2 +- | ||
src/multimedia/audio/qaudioinput_alsa_p.cpp | 4 ++-- | ||
src/multimedia/audio/qaudiooutput_alsa_p.cpp | 4 ++-- | ||
5 files changed, 14 insertions(+), 14 deletions(-) | ||
|
||
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp | ||
index ac5f1e1..8d78f95 100644 | ||
--- a/config.tests/unix/alsa/alsatest.cpp | ||
+++ b/config.tests/unix/alsa/alsatest.cpp | ||
@@ -40,7 +40,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 | ||
|
||
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | ||
index 973cbab..a09dcf6 100644 | ||
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | ||
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | ||
@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode | ||
device = QLatin1String(dev); | ||
this->mode = mode; | ||
|
||
-#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)) | ||
checkSurround(); | ||
#endif | ||
} | ||
@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::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)) | ||
dev = QLatin1String(devices.first().constData()); | ||
#else | ||
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; | ||
@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const | ||
QList<QByteArray> devices = QAudioDeviceInfoInternal::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)) | ||
dev = QLatin1String(devices.first().constData()); | ||
#else | ||
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; | ||
@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists() | ||
} | ||
channelz.append(1); | ||
channelz.append(2); | ||
-#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 (surround40) channelz.append(4); | ||
if (surround51) channelz.append(6); | ||
if (surround71) channelz.append(8); | ||
@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode) | ||
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, **n; | ||
char *name, *descr, *io; | ||
@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice() | ||
return devices.first(); | ||
} | ||
|
||
-#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)) | ||
void QAudioDeviceInfoInternal::checkSurround() | ||
{ | ||
QList<QByteArray> devices; | ||
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | ||
index 96febf4..714bf60 100644 | ||
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | ||
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | ||
@@ -98,7 +98,7 @@ private: | ||
bool open(); | ||
void close(); | ||
|
||
-#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)) | ||
void checkSurround(); | ||
bool surround40; | ||
bool surround51; | ||
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp | ||
index 339fd9f..202a5b2 100644 | ||
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp | ||
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp | ||
@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open() | ||
QString dev = QString(QLatin1String(m_device.constData())); | ||
QList<QByteArray> devices = QAudioDeviceInfoInternal::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)) | ||
dev = QLatin1String(devices.first()); | ||
#else | ||
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; | ||
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp | ||
index bf85de5..fe4b010 100644 | ||
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp | ||
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp | ||
@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open() | ||
QString dev = QString(QLatin1String(m_device.constData())); | ||
QList<QByteArray> devices = QAudioDeviceInfoInternal::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)) | ||
dev = QLatin1String(devices.first()); | ||
#else | ||
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; | ||
-- | ||
2.7.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters