1From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Tue, 31 Mar 2020 21:23:28 -0700 4Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h 5 6gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to 7prefer qt headers definitions for GLsync 8 9This helps in fixing build errors like below 10 11/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: error: conflicting declaration 'typedef struct __GLsync* GLsync' 12 24 | typedef struct __GLsync *GLsync; 13 | ^~~~~~ 14In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:84, 15 from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30: 16/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: note: previous declaration as 'typedef void* GLsync 17' 18 40 | typedef gpointer GLsync; 19 | ^~~~~~ 20 21Upstream-Status: Pending 22Signed-off-by: Khem Raj <raj.khem@gmail.com> 23 24--- 25 ext/qt/gstqsgtexture.cc | 2 +- 26 ext/qt/qtwindow.cc | 2 +- 27 2 files changed, 2 insertions(+), 2 deletions(-) 28 29diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc 30index 663696b..36b17d4 100644 31--- a/ext/qt/gstqsgtexture.cc 32+++ b/ext/qt/gstqsgtexture.cc 33@@ -27,7 +27,7 @@ 34 35 #include <gst/video/video.h> 36 #include <gst/gl/gl.h> 37-#include <gst/gl/gstglfuncs.h> 38+#include <ext/qt/gstqtgl.h> 39 #include "gstqsgtexture.h" 40 41 #define GST_CAT_DEFAULT gst_qsg_texture_debug 42diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc 43index 2872cb5..5a36be9 100644 44--- a/ext/qt/qtwindow.cc 45+++ b/ext/qt/qtwindow.cc 46@@ -25,7 +25,7 @@ 47 #include <stdio.h> 48 49 #include <gst/video/video.h> 50-#include <gst/gl/gstglfuncs.h> 51+#include <ext/qt/gstqtgl.h> 52 #include "qtwindow.h" 53 #include "gstqsgtexture.h" 54 #include "gstqtglutility.h" 55