Skip to content

Commit 046a238

Browse files
Gijs Peskensagherzan
authored andcommitted
rpidistro-ffmpeg: upgrade to latest upstream, 7.1.13
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>
1 parent cc66524 commit 046a238

5 files changed

Lines changed: 3390 additions & 3401 deletions

recipes-multimedia/rpidistro-ffmpeg/files/2001-configure-setup-for-OE-core-usage.patch

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 702742f9575c87ac8c496d76daf51af7d4aaebd7 Mon Sep 17 00:00:00 2001
1+
From 465e6fd630f406f662b344f4092ceeb402b26bcb Mon Sep 17 00:00:00 2001
22
From: Vincent Davis Jr <vince@underview.tech>
33
Date: Sun, 9 Jun 2024 18:09:25 -0400
44
Subject: [PATCH] configure: setup for OE-core usage
@@ -25,10 +25,10 @@ Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2525
1 file changed, 9 insertions(+), 5 deletions(-)
2626

2727
diff --git a/configure b/configure
28-
index 7214c221..7a541e63 100755
28+
index e4b48ee1..664b31fb 100755
2929
--- a/configure
3030
+++ b/configure
31-
@@ -5898,6 +5898,9 @@ enable_weak_pic() {
31+
@@ -6178,6 +6178,9 @@ enable_weak_pic() {
3232
}
3333

3434
enabled pic && enable_weak_pic
@@ -38,7 +38,7 @@ index 7214c221..7a541e63 100755
3838

3939
test_cc <<EOF || die "Symbol mangling check failed."
4040
int ff_extern;
41-
@@ -6716,8 +6719,8 @@ enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
41+
@@ -7117,8 +7120,8 @@ enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
4242
enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
4343
enabled mmal && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
4444
{ ! enabled cross_compile &&
@@ -49,11 +49,11 @@ index 7214c221..7a541e63 100755
4949
check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
5050
die "ERROR: mmal not found" &&
5151
check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
52-
@@ -6737,12 +6740,13 @@ enabled opengl && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
52+
@@ -7139,12 +7142,13 @@ enabled opengl && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
5353
check_lib opengl windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
54-
check_lib opengl OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
55-
check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
56-
+ check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
54+
check_lib opengl OpenGL/gl3.h glGetError "-framework OpenGL" ||
55+
check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -framework OpenGLES" ||
56+
+ check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
5757
die "ERROR: opengl not found."
5858
}
5959
enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
@@ -65,7 +65,7 @@ index 7214c221..7a541e63 100755
6565
die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
6666
enable omx
6767
enabled omx && require_headers OMX_Core.h
68-
@@ -6788,7 +6792,7 @@ fi
68+
@@ -7190,7 +7194,7 @@ fi
6969

7070
if enabled sdl2; then
7171
SDL2_CONFIG="${cross_prefix}sdl2-config"
@@ -74,6 +74,3 @@ index 7214c221..7a541e63 100755
7474
if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
7575
sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
7676
sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
77-
--
78-
2.34.1
79-

recipes-multimedia/rpidistro-ffmpeg/files/2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0dfb56e12fa709794525cda1471091f6699905d5 Mon Sep 17 00:00:00 2001
1+
From 53f736cdb4d85633286287594675e5f3c7fa8df9 Mon Sep 17 00:00:00 2001
22
From: Vincent Davis Jr <vince@underview.tech>
33
Date: Thu, 8 Dec 2022 10:49:03 -0600
44
Subject: [PATCH] libavcodec: omx replace /opt/vc path with /usr/lib
@@ -18,10 +18,10 @@ Signed-off-by: Vincent Davis Jr <vince@underview.tech>
1818
1 file changed, 1 insertion(+), 1 deletion(-)
1919

2020
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
21-
index 0a6a3083..8c6e9193 100644
21+
index 2c386550..f0e75216 100644
2222
--- a/libavcodec/omx.c
2323
+++ b/libavcodec/omx.c
24-
@@ -141,7 +141,7 @@ static av_cold OMXContext *omx_init(void *logctx, const char *libname, const cha
24+
@@ -143,7 +143,7 @@ static av_cold OMXContext *omx_init(void *logctx, const char *libname, const cha
2525
{
2626
static const char * const libnames[] = {
2727
#if CONFIG_OMX_RPI
@@ -30,6 +30,3 @@ index 0a6a3083..8c6e9193 100644
3030
#else
3131
"libOMX_Core.so", NULL,
3232
"libOmxCore.so", NULL,
33-
--
34-
2.38.1
35-

recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)