Your Name
150 lines
7.4 KiB
Diff
150 lines
7.4 KiB
Diff
From 5f1bb5889d838719e381350b25c00ef3a75d0e02 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Davis Jr <vince@underview.tech>
|
|
Date: Fri, 9 Dec 2022 01:07:55 -0600
|
|
Subject: [PATCH] modules: remove glspectrum usage
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
RPI-Distro repo forks original vlc and applies patches to enable
|
|
raspiberry pi support.
|
|
|
|
The glspectrum modules requries OpenGL
|
|
while we only want to utilize GLESv2.
|
|
|
|
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
|
---
|
|
modules/Makefile.in | 24 ------------------------
|
|
modules/visualization/Makefile.am | 10 ----------
|
|
2 files changed, 34 deletions(-)
|
|
|
|
diff --git a/modules/Makefile.in b/modules/Makefile.in
|
|
index bde45db53..c9c4342ad 100644
|
|
--- a/modules/Makefile.in
|
|
+++ b/modules/Makefile.in
|
|
@@ -481,7 +481,6 @@ TESTS = hpack_test$(EXEEXT) hpackenc_test$(EXEEXT) \
|
|
@HAVE_WIN32_FALSE@am__append_247 = $(X_LIBS) $(X_PRE_LIBS) -lX11
|
|
@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_248 = $(X_LIBS) $(X_PRE_LIBS) -lX11
|
|
@HAVE_EVAS_TRUE@am__append_249 = libevas_plugin.la
|
|
-@HAVE_GL_TRUE@am__append_250 = libglspectrum_plugin.la
|
|
@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_251 = libaccess_output_livehttp_plugin.la
|
|
@ENABLE_SOUT_TRUE@am__append_252 = libaccess_output_shout_plugin.la \
|
|
@ENABLE_SOUT_TRUE@ libaccess_output_srt_plugin.la \
|
|
@@ -2028,13 +2027,7 @@ libgles2_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
|
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
|
$(libgles2_plugin_la_CFLAGS) $(CFLAGS) \
|
|
$(libgles2_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
-libglspectrum_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1)
|
|
-am_libglspectrum_plugin_la_OBJECTS = visualization/glspectrum.lo \
|
|
- visualization/visual/fft.lo visualization/visual/window.lo
|
|
-libglspectrum_plugin_la_OBJECTS = \
|
|
- $(am_libglspectrum_plugin_la_OBJECTS)
|
|
-@HAVE_GL_TRUE@am_libglspectrum_plugin_la_rpath = -rpath $(visudir)
|
|
libglwin32_plugin_la_DEPENDENCIES = libchroma_copy.la \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_5)
|
|
am__objects_23 = \
|
|
@@ -6507,7 +6500,6 @@ am__depfiles_remade = \
|
|
video_splitter/$(DEPDIR)/clone.Plo \
|
|
video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo \
|
|
video_splitter/$(DEPDIR)/wall.Plo \
|
|
- visualization/$(DEPDIR)/glspectrum.Plo \
|
|
visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo \
|
|
visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo \
|
|
visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo \
|
|
@@ -6731,7 +6723,6 @@ SOURCES = $(liba52_plugin_la_SOURCES) $(libaa_plugin_la_SOURCES) \
|
|
$(libglconv_vaapi_x11_plugin_la_SOURCES) \
|
|
$(libglconv_vdpau_plugin_la_SOURCES) \
|
|
$(libgles2_plugin_la_SOURCES) \
|
|
- $(libglspectrum_plugin_la_SOURCES) \
|
|
$(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \
|
|
$(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \
|
|
$(libgoom_plugin_la_SOURCES) $(libgradfun_plugin_la_SOURCES) \
|
|
@@ -7130,7 +7121,6 @@ DIST_SOURCES = $(liba52_plugin_la_SOURCES) $(libaa_plugin_la_SOURCES) \
|
|
$(libglconv_vaapi_x11_plugin_la_SOURCES) \
|
|
$(libglconv_vdpau_plugin_la_SOURCES) \
|
|
$(libgles2_plugin_la_SOURCES) \
|
|
- $(libglspectrum_plugin_la_SOURCES) \
|
|
$(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \
|
|
$(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \
|
|
$(libgoom_plugin_la_SOURCES) $(libgradfun_plugin_la_SOURCES) \
|
|
@@ -12696,13 +12686,6 @@ libevent_thread_la_LDFLAGS = -static
|
|
visudir = $(pluginsdir)/visualization
|
|
visu_LTLIBRARIES = $(am__append_250) $(LTLIBgoom) $(LTLIBprojectm) \
|
|
libvisual_plugin.la $(LTLIBvsxu)
|
|
-libglspectrum_plugin_la_SOURCES = \
|
|
- visualization/glspectrum.c \
|
|
- visualization/visual/fft.c visualization/visual/fft.h \
|
|
- visualization/visual/window.c visualization/visual/window.h \
|
|
- visualization/visual/window_presets.h
|
|
-
|
|
-libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
|
|
libgoom_plugin_la_SOURCES = visualization/goom.c
|
|
libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS)
|
|
libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
|
|
@@ -15715,8 +15698,6 @@ visualization/$(am__dirstamp):
|
|
visualization/$(DEPDIR)/$(am__dirstamp):
|
|
@$(MKDIR_P) visualization/$(DEPDIR)
|
|
@: > visualization/$(DEPDIR)/$(am__dirstamp)
|
|
-visualization/glspectrum.lo: visualization/$(am__dirstamp) \
|
|
- visualization/$(DEPDIR)/$(am__dirstamp)
|
|
visualization/visual/$(am__dirstamp):
|
|
@$(MKDIR_P) visualization/visual
|
|
@: > visualization/visual/$(am__dirstamp)
|
|
@@ -15728,8 +15709,6 @@ visualization/visual/fft.lo: visualization/visual/$(am__dirstamp) \
|
|
visualization/visual/window.lo: visualization/visual/$(am__dirstamp) \
|
|
visualization/visual/$(DEPDIR)/$(am__dirstamp)
|
|
|
|
-libglspectrum_plugin.la: $(libglspectrum_plugin_la_OBJECTS) $(libglspectrum_plugin_la_DEPENDENCIES) $(EXTRA_libglspectrum_plugin_la_DEPENDENCIES)
|
|
- $(AM_V_CCLD)$(LINK) $(am_libglspectrum_plugin_la_rpath) $(libglspectrum_plugin_la_OBJECTS) $(libglspectrum_plugin_la_LIBADD) $(LIBS)
|
|
video_output/opengl/libglwin32_plugin_la-vout_helper.lo: \
|
|
video_output/opengl/$(am__dirstamp) \
|
|
video_output/opengl/$(DEPDIR)/$(am__dirstamp)
|
|
@@ -21420,7 +21399,6 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/clone.Plo@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/wall.Plo@am__quote@ # am--include-marker
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/glspectrum.Plo@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo@am__quote@ # am--include-marker
|
|
@@ -30324,7 +30302,6 @@ distclean: distclean-recursive
|
|
-rm -f video_splitter/$(DEPDIR)/clone.Plo
|
|
-rm -f video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo
|
|
-rm -f video_splitter/$(DEPDIR)/wall.Plo
|
|
- -rm -f visualization/$(DEPDIR)/glspectrum.Plo
|
|
-rm -f visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo
|
|
-rm -f visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo
|
|
-rm -f visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo
|
|
@@ -31722,7 +31699,6 @@ maintainer-clean: maintainer-clean-recursive
|
|
-rm -f video_splitter/$(DEPDIR)/clone.Plo
|
|
-rm -f video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo
|
|
-rm -f video_splitter/$(DEPDIR)/wall.Plo
|
|
- -rm -f visualization/$(DEPDIR)/glspectrum.Plo
|
|
-rm -f visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo
|
|
-rm -f visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo
|
|
-rm -f visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo
|
|
diff --git a/modules/visualization/Makefile.am b/modules/visualization/Makefile.am
|
|
index 10619e030..aafc97f87 100644
|
|
--- a/modules/visualization/Makefile.am
|
|
+++ b/modules/visualization/Makefile.am
|
|
@@ -1,16 +1,6 @@
|
|
visudir = $(pluginsdir)/visualization
|
|
visu_LTLIBRARIES =
|
|
|
|
-libglspectrum_plugin_la_SOURCES = \
|
|
- visualization/glspectrum.c \
|
|
- visualization/visual/fft.c visualization/visual/fft.h \
|
|
- visualization/visual/window.c visualization/visual/window.h \
|
|
- visualization/visual/window_presets.h
|
|
-libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
|
|
-if HAVE_GL
|
|
-visu_LTLIBRARIES += libglspectrum_plugin.la
|
|
-endif
|
|
-
|
|
libgoom_plugin_la_SOURCES = visualization/goom.c
|
|
libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS)
|
|
libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
|
|
--
|
|
2.38.1
|
|
|