mirror of
git://git.yoctoproject.org/meta-raspberrypi
synced 2026-04-02 02:49:12 +00:00
e493266180
Update is also meant to fix bug where if x11
isn't define in DISTRO_FEATURES builds will
fail to compile.
Upgrades version of VLC to 3.0.17
* Reason for update with version 3.0.12 compiling
using GLESv2 and without x11/wayland defined in
DISTRO_FEATURES it was proven to be difficult.
Newer version of VLC appears to have better support
for GLESv2 as there was far less hurdles.
* SRCREV set to b276eb0d7bc3213363e97dbb681ef7c927be6c73
Updates to PACKAGECONFIG
* Only include GLESv2 if opengl defined in DISTRO_FEATURES
* Only include libnotify is x11 included in DISTRO_FEATURES.
Not checking for wayland as well because wayland integration
requires a separate MR.
* remove ability to set certain flags as they require
significant more development time to integrate. Probably
best to include in separate MR.
Flags for:
- opencv
- freerdp
- samba
- dvdread
- vdpau
- wayland
- dca
Removal of
--------------------------------------------------------
TARGET_CFLAGS:append = " -fcommon"
TARGET_CXXFLAGS:append = " -fcommon"
--------------------------------------------------------
as define in configure.ac via the
3001-configure.ac-setup-for-OE-usage.patch patch
Removes extraneous sed operations in the do_configure
takes. Appears to nolonger be required.
Adds required flags to build that couldn't be set in configure.ac
------------------------------------------------------------------
TARGET_CFLAGS:append = " -I${STAGING_INCDIR}/drm"
TARGET_LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES',
'opengl', '-lGLESv2', '', d)}"
------------------------------------------------------------------
Replaces patches with updated patches used in actual commit.
Prepend patches that are from meta-openembedded/meta-multimedia
to 2XXX-<PATCH NAME>.patch. Adds nine new patches to fix ./configure,
compile, runtime bugs.
PATCHES:
- 3001-configure.ac-setup-for-OE-usage.patch
* Used to ensure crossed compilted OE libraries are used during
compilation. Specifically for the mmal and omxil libraries.
- 3002-fix-EGL-macro-undeclared-and-EGLImageKHR.patch
* Appears to be missing EGL preprocesor directives patch
defines them. The function createImageKHR also appears
to return EGLImageKHR not EGLImage patch updates. To
accommodate for change.
- 3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch
* Configures omxil_core.c for OE usages as libbcm_host.so
and libopenmaxil.so are located in a different location.
- 3004-use-GLESv2-headers-over-GL-headers.patch
* Ensures GLESv2 headers are used over OpenGL headers.
- 3005-modules-remove-glspectrum-usage.patch
* Removes glspectrum plugin as it appears to require
normal OpenGL and not GLESv2 for usage.
- 3006-codec-omxil_core.h-fix-multiple-definition-of.patch
* Removes compile error due to function pointer in omxil_core.h
header being defined multiple times as the header is included
in multiple c source files.
- 3007-remove-xorg-related-link-libs.patch
* Removes xorg related flags if x11 isn't defined in
DISTRO_FEATURES variable.
- 3008-vo-Makefile.am-exclude-libgl_plugin.patch
* Removes the libgl_plugin from being built if opengl
not defined in DISTRO_FEATURES variable.
- 3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch
* Appears to be missing EGL preprocesor directives patch
defines them.
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
98 lines
3.3 KiB
Diff
98 lines
3.3 KiB
Diff
From 28917a258a4173af0abda0eef7faef5cbf95f123 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Davis Jr <vince@underview.tech>
|
|
Date: Fri, 9 Dec 2022 21:28:48 -0600
|
|
Subject: [PATCH] vo: Makefile.am exclude libgl_plugin
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
RPI-Distro repo forks original vlc and applies patches
|
|
to enable raspiberry pi support.
|
|
|
|
In the situation where opengl isn't included in
|
|
DISTRO_FEATURES. We need to exclude the opengl
|
|
vout plugin from being built.
|
|
|
|
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
|
---
|
|
modules/video_output/Makefile.am | 64 --------------------------------
|
|
1 file changed, 64 deletions(-)
|
|
|
|
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
|
|
index 78c06cfc4..14a330e68 100644
|
|
--- a/modules/video_output/Makefile.am
|
|
+++ b/modules/video_output/Makefile.am
|
|
@@ -57,70 +57,6 @@ if HAVE_TVOS
|
|
vout_LTLIBRARIES += libvout_ios_plugin.la libglconv_cvpx_plugin.la
|
|
endif
|
|
|
|
-### OpenGL ###
|
|
-libgles2_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c
|
|
-libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_COMMONCLFAGS)
|
|
-libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_COMMONLIBS)
|
|
-libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
|
|
-
|
|
-EXTRA_LTLIBRARIES += libgles2_plugin.la
|
|
-vout_LTLIBRARIES += $(LTLIBgles2)
|
|
-
|
|
-libgl_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c
|
|
-libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCLFAGS)
|
|
-libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS)
|
|
-if HAVE_WIN32
|
|
-libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
|
|
-libgl_plugin_la_LIBADD += $(GL_LIBS)
|
|
-endif
|
|
-
|
|
-libglconv_vaapi_wl_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \
|
|
- video_output/opengl/converter.h \
|
|
- hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
|
|
-libglconv_vaapi_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -DHAVE_VA_WL $(LIBVA_WL_CFLAGS)
|
|
-libglconv_vaapi_wl_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \
|
|
- $(LIBVA_WL_LIBS)
|
|
-
|
|
-libglconv_vaapi_x11_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES)
|
|
-libglconv_vaapi_x11_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_X11
|
|
-libglconv_vaapi_x11_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \
|
|
- $(LIBVA_X11_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
|
|
-
|
|
-libglconv_vaapi_drm_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES)
|
|
-libglconv_vaapi_drm_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_DRM
|
|
-libglconv_vaapi_drm_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \
|
|
- $(LIBVA_DRM_LIBS)
|
|
-
|
|
-libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \
|
|
- video_output/opengl/converter.h hw/vdpau/vlc_vdpau.h
|
|
-libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
|
|
-libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11
|
|
-
|
|
-if HAVE_GL
|
|
-vout_LTLIBRARIES += libgl_plugin.la
|
|
-if HAVE_EGL
|
|
-if HAVE_VAAPI
|
|
-if HAVE_WAYLAND_EGL
|
|
-if HAVE_VAAPI_WL
|
|
-vout_LTLIBRARIES += libglconv_vaapi_wl_plugin.la
|
|
-endif
|
|
-endif
|
|
-if HAVE_XCB
|
|
-if HAVE_VAAPI_X11
|
|
-vout_LTLIBRARIES += libglconv_vaapi_x11_plugin.la
|
|
-endif
|
|
-endif
|
|
-if HAVE_VAAPI_DRM
|
|
-vout_LTLIBRARIES += libglconv_vaapi_drm_plugin.la
|
|
-endif
|
|
-endif
|
|
-endif # HAVE_EGL
|
|
-
|
|
-if HAVE_VDPAU
|
|
-vout_LTLIBRARIES += libglconv_vdpau_plugin.la
|
|
-endif
|
|
-endif # HAVE_GL
|
|
-
|
|
### XCB ###
|
|
libvlc_xcb_events_la_SOURCES = \
|
|
video_output/xcb/events.c video_output/xcb/events.h
|
|
--
|
|
2.38.1
|
|
|