mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/build: don't pass OpenGL headers to GIR

Browse source 
g-ir-scanner does not have a good enough C parser to parse the GL system
headers
This commit is contained in:
Matthew Waters 2018-09-03 16:20:33 +10:00
parent 333566c53e
commit 5765641729
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/libs/Makefile.am
View file

@ -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 \

10
gst-libs/gst/gl/Makefile.am
View file

@ -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

9
gst-libs/gst/gl/meson.build
View file

@ -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',