From 77c9ab4a3871110c6fb569c4e7b17181867c17ad Mon Sep 17 00:00:00 2001
From: Andreas Holzammer <andreas.holzammer@kdab.com>
Date: Wed, 9 Mar 2016 11:28:00 +0100
Subject: Port DirectShow backend to wince

dshow.h needs to be included before Qt headers as they include the
windows header with NOMINMAX macro set. DirectShow header needs min/max
macro definition to compile. The min/max macro then conflicts with
QDateTime header, hence needs to be undefined again for some occasions.

Windows Embedded Compact then defines INTERFACE as macro, which conflicts.

Windows Embedded Compact does not support audio end point selection.
Feature has been disabled for this platform.

Windows Embedded Compact does not support setting meta data, control has
been disabled.

Windows Embedded Compact does not support VMR, feature was disabled.

Direct Show renders always top to buttom.

Change-Id: Id17700835e2105fb127b12e3448bea16e3b52546
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
---
 config.tests/directshow/directshow.pro | 2 +-
 config.tests/directshow/main.cpp       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'config.tests')

diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro
index 6493e54ab..6dfc54a01 100644
--- a/config.tests/directshow/directshow.pro
+++ b/config.tests/directshow/directshow.pro
@@ -3,4 +3,4 @@ CONFIG += console
 
 SOURCES += main.cpp
 
-LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
+!wince: LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
diff --git a/config.tests/directshow/main.cpp b/config.tests/directshow/main.cpp
index d5e4db589..15ff3b9fc 100644
--- a/config.tests/directshow/main.cpp
+++ b/config.tests/directshow/main.cpp
@@ -32,8 +32,10 @@
 ****************************************************************************/
 
 #include <dshow.h>
+#ifndef _WIN32_WCE
 #include <d3d9.h>
 #include <vmr9.h>
+#endif
 
 int main(int, char**)
 {
-- 
cgit v1.2.3


From 680cc0c97431de03487206fee575fa89c24b8842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
 <perezmeyer@gmail.com>
Date: Sat, 5 Mar 2016 10:36:42 -0300
Subject: ALSA: simplify checking the available version.

Make use of SND_LIB_VERSION instead of SND_LIB_[MAJOR MINOR SUBMINOR]
in order to simplify the tests.

Task-number: QTBUG-51681
Change-Id: Ib9f28ff15ddc643cc426ded3a5779fb4ff651139
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 config.tests/alsa/alsatest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config.tests')

diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
index 1b59cb17b..0b45819b6 100644
--- 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
 
-- 
cgit v1.2.3