From 576564172928a46985466d3a77520337f3613d5e Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Mon, 3 Sep 2018 16:20:33 +1000
Subject: [PATCH] gl/build: don't pass OpenGL headers to GIR

g-ir-scanner does not have a good enough C parser to parse the GL system
headers
---
 docs/libs/Makefile.am       |  1 +
 gst-libs/gst/gl/Makefile.am | 10 +++++++---
 gst-libs/gst/gl/meson.build |  9 ++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 8638792a87..c89e4ddef3 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -57,6 +57,7 @@ IGNORE_HFILES = \
 	$(top_srcdir)/gst-libs/gst/audio/audio-resampler-neon.h \
 	$(top_srcdir)/gst-libs/gst/gl/gstglcontext_private.h \
 	$(top_srcdir)/gst-libs/gst/gl/gstglfeature_private.h \
+	$(top_srcdir)/gst-libs/gst/gl/gstglfuncs.h \
 	$(top_srcdir)/gst-libs/gst/gl/gstglsl_private.h \
 	$(top_srcdir)/gst-libs/gst/gl/gstglutil_private.h \
 	$(top_srcdir)/gst-libs/gst/gl/gstglwindow_private.h \
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 4e77e8c5f6..61111e1e73 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -36,7 +36,8 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \
 	gstglquery.c
 
 libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
-libgstgl_@GST_API_VERSION@include_HEADERS = \
+
+gstgl_headers = \
 	gstglwindow.h \
 	gstgldisplay.h \
 	gstglcontext.h \
@@ -49,7 +50,6 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
 	gstglbufferpool.h \
 	gstglfilter.h \
 	gstglformat.h \
-	gstglfuncs.h \
 	gstglbasefilter.h \
 	gstglshader.h \
 	gstglshaderstrings.h \
@@ -70,6 +70,10 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
 	gl-prelude.h \
 	gl.h
 
+libgstgl_@GST_API_VERSION@include_HEADERS = \
+	gstglfuncs.h \
+	$(gstgl_headers)
+
 noinst_HEADERS = \
 	gstglcontext_private.h \
 	gstglfeature_private.h \
@@ -88,7 +92,7 @@ libgstgl_@GST_API_VERSION@_la_LIBADD = \
 	$(GST_LIBS) \
 	$(GL_LIBS)
 
-gstgl_gir_headers = $(libgstgl_@GST_API_VERSION@include_HEADERS)
+gstgl_gir_headers = $(gstgl_headers)
 gstgl_gir_sources = $(libgstgl_@GST_API_VERSION@_la_SOURCES)
 
 if HAVE_WINDOW_WIN32
diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
index 31340a598b..ed4fbe5fcf 100644
--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
@@ -35,7 +35,7 @@ gl_sources = [
   'gstglwindow.c',
 ]
 
-gl_headers = [
+gir_gl_headers = [
   'gl.h',
   'gl-prelude.h',
   'gstgl_enums.h',
@@ -52,7 +52,6 @@ gl_headers = [
   'gstglfeature.h',
   'gstglfilter.h',
   'gstglformat.h',
-  'gstglfuncs.h',
   'gstglframebuffer.h',
   'gstglmemory.h',
   'gstglmemorypbo.h',
@@ -70,6 +69,10 @@ gl_headers = [
   'gstglwindow.h',
 ]
 
+gl_headers = gir_gl_headers + [
+  'gstglfuncs.h',
+]
+
 gl_prototype_headers = [
   'glprototypes/all_functions.h',
   'glprototypes/base.h',
@@ -887,7 +890,7 @@ if build_gstgl
   gen_sources = []
   if build_gir
     gl_gir = gnome.generate_gir(gstgl,
-      sources : gl_sources + gl_headers,
+      sources : gl_sources + gir_gl_headers,
       namespace : 'GstGL',
       nsversion : api_version,
       identifier_prefix : 'Gst',