diff options
author | Matthew Waters <matthew@centricular.com> | 2020-08-11 16:53:51 +1000 |
---|---|---|
committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-08-11 07:11:30 +0000 |
commit | 42b3025bdc6103721da13ed14b982c98e235b9a8 (patch) | |
tree | 6aa3b9b7c2f80a422dd29887b19fc1d4ead28bf3 | |
parent | 855315cd390ceaa3057b4dfc5248a5014b8c3bdd (diff) | |
download | gstreamer-plugins-base-42b3025bdc6103721da13ed14b982c98e235b9a8.tar.gz |
build/gl: add top-level include files for sub-libraries
Makes gir happy
Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/809
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/784>
-rw-r--r-- | gst-libs/gst/gl/egl/egl.h | 31 | ||||
-rw-r--r-- | gst-libs/gst/gl/meson.build | 9 | ||||
-rw-r--r-- | gst-libs/gst/gl/wayland/wayland.h | 27 | ||||
-rw-r--r-- | gst-libs/gst/gl/x11/x11.h | 27 |
4 files changed, 91 insertions, 3 deletions
diff --git a/gst-libs/gst/gl/egl/egl.h b/gst-libs/gst/gl/egl/egl.h new file mode 100644 index 000000000..d1651501d --- /dev/null +++ b/gst-libs/gst/gl/egl/egl.h @@ -0,0 +1,31 @@ +/* + * GStreamer + * Copyright (C) 2020 Matthew Waters <matthew@centricular.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_GL_EGL_H__ +#define __GST_GL_EGL_H__ + +#include <gst/gl/gl.h> +#include <gst/gl/egl/gstegl.h> +#include <gst/gl/egl/gsteglimage.h> +#include <gst/gl/egl/gstgldisplay_egl.h> +#include <gst/gl/egl/gstglmemoryegl.h> +#include <gst/gl/egl/gstgldisplay_egl_device.h> + +#endif /* __GST_GL_EGL_H__ */ diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build index 31010da61..c051e3823 100644 --- a/gst-libs/gst/gl/meson.build +++ b/gst-libs/gst/gl/meson.build @@ -501,6 +501,7 @@ if need_platform_egl != 'no' 'egl/gstgldisplay_egl_device.c', ] gl_egl_headers += [ + 'egl/egl.h', 'egl/gstegl.h', 'egl/gsteglimage.h', 'egl/gstgldisplay_egl.h', @@ -584,6 +585,7 @@ if need_win_wayland != 'no' xdg_shell_code, ] gl_wayland_headers += [ + 'wayland/wayland.h', 'wayland/gstgldisplay_wayland.h' ] glconf.set('GST_GL_HAVE_WINDOW_WAYLAND', 1) @@ -621,6 +623,7 @@ if need_win_x11 != 'no' 'x11/xcb_event_source.c', ] gl_x11_headers += [ + 'x11/x11.h', 'x11/gstgldisplay_x11.h', ] glconf.set('GST_GL_HAVE_WINDOW_X11', 1) @@ -1029,7 +1032,7 @@ if build_gstgl export_packages : 'gstreamer-gl-x11-1.0', includes : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', gl_gir[0]], install : true, - extra_args : gir_init_section + ['--c-include=gst/gl/gl.h'], + extra_args : gir_init_section + ['--c-include=gst/gl/x11/x11.h'], dependencies : [video_dep, gst_dep, gst_base_dep] ) endif @@ -1050,7 +1053,7 @@ if build_gstgl export_packages : 'gstreamer-gl-wayland-1.0', includes : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', gl_gir[0]], install : true, - extra_args : gir_init_section + ['--c-include=gst/gl/gl.h'], + extra_args : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'], dependencies : [video_dep, gst_dep, gst_base_dep] ) endif @@ -1071,7 +1074,7 @@ if build_gstgl export_packages : 'gstreamer-gl-egl-1.0', includes : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', gl_gir[0]], install : true, - extra_args : gir_init_section + ['--c-include=gst/gl/gl.h'], + extra_args : gir_init_section + ['--c-include=gst/gl/egl/egl.h'], dependencies : [video_dep, gst_dep, gst_base_dep] ) endif diff --git a/gst-libs/gst/gl/wayland/wayland.h b/gst-libs/gst/gl/wayland/wayland.h new file mode 100644 index 000000000..ec990e192 --- /dev/null +++ b/gst-libs/gst/gl/wayland/wayland.h @@ -0,0 +1,27 @@ +/* + * GStreamer + * Copyright (C) 2020 Matthew Waters <matthew@centricular.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_GL_WAYLAND_H__ +#define __GST_GL_WAYLAND_H__ + +#include <gst/gl/gl.h> +#include <gst/gl/wayland/gstgldisplay_wayland.h> + +#endif /* __GST_GL_WAYLAND_H__ */ diff --git a/gst-libs/gst/gl/x11/x11.h b/gst-libs/gst/gl/x11/x11.h new file mode 100644 index 000000000..dfc1eaa8e --- /dev/null +++ b/gst-libs/gst/gl/x11/x11.h @@ -0,0 +1,27 @@ +/* + * GStreamer + * Copyright (C) 2020 Matthew Waters <matthew@centricular.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_GL_X11_H__ +#define __GST_GL_X11_H__ + +#include <gst/gl/gl.h> +#include <gst/gl/x11/gstgldisplay_x11.h> + +#endif /* __GST_GL_X11_H__ */ |