[vlc-commits] vout: move egl.c to opengl/egl.c

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Dec 12 10:54:55 2016 +0100| [b4849d1c550bf7de108e67d80fc5a9c5ba708419] | committer: Thomas Guillem

vout: move egl.c to opengl/egl.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4849d1c550bf7de108e67d80fc5a9c5ba708419
---

 modules/video_output/Makefile.am        | 8 ++++----
 modules/video_output/{ => opengl}/egl.c | 2 +-
 po/POTFILES.in                          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 515b5a5..8ca405e 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -87,7 +87,7 @@ libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XPROTO_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS)
 libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) $(XCB_KEYSYMS_LIBS)
 
-libegl_x11_plugin_la_SOURCES = video_output/egl.c
+libegl_x11_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_x11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_X11=1
 libegl_x11_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
 libegl_x11_plugin_la_LIBADD = $(EGL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
@@ -128,7 +128,7 @@ libwl_shell_surface_plugin_la_SOURCES = video_output/wayland/shell_surface.c
 libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
 
-libegl_wl_plugin_la_SOURCES = video_output/egl.c
+libegl_wl_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_wl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WAYLAND=1
 libegl_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) $(WAYLAND_EGL_CFLAGS)
 libegl_wl_plugin_la_LIBADD = $(EGL_LIBS) $(WAYLAND_EGL_LIBS)
@@ -224,7 +224,7 @@ if HAVE_WIN32_DESKTOP
 vout_LTLIBRARIES += libwingdi_plugin.la
 endif
 
-libegl_win32_plugin_la_SOURCES = video_output/egl.c
+libegl_win32_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_win32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WIN32=1
 libegl_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
 libegl_win32_plugin_la_LIBADD = $(EGL_LIBS)
@@ -253,7 +253,7 @@ endif
 
 ### Android ###
 
-libegl_android_plugin_la_SOURCES = video_output/egl.c
+libegl_android_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDROID=1
 libegl_android_plugin_la_LIBADD = $(EGL_LIBS)
 
diff --git a/modules/video_output/egl.c b/modules/video_output/opengl/egl.c
similarity index 99%
rename from modules/video_output/egl.c
rename to modules/video_output/opengl/egl.c
index da50036..664a937 100644
--- a/modules/video_output/egl.c
+++ b/modules/video_output/opengl/egl.c
@@ -40,7 +40,7 @@
 # include <wayland-egl.h>
 #endif
 #if defined (USE_PLATFORM_ANDROID)
-# include "android/utils.h"
+# include "../android/utils.h"
 #endif
 
 typedef struct vlc_gl_sys_t
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 590f4ea..291063b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1131,13 +1131,13 @@ modules/video_output/decklink.cpp
 modules/video_output/directfb.c
 modules/video_output/drawable.c
 modules/video_output/evas.c
-modules/video_output/egl.c
 modules/video_output/fb.c
 modules/video_output/glx.c
 modules/video_output/ios2.m
 modules/video_output/kva.c
 modules/video_output/macosx.m
 modules/video_output/opengl/display.c
+modules/video_output/opengl/egl.c
 modules/video_output/win32/direct3d9.c
 modules/video_output/win32/direct3d11.c
 modules/video_output/win32/directdraw.c