mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-05 05:04:45 +02:00
eb8ffc4e63
Some checks failed
Mirrors / Yocto Git Mirror (push) Has been cancelled
Reduce amount of patches applied as they are no longer required for building. From older commit no longer required * 0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch * 0002-Fix-build-on-powerpc-and-ppc64.patch * 0003-avcodec-pngenc-remove-monowhite-from-apng-formats.patch * 0004-ffmpeg-4.3.4-rpi_14.patc * 0005-fix-flags.diff Created by OE community to fix builds and are no longer required * 2002-libavdevice-opengl_enc-update-dynamic-function-loader.patch * 2003-libavcodec-fix-v4l2_req_devscan.patch rpidistro-ffmpeg updates: * removal of avresample flag. No longer exists * removal of rpi flag. No longer exists * include vout-egl and epoxy if opengl or x11 included in DISTRO_FEATURES. Signed-off-by: Vincent Davis Jr <vince@underview.tech>
80 lines
4.1 KiB
Diff
80 lines
4.1 KiB
Diff
From 702742f9575c87ac8c496d76daf51af7d4aaebd7 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Davis Jr <vince@underview.tech>
|
|
Date: Sun, 9 Jun 2024 18:09:25 -0400
|
|
Subject: [PATCH] configure: setup for OE-core usage
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
|
raspiberry pi support.
|
|
|
|
Add global CFLAGS and LDFLAGS. So, that when
|
|
./configure runs test it's able to locate proper
|
|
headers and libs in a cross-compile environment.
|
|
|
|
Add new check to opengl. None of the above headers
|
|
exists and we also should be using GLESv2.
|
|
|
|
Update where compiler finds OMX_Core.h
|
|
|
|
Only check that sdl2 version greater than 3.0.0
|
|
|
|
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
|
---
|
|
configure | 14 +++++++++-----
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 7214c221..7a541e63 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5898,6 +5898,9 @@ enable_weak_pic() {
|
|
}
|
|
|
|
enabled pic && enable_weak_pic
|
|
+# Set CFLAGS and LDFLAGS globally
|
|
+add_cflags -I${sysroot}/usr/include/ -I${sysroot}/usr/include/IL -I${sysroot}/usr/include/drm
|
|
+add_ldflags -L${sysroot}/usr/lib
|
|
|
|
test_cc <<EOF || die "Symbol mangling check failed."
|
|
int ff_extern;
|
|
@@ -6716,8 +6719,8 @@ enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
|
|
enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
|
|
enabled mmal && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
|
|
{ ! enabled cross_compile &&
|
|
- add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
|
|
- add_ldflags -L/opt/vc/lib/ &&
|
|
+ add_cflags -I${sysroot}/usr/include -I${sysroot}/usr/include/interface/vmcs_host/linux -I${sysroot}/usr/include/interface/vcos/pthreads -fgnu89-inline &&
|
|
+ add_ldflags -L${sysroot}/usr/lib &&
|
|
check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
|
|
die "ERROR: mmal not found" &&
|
|
check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
|
|
@@ -6737,12 +6740,13 @@ enabled opengl && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
|
|
check_lib opengl windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
|
|
check_lib opengl OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
|
|
check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
|
|
+ check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
|
|
die "ERROR: opengl not found."
|
|
}
|
|
enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
|
|
{ ! enabled cross_compile &&
|
|
- add_cflags -isystem/opt/vc/include/IL &&
|
|
- test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame; } ||
|
|
+ add_cflags -I${sysroot}/usr/include/IL &&
|
|
+ test_code cc IL/OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame; } ||
|
|
die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
|
|
enable omx
|
|
enabled omx && require_headers OMX_Core.h
|
|
@@ -6788,7 +6792,7 @@ fi
|
|
|
|
if enabled sdl2; then
|
|
SDL2_CONFIG="${cross_prefix}sdl2-config"
|
|
- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
|
|
+ test_pkg_config sdl2 "sdl2 >= 2.0.1" SDL_events.h SDL_PollEvent
|
|
if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
|
|
sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
|
|
sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
|
|
--
|
|
2.34.1
|
|
|