mirror of
git://git.yoctoproject.org/meta-raspberrypi
synced 2026-04-02 02:49:12 +00:00
046a238927
Upgrade rpidistro-ffmpeg to the latest upstream, some changes were made in the recipe to better match the OE recipe of the same version, x264 disabled by default due to cyclic dependency Signed-off-by: Gijs Peskens <gijs.peskens@munisense.com>
77 lines
4.1 KiB
Diff
77 lines
4.1 KiB
Diff
From 465e6fd630f406f662b344f4092ceeb402b26bcb 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 e4b48ee1..664b31fb 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6178,6 +6178,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;
|
|
@@ -7117,8 +7120,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"; }
|
|
@@ -7139,12 +7142,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 "-framework OpenGL" ||
|
|
check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -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
|
|
@@ -7190,7 +7194,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)
|