vlc | branch: master | Steve Lhomme <[email protected]> | Tue Feb 11 08:21:30 2020 +0100| [32cb18379883d504750f7bc59939a0f05f49ecb5] | committer: Steve Lhomme
libvlc: avoid including OpenGL headers in the host bridge > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=32cb18379883d504750f7bc59939a0f05f49ecb5 --- modules/video_output/Makefile.am | 5 ----- modules/video_output/vgl.c | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index bcb19e2949..6bccecf006 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -333,12 +333,7 @@ libvmem_plugin_la_SOURCES = video_output/vmem.c libwdummy_plugin_la_SOURCES = video_output/wdummy.c libwextern_plugin_la_SOURCES = video_output/wextern.c libyuv_plugin_la_SOURCES = video_output/yuv.c - libvgl_plugin_la_SOURCES = video_output/vgl.c -libvgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -if HAVE_ANDROID -libvgl_plugin_la_CFLAGS += $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 -endif vout_LTLIBRARIES += \ libflaschen_plugin.la \ diff --git a/modules/video_output/vgl.c b/modules/video_output/vgl.c index 7602ef309e..99cf6f747e 100644 --- a/modules/video_output/vgl.c +++ b/modules/video_output/vgl.c @@ -27,7 +27,6 @@ #include <vlc_plugin.h> #include <vlc_vout_display.h> #include <vlc_opengl.h> -#include "opengl/gl_common.h" #include <vlc/libvlc.h> #include <vlc/libvlc_picture.h> @@ -35,6 +34,10 @@ #include <vlc/libvlc_renderer_discoverer.h> #include <vlc/libvlc_media_player.h> +#ifndef GL_RGBA +#define GL_RGBA 0x1908 +#endif + struct vout_display_sys_t { libvlc_video_output_cleanup_cb cleanupCb; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
