rpms / qt

Clone
Source Code
GIT

Blame qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch

f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f23 f24 f25 f26 f27 f28 f29 f30 f31 f32 f33 f34 f35 f36 f37 f38 f39 f40 f7 f8 f9 main rawhide
  1.   b8994e8b845f05a43436d399ae37931737e453bf
  2.   qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch
Blob History Raw
6d0df2a 
diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp
6d0df2a 
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than	2016-02-10 16:31:02.450152334 +0100
6d0df2a 
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp	2016-02-10 16:31:51.495307579 +0100
6d0df2a 
@@ -40,7 +40,7 @@
6d0df2a 
 ****************************************************************************/
6d0df2a
6d0df2a 
 #include <alsa/asoundlib.h>
6d0df2a 
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
6d0df2a 
+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
6d0df2a 
 #error "Alsa version found too old, require >= 1.0.10"
6d0df2a 
 #endif
6d0df2a
Kevin Kofler 444964f 
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
Kevin Kofler 444964f 
index 973cbab..0b27e9d 100644
Kevin Kofler 444964f 
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
Kevin Kofler 444964f 
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
Kevin Kofler 444964f 
@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
Kevin Kofler 444964f 
     device = QLatin1String(dev);
Kevin Kofler 444964f 
     this->mode = mode;
Kevin Kofler 444964f
Kevin Kofler 444964f 
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
     checkSurround();
Kevin Kofler 444964f 
 #endif
Kevin Kofler 444964f 
 }
Kevin Kofler 444964f 
@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open()
Kevin Kofler 444964f 
     QList<QByteArray> devices = availableDevices(mode);
Kevin Kofler 444964f
Kevin Kofler 444964f 
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = QLatin1String(devices.first().constData());
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964f 
 #endif
Kevin Kofler 444964f 
     } else {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = device;
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         int idx = 0;
Kevin Kofler 444964f 
@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
Kevin Kofler 444964f 
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
Kevin Kofler 444964f
Kevin Kofler 444964f 
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = QLatin1String(devices.first().constData());
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964f 
 #endif
Kevin Kofler 444964f 
     } else {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = device;
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         int idx = 0;
Kevin Kofler 444964f 
@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists()
Kevin Kofler 444964f 
     }
Kevin Kofler 444964f 
     channelz.append(1);
Kevin Kofler 444964f 
     channelz.append(2);
Kevin Kofler 444964f 
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
     if (surround40) channelz.append(4);
Kevin Kofler 444964f 
     if (surround51) channelz.append(6);
Kevin Kofler 444964f 
     if (surround71) channelz.append(8);
Kevin Kofler 444964f 
@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
Kevin Kofler 444964f 
     QList<QByteArray> devices;
Kevin Kofler 444964f 
     QByteArray filter;
Kevin Kofler 444964f
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
     // Create a list of all current audio devices that support mode
Kevin Kofler 444964f 
     void **hints, **n;
Kevin Kofler 444964f 
     char *name, *descr, *io;
Kevin Kofler 444964f 
@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
Kevin Kofler 444964f 
     return devices.first();
Kevin Kofler 444964f 
 }
Kevin Kofler 444964f
Kevin Kofler 444964f 
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
 void QAudioDeviceInfoInternal::checkSurround()
Kevin Kofler 444964f 
 {
Kevin Kofler 444964f 
     QList<QByteArray> devices;
Kevin Kofler 444964f 
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
Kevin Kofler 444964f 
index 96febf4..714bf60 100644
Kevin Kofler 444964f 
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
Kevin Kofler 444964f 
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
Kevin Kofler 444964f 
@@ -98,7 +98,7 @@ private:
Kevin Kofler 444964f 
     bool open();
Kevin Kofler 444964f 
     void close();
Kevin Kofler 444964f
Kevin Kofler 444964f 
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
     void checkSurround();
Kevin Kofler 444964f 
     bool surround40;
Kevin Kofler 444964f 
     bool surround51;
Kevin Kofler 444964f 
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
Kevin Kofler 444964f 
index 339fd9f..abfa4a1 100644
Kevin Kofler 444964f 
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
Kevin Kofler 444964f 
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
Kevin Kofler 444964f 
@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open()
Kevin Kofler 444964f 
     QString dev = QString(QLatin1String(m_device.constData()));
Kevin Kofler 444964f 
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput);
Kevin Kofler 444964f 
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = QLatin1String(devices.first());
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964f 
 #endif
Kevin Kofler 444964f 
     } else {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = QLatin1String(m_device);
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         int idx = 0;
Kevin Kofler 444964f 
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
Kevin Kofler 444964f 
index bf85de5..c29a89f 100644
Kevin Kofler 444964f 
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
Kevin Kofler 444964f 
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
Kevin Kofler 444964f 
@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open()
Kevin Kofler 444964f 
     QString dev = QString(QLatin1String(m_device.constData()));
Kevin Kofler 444964f 
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
Kevin Kofler 444964f 
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = QLatin1String(devices.first());
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964f 
 #endif
Kevin Kofler 444964f 
     } else {
Kevin Kofler 444964f 
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964f 
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964f 
         dev = QLatin1String(m_device);
Kevin Kofler 444964f 
 #else
Kevin Kofler 444964f 
         int idx = 0;
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.