From 5ad6d45d88e020da039872d3187416547b11e605 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 13 Jul 2018 16:33:42 +0200
Subject: Fix libvpx check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We no longer depend on a custom configuration of libvpx and shouldn't
check for non-standard headers.

Also fixes bitrot in the config.test.

Task-number: QTBUG-50554
Change-Id: I7b625e735536f7a79e41d036b7b8dc4d79f2262b
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 config.tests/libvpx/libvpx.cpp | 2 +-
 config.tests/libvpx/libvpx.pro | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'config.tests')

diff --git a/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp
index ec261cd5a..d4b34c6b5 100644
--- a/config.tests/libvpx/libvpx.cpp
+++ b/config.tests/libvpx/libvpx.cpp
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-#include <vpx/svc_context.h>
 #include <vpx/vpx_frame_buffer.h>
+#include <vpx/vp8cx.h>
 #include <vpx/vp8dx.h>
 
 #ifndef VPX_CTRL_VPXD_GET_LAST_QUANTIZER
diff --git a/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro
index aff6d1857..13ce13647 100644
--- a/config.tests/libvpx/libvpx.pro
+++ b/config.tests/libvpx/libvpx.pro
@@ -1,3 +1,4 @@
 SOURCES += libvpx.cpp
-PKGCONFIG += libvpx
+CONFIG += link_pkgconfig
+PKGCONFIG += vpx
 CONFIG -= qt
-- 
cgit v1.2.1