1*4882a593SmuzhiyunFrom bf8b2fa0f6870589d036f0f33c140a3f85b530a0 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 31 Mar 2020 21:23:28 -0700 4*4882a593SmuzhiyunSubject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h 5*4882a593Smuzhiyun 6*4882a593Smuzhiyungst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to 7*4882a593Smuzhiyunprefer qt headers definitions for GLsync 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThis helps in fixing build errors like below 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun/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*4882a593Smuzhiyun 24 | typedef struct __GLsync *GLsync; 13*4882a593Smuzhiyun | ^~~~~~ 14*4882a593SmuzhiyunIn 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*4882a593Smuzhiyun from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30: 16*4882a593Smuzhiyun/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*4882a593Smuzhiyun' 18*4882a593Smuzhiyun 40 | typedef gpointer GLsync; 19*4882a593Smuzhiyun | ^~~~~~ 20*4882a593Smuzhiyun 21*4882a593SmuzhiyunUpstream-Status: Pending 22*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun ext/qt/gstqsgtexture.cc | 2 +- 25*4882a593Smuzhiyun ext/qt/qtwindow.cc | 2 +- 26*4882a593Smuzhiyun 2 files changed, 2 insertions(+), 2 deletions(-) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc 29*4882a593Smuzhiyunindex a05d26e..4cc9fc6 100644 30*4882a593Smuzhiyun--- a/ext/qt/gstqsgtexture.cc 31*4882a593Smuzhiyun+++ b/ext/qt/gstqsgtexture.cc 32*4882a593Smuzhiyun@@ -27,7 +27,7 @@ 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun #include <gst/video/video.h> 35*4882a593Smuzhiyun #include <gst/gl/gl.h> 36*4882a593Smuzhiyun-#include <gst/gl/gstglfuncs.h> 37*4882a593Smuzhiyun+#include <ext/qt/gstqtgl.h> 38*4882a593Smuzhiyun #include "gstqsgtexture.h" 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun #define GST_CAT_DEFAULT gst_qsg_texture_debug 41*4882a593Smuzhiyundiff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc 42*4882a593Smuzhiyunindex 9360c33..0dfd3f1 100644 43*4882a593Smuzhiyun--- a/ext/qt/qtwindow.cc 44*4882a593Smuzhiyun+++ b/ext/qt/qtwindow.cc 45*4882a593Smuzhiyun@@ -25,7 +25,7 @@ 46*4882a593Smuzhiyun #include <stdio.h> 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun #include <gst/video/video.h> 49*4882a593Smuzhiyun-#include <gst/gl/gstglfuncs.h> 50*4882a593Smuzhiyun+#include <ext/qt/gstqtgl.h> 51*4882a593Smuzhiyun #include "qtwindow.h" 52*4882a593Smuzhiyun #include "gstqsgtexture.h" 53*4882a593Smuzhiyun #include "gstqtglutility.h" 54*4882a593Smuzhiyun-- 55*4882a593Smuzhiyun2.28.0 56*4882a593Smuzhiyun 57