| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 28917a258a4173af0abda0eef7faef5cbf95f123 Mon Sep 17 00:00:00 2001 |
| 2 | From: Vincent Davis Jr <vince@underview.tech> |
| 3 | Date: Fri, 9 Dec 2022 21:28:48 -0600 |
| 4 | Subject: [PATCH] vo: Makefile.am exclude libgl_plugin |
| 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | |
| 8 | RPI-Distro repo forks original vlc and applies patches |
| 9 | to enable raspiberry pi support. |
| 10 | |
| 11 | In the situation where opengl isn't included in |
| 12 | DISTRO_FEATURES. We need to exclude the opengl |
| 13 | vout plugin from being built. |
| 14 | |
| 15 | Signed-off-by: Vincent Davis Jr <vince@underview.tech> |
| 16 | --- |
| 17 | modules/video_output/Makefile.am | 64 -------------------------------- |
| 18 | 1 file changed, 64 deletions(-) |
| 19 | |
| 20 | diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am |
| 21 | index 78c06cfc4..14a330e68 100644 |
| 22 | --- a/modules/video_output/Makefile.am |
| 23 | +++ b/modules/video_output/Makefile.am |
| 24 | @@ -57,70 +57,6 @@ if HAVE_TVOS |
| 25 | vout_LTLIBRARIES += libvout_ios_plugin.la libglconv_cvpx_plugin.la |
| 26 | endif |
| 27 | |
| 28 | -### OpenGL ### |
| 29 | -libgles2_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c |
| 30 | -libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_COMMONCLFAGS) |
| 31 | -libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_COMMONLIBS) |
| 32 | -libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' |
| 33 | - |
| 34 | -EXTRA_LTLIBRARIES += libgles2_plugin.la |
| 35 | -vout_LTLIBRARIES += $(LTLIBgles2) |
| 36 | - |
| 37 | -libgl_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c |
| 38 | -libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCLFAGS) |
| 39 | -libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS) |
| 40 | -if HAVE_WIN32 |
| 41 | -libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS |
| 42 | -libgl_plugin_la_LIBADD += $(GL_LIBS) |
| 43 | -endif |
| 44 | - |
| 45 | -libglconv_vaapi_wl_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \ |
| 46 | - video_output/opengl/converter.h \ |
| 47 | - hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h |
| 48 | -libglconv_vaapi_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -DHAVE_VA_WL $(LIBVA_WL_CFLAGS) |
| 49 | -libglconv_vaapi_wl_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \ |
| 50 | - $(LIBVA_WL_LIBS) |
| 51 | - |
| 52 | -libglconv_vaapi_x11_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES) |
| 53 | -libglconv_vaapi_x11_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_X11 |
| 54 | -libglconv_vaapi_x11_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \ |
| 55 | - $(LIBVA_X11_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 |
| 56 | - |
| 57 | -libglconv_vaapi_drm_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES) |
| 58 | -libglconv_vaapi_drm_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_DRM |
| 59 | -libglconv_vaapi_drm_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \ |
| 60 | - $(LIBVA_DRM_LIBS) |
| 61 | - |
| 62 | -libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \ |
| 63 | - video_output/opengl/converter.h hw/vdpau/vlc_vdpau.h |
| 64 | -libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) |
| 65 | -libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11 |
| 66 | - |
| 67 | -if HAVE_GL |
| 68 | -vout_LTLIBRARIES += libgl_plugin.la |
| 69 | -if HAVE_EGL |
| 70 | -if HAVE_VAAPI |
| 71 | -if HAVE_WAYLAND_EGL |
| 72 | -if HAVE_VAAPI_WL |
| 73 | -vout_LTLIBRARIES += libglconv_vaapi_wl_plugin.la |
| 74 | -endif |
| 75 | -endif |
| 76 | -if HAVE_XCB |
| 77 | -if HAVE_VAAPI_X11 |
| 78 | -vout_LTLIBRARIES += libglconv_vaapi_x11_plugin.la |
| 79 | -endif |
| 80 | -endif |
| 81 | -if HAVE_VAAPI_DRM |
| 82 | -vout_LTLIBRARIES += libglconv_vaapi_drm_plugin.la |
| 83 | -endif |
| 84 | -endif |
| 85 | -endif # HAVE_EGL |
| 86 | - |
| 87 | -if HAVE_VDPAU |
| 88 | -vout_LTLIBRARIES += libglconv_vdpau_plugin.la |
| 89 | -endif |
| 90 | -endif # HAVE_GL |
| 91 | - |
| 92 | ### XCB ### |
| 93 | libvlc_xcb_events_la_SOURCES = \ |
| 94 | video_output/xcb/events.c video_output/xcb/events.h |
| 95 | -- |
| 96 | 2.38.1 |
| 97 | |