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