vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Oct 6 17:03:27 2014 +0300| [f1a8e92956c304369d186abcd49a0440299f64a4] | committer: Rémi Denis-Courmont
wayland: agree on the name of video_output subdirectory > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f1a8e92956c304369d186abcd49a0440299f64a4 --- modules/video_output/Makefile.am | 13 +++++++------ modules/video_output/{wl => wayland}/scaler.xml | 0 modules/video_output/{wl => wayland}/shell_surface.c | 0 modules/video_output/{wl => wayland}/shm.c | 0 po/POTFILES.in | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 51ba97d..8fa999d 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -125,19 +125,20 @@ endif ### Wayland ### -libwl_shm_plugin_la_SOURCES = video_output/wl/shm.c -nodist_libwl_shm_plugin_la_SOURCES = video_output/wl/scaler-protocol.c -libwl_shm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/video_output/wl +libwl_shm_plugin_la_SOURCES = video_output/wayland/shm.c +nodist_libwl_shm_plugin_la_SOURCES = video_output/wayland/scaler-protocol.c +libwl_shm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ + -I$(builddir)/video_output/wayland libwl_shm_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS) libwl_shm_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) EXTRA_DIST += video_output/wayland/scaler.xml -CLEANFILES += $(nodist_libwl_shm_plugin_la_SOURCES) +CLEANFILES += $(nodist_libwayland_shm_plugin_la_SOURCES) if HAVE_WAYLAND -BUILT_SOURCES += video_output/wl/scaler-client-protocol.h +BUILT_SOURCES += video_output/wayland/scaler-client-protocol.h vout_LTLIBRARIES += libwl_shm_plugin.la endif -libwl_shell_surface_plugin_la_SOURCES = video_output/wl/shell_surface.c +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) if HAVE_WAYLAND diff --git a/modules/video_output/wl/scaler.xml b/modules/video_output/wayland/scaler.xml similarity index 100% rename from modules/video_output/wl/scaler.xml rename to modules/video_output/wayland/scaler.xml diff --git a/modules/video_output/wl/shell_surface.c b/modules/video_output/wayland/shell_surface.c similarity index 100% rename from modules/video_output/wl/shell_surface.c rename to modules/video_output/wayland/shell_surface.c diff --git a/modules/video_output/wl/shm.c b/modules/video_output/wayland/shm.c similarity index 100% rename from modules/video_output/wl/shm.c rename to modules/video_output/wayland/shm.c diff --git a/po/POTFILES.in b/po/POTFILES.in index c3fede7..931b515 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1176,8 +1176,8 @@ modules/video_output/msw/wingdi.c modules/video_output/sdl.c modules/video_output/vdummy.c modules/video_output/vmem.c -modules/video_output/wl/shell_surface.c -modules/video_output/wl/shm.c +modules/video_output/wayland/shell_surface.c +modules/video_output/wayland/shm.c modules/video_output/xcb/glx.c modules/video_output/xcb/window.c modules/video_output/xcb/x11.c _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
