From: Sebastian Dröge <sebastian@centricular.com>
Date: Fri, 15 Jul 2022 10:22:14 +0000 (+0300)
Subject: qt: Fix another instance of Qt/GStreamer both defining `GLsync` differently
X-Git-Tag: 1.22.0~1262
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1728f8b72a1f8ceea0a71a50c38b52256085153f;p=platform%2Fupstream%2Fgstreamer.git

qt: Fix another instance of Qt/GStreamer both defining `GLsync` differently

In file included from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:87,
                 from ../gst-plugins-good-1.20.3/ext/qt/qtglrenderer.cc:14:
../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: error: conflicting declaration 'typedef void* GLsync'
   40 | typedef gpointer GLsync;
      |                  ^~~~~~
In file included from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtGui/qopengl.h:127,
                 from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtQuick/qsggeometry.h:44,
                 from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtQuick/qsgnode.h:43,
                 from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtQuick/qsgrendererinterface.h:43,
                 from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtQuick/qquickwindow.h:44,
                 from ../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtQuick/QQuickWindow:1,
                 from ../gst-plugins-good-1.20.3/ext/qt/qtglrenderer.cc:6:
../gstreamer1.0-plugins-good/1.20.3-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: note: previous declaration as 'typedef struct __GLsync* GLsync'
   24 | typedef struct __GLsync *GLsync;
      |                          ^~~~~~

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2763>
---

diff --git a/subprojects/gst-plugins-good/ext/qt/qtglrenderer.cc b/subprojects/gst-plugins-good/ext/qt/qtglrenderer.cc
index 52965fd..ce453a9 100644
--- a/subprojects/gst-plugins-good/ext/qt/qtglrenderer.cc
+++ b/subprojects/gst-plugins-good/ext/qt/qtglrenderer.cc
@@ -11,7 +11,7 @@
 #include <QAnimationDriver>
 
 #include <gst/gl/gl.h>
-#include <gst/gl/gstglfuncs.h>
+#include "gstqtgl.h"
 
 #include "qtglrenderer.h"
 #include "gstqtglutility.h"