mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-05 05:04:45 +02:00
rpidistro-ffmpeg: upgrade 4.3.2 -> 4.3.4
Upgrades version of ffmpeg to 4.3.4 * Reason for not upgrading to 4.3.5 all ported raspberrypi team patches may not be included in that version/commit. * SRCREV set to 246e1a55a0eca931537d8706acd8b133c07beb05 Updates to PACKAGECONFIG * Only include --enable-opengl flag when opengl is set in DISTRO_FEATURES * Add new flag --enable-epoxy required by vout-egl * vout-egl requires both libepoxy and x11. Only enable vout-egl if x11 contained in DISTRO_FEATURES. * The remaining RPI-Distro related flags added through patches. Are only enabled if vc4graphics is disabled and userland graphics enabled. As an attempt to keep ffmpeg ./configure generic unless specified other wise. Removes TARGET_CFLAGS:append as include flags are set in ./configure via the 2001-configure-setup-for-OE-core-usage.patch patch. Replaces patches with updated patches used in actual commit. Adds four new patches to fix ./configure, compile, runtime bugs. PATCHES: - 2001-configure-setup-for-OE-core-usage.patch * The ./configure stage fails if neither x11 or wayland defined in DISTRO_FEATURES. When opengl enabled ./configure checks for relevant headers. The last header it checks for is ES2/gl.h which doesn't exists. Neither do the others if certain perameters are not meet. Patch addes check for GLES2/gl2.h which does exists. We use utilize GLESv2 to compile and link with. Patch also replaces where compiler find mmal and omx headers and libs. - 2002-libavdevice-opengl_enc-update-dynamic-function-loader.patch * After configure stage succeeds the compile stage fails as SelectedGetProcAddress isn't defined. It can't be define as if x11 isn't enabled. Patch defines SelectedGetProcAddress if x11 not enabled, but sdl2 enabled to SDL_GL_GetProcAddress. If neither sdl2 or x11 is enabled patch loads GL functions pointers at compile time versus dynamically at runtime. - 2003-libavcodec-fix-v4l2_req_devscan.patch * v412_req_devscan.h function definitions where different from v412_req_devscan.c function implementations. - 2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch * Fixes where libbcm_host.so and libopenmaxil.so are loaded from. Signed-off-by: Vincent Davis Jr <vince@underview.tech>
This commit is contained in:
Vincent Davis Jr
Andrei Gherzan
parent
813b299e09
commit
1f33240549
|
|
@ -2,6 +2,11 @@ From: James Cowgill <jcowgill@debian.org>
|
|||
Date: Sun, 11 Aug 2019 16:50:56 +0100
|
||||
Subject: avcodec/arm/sbcenc: avoid callee preserved vfp registers
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
When compiling FFmpeg with GCC-9, some very random segfaults were
|
||||
observed in code which had previously called down into the SBC encoder
|
||||
NEON assembly routines. This was caused by these functions clobbering
|
||||
|
|
@ -19,8 +24,6 @@ sets of registers consecutively numbered which hopefully makes the
|
|||
code more easy to follow. Since this commit only reallocates
|
||||
registers, it should have no performance impact.
|
||||
|
||||
Upstream-status: Pending
|
||||
|
||||
Signed-off-by: James Cowgill <jcowgill@debian.org>
|
||||
---
|
||||
libavcodec/arm/sbcdsp_neon.S | 220 +++++++++++++++++++++----------------------
|
||||
|
|
@ -38,7 +41,7 @@ index d83d21d..914abfb 100644
|
|||
- vld1.16 {d8, d9}, [r2, :128]!
|
||||
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||
|
||||
|
||||
- vmull.s16 q0, d4, d8
|
||||
- vld1.16 {d6, d7}, [r0, :64]!
|
||||
- vmull.s16 q1, d5, d9
|
||||
|
|
@ -47,7 +50,7 @@ index d83d21d..914abfb 100644
|
|||
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||
+ vmull.s16 q1, d17, d21
|
||||
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||
|
||||
|
||||
- vmlal.s16 q0, d6, d10
|
||||
- vld1.16 {d4, d5}, [r0, :64]!
|
||||
- vmlal.s16 q1, d7, d11
|
||||
|
|
@ -56,7 +59,7 @@ index d83d21d..914abfb 100644
|
|||
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||
+ vmlal.s16 q1, d19, d23
|
||||
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||
|
||||
|
||||
- vmlal.s16 q0, d4, d8
|
||||
- vld1.16 {d6, d7}, [r0, :64]!
|
||||
- vmlal.s16 q1, d5, d9
|
||||
|
|
@ -65,7 +68,7 @@ index d83d21d..914abfb 100644
|
|||
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||
+ vmlal.s16 q1, d17, d21
|
||||
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||
|
||||
|
||||
- vmlal.s16 q0, d6, d10
|
||||
- vld1.16 {d4, d5}, [r0, :64]!
|
||||
- vmlal.s16 q1, d7, d11
|
||||
|
|
@ -74,23 +77,23 @@ index d83d21d..914abfb 100644
|
|||
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||
+ vmlal.s16 q1, d19, d23
|
||||
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||
|
||||
|
||||
- vmlal.s16 q0, d4, d8
|
||||
- vmlal.s16 q1, d5, d9
|
||||
+ vmlal.s16 q0, d16, d20
|
||||
+ vmlal.s16 q1, d17, d21
|
||||
|
||||
|
||||
vpadd.s32 d0, d0, d1
|
||||
vpadd.s32 d1, d2, d3
|
||||
|
||||
|
||||
vrshrn.s32 d0, q0, SBC_PROTO_FIXED_SCALE
|
||||
|
||||
|
||||
- vld1.16 {d2, d3, d4, d5}, [r2, :128]!
|
||||
+ vld1.16 {d16, d17, d18, d19}, [r2, :128]!
|
||||
|
||||
|
||||
vdup.i32 d1, d0[1] /* TODO: can be eliminated */
|
||||
vdup.i32 d0, d0[0] /* TODO: can be eliminated */
|
||||
|
||||
|
||||
- vmull.s16 q3, d2, d0
|
||||
- vmull.s16 q4, d3, d0
|
||||
- vmlal.s16 q3, d4, d1
|
||||
|
|
@ -99,14 +102,14 @@ index d83d21d..914abfb 100644
|
|||
+ vmull.s16 q11, d17, d0
|
||||
+ vmlal.s16 q10, d18, d1
|
||||
+ vmlal.s16 q11, d19, d1
|
||||
|
||||
|
||||
- vpadd.s32 d0, d6, d7 /* TODO: can be eliminated */
|
||||
- vpadd.s32 d1, d8, d9 /* TODO: can be eliminated */
|
||||
+ vpadd.s32 d0, d20, d21 /* TODO: can be eliminated */
|
||||
+ vpadd.s32 d1, d22, d23 /* TODO: can be eliminated */
|
||||
|
||||
|
||||
vst1.32 {d0, d1}, [r1, :128]
|
||||
|
||||
|
||||
@@ -91,57 +91,57 @@ function ff_sbc_analyze_8_neon, export=1
|
||||
/* TODO: merge even and odd cases (or even merge all four calls to this
|
||||
* function) in order to have only aligned reads from 'in' array
|
||||
|
|
@ -213,13 +216,13 @@ index d83d21d..914abfb 100644
|
|||
+ vpadd.s32 d1, d26, d27
|
||||
+ vpadd.s32 d2, d28, d29
|
||||
+ vpadd.s32 d3, d30, d31
|
||||
|
||||
|
||||
vrshr.s32 q0, q0, SBC_PROTO_FIXED_SCALE
|
||||
vrshr.s32 q1, q1, SBC_PROTO_FIXED_SCALE
|
||||
@@ -153,38 +153,38 @@ function ff_sbc_analyze_8_neon, export=1
|
||||
vdup.i32 d1, d0[1] /* TODO: can be eliminated */
|
||||
vdup.i32 d0, d0[0] /* TODO: can be eliminated */
|
||||
|
||||
|
||||
- vld1.16 {d4, d5}, [r2, :128]!
|
||||
- vmull.s16 q6, d4, d0
|
||||
- vld1.16 {d6, d7}, [r2, :128]!
|
||||
|
|
@ -284,5 +287,6 @@ index d83d21d..914abfb 100644
|
|||
+ vpadd.s32 d1, d26, d27 /* TODO: can be eliminated */
|
||||
+ vpadd.s32 d2, d28, d29 /* TODO: can be eliminated */
|
||||
+ vpadd.s32 d3, d30, d31 /* TODO: can be eliminated */
|
||||
|
||||
|
||||
vst1.32 {d0, d1, d2, d3}, [r1, :128]
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,10 @@ From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
|||
Date: Tue, 19 Jan 2021 20:35:29 +0100
|
||||
Subject: Fix build on powerpc and ppc64
|
||||
|
||||
Upstream-status: Pending
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
---
|
||||
libswscale/ppc/yuv2rgb_altivec.c | 10 ++++++++++
|
||||
|
|
@ -15,7 +18,7 @@ index 5365452..930ef6b 100644
|
|||
@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
|
||||
* ------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
+#if !HAVE_VSX
|
||||
+static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
|
||||
+{
|
||||
|
|
|
|||
|
|
@ -2,13 +2,15 @@ From: Paul B Mahol <onemda@gmail.com>
|
|||
Date: Sun, 14 Feb 2021 17:20:03 +0100
|
||||
Subject: avcodec/pngenc: remove monowhite from apng formats
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
Monowhite pixel format is not supported, and it does not make sense
|
||||
to add support for it.
|
||||
|
||||
Fixes #7989
|
||||
|
||||
Upstream-status: Pending
|
||||
|
||||
---
|
||||
libavcodec/pngenc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,8 +1,11 @@
|
|||
Upstream-status: Pending
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6467,11 +6467,9 @@ enabled mbedtls && { check_pkg
|
||||
@@ -6471,11 +6471,9 @@ enabled mbedtls && { check_pkg
|
||||
die "ERROR: mbedTLS not found"; }
|
||||
enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
|
||||
( enabled rpi ||
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
From 01e738a8f1414acd0102e432bbc15b4e603fd956 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Davis Jr <vince@underview.tech>
|
||||
Date: Thu, 8 Dec 2022 10:34:20 -0600
|
||||
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 2.0.1
|
||||
|
||||
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
||||
---
|
||||
configure | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 723b81f1..0c7f2654 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5746,6 +5746,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;
|
||||
@@ -6471,8 +6474,7 @@ enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
|
||||
die "ERROR: mbedTLS not found"; }
|
||||
enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
|
||||
( enabled rpi ||
|
||||
- enabled mmal ) && { { 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/ &&
|
||||
+ enabled mmal ) && { { add_cflags -I${sysroot}/usr/include/interface/vmcs_host/linux -I${sysroot}/usr/include/interface/vcos/pthreads -fgnu89-inline &&
|
||||
check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcsm -lvchostif -lvchiq_arm -lvcos; } ||
|
||||
die "ERROR: mmal not found" &&
|
||||
check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
|
||||
@@ -6492,15 +6494,15 @@ 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 omx_rpi && { test_code cc IL/OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
|
||||
{ ! enabled cross_compile &&
|
||||
- add_cflags -isystem/opt/vc/include/IL &&
|
||||
- test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame; } ||
|
||||
+ 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
|
||||
+enabled omx && require_headers IL/OMX_Core.h
|
||||
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
|
||||
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
|
||||
check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
|
||||
@@ -6540,7 +6542,7 @@ fi
|
||||
|
||||
if enabled sdl2; then
|
||||
SDL2_CONFIG="${cross_prefix}sdl2-config"
|
||||
- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.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.38.1
|
||||
|
||||
|
|
@ -0,0 +1,111 @@
|
|||
From be426ad76c3e486f1364dd292cf8e1c633c80e91 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Davis Jr <vince@underview.tech>
|
||||
Date: Thu, 8 Dec 2022 10:39:47 -0600
|
||||
Subject: [PATCH] libavdevice: opengl_enc.c update dynamic function loader
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
For meta-raspberrypi ffmpeg builds, when opengl
|
||||
is enabled do_compile will fail. Reasion is that
|
||||
glGetProcAddress is undefined in either GLES2/gl2.h
|
||||
or GLES2/gl2ext.h.
|
||||
|
||||
define SelectedGetProcAddress to SDL_GL_GetProcAddress
|
||||
if sdl2 is included. If not included, define function
|
||||
pointers at compile time versus runtime.
|
||||
|
||||
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
||||
---
|
||||
libavdevice/opengl_enc.c | 44 ++++++++++++++++++++++++++++++++++++----
|
||||
1 file changed, 40 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
|
||||
index 2bdb8da7..eabc1bf8 100644
|
||||
--- a/libavdevice/opengl_enc.c
|
||||
+++ b/libavdevice/opengl_enc.c
|
||||
@@ -37,12 +37,13 @@
|
||||
#include <OpenGL/gl3.h>
|
||||
#elif HAVE_ES2_GL_H
|
||||
#include <ES2/gl.h>
|
||||
-#else
|
||||
-#include <GL/gl.h>
|
||||
-#include <GL/glext.h>
|
||||
#endif
|
||||
#if HAVE_GLXGETPROCADDRESS
|
||||
#include <GL/glx.h>
|
||||
+#else
|
||||
+#define GL_GLEXT_PROTOTYPES
|
||||
+#include <GLES2/gl2.h>
|
||||
+#include <GLES2/gl2ext.h>
|
||||
#endif
|
||||
|
||||
#if CONFIG_SDL2
|
||||
@@ -493,8 +494,14 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
|
||||
|
||||
#if HAVE_GLXGETPROCADDRESS
|
||||
#define SelectedGetProcAddress glXGetProcAddress
|
||||
+#define CAN_DYNAMIC_LOAD 1
|
||||
#elif HAVE_WGLGETPROCADDRESS
|
||||
#define SelectedGetProcAddress wglGetProcAddress
|
||||
+#elif CONFIG_SDL2
|
||||
+#define SelectedGetProcAddress SDL_GL_GetProcAddress
|
||||
+#define CAN_DYNAMIC_LOAD 1
|
||||
+#else
|
||||
+#define CAN_DYNAMIC_LOAD 0
|
||||
#endif
|
||||
|
||||
#define LOAD_OPENGL_FUN(name, type) \
|
||||
@@ -504,7 +511,8 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
|
||||
return AVERROR(ENOSYS); \
|
||||
}
|
||||
|
||||
-#if CONFIG_SDL2
|
||||
+#if CAN_DYNAMIC_LOAD
|
||||
+#if CONFIG_SDL2
|
||||
if (!opengl->no_window)
|
||||
return opengl_sdl_load_procedures(opengl);
|
||||
#endif
|
||||
@@ -534,9 +542,37 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
|
||||
LOAD_OPENGL_FUN(glGetShaderInfoLog, FF_PFNGLGETSHADERINFOLOGPROC)
|
||||
LOAD_OPENGL_FUN(glEnableVertexAttribArray, FF_PFNGLENABLEVERTEXATTRIBARRAYPROC)
|
||||
LOAD_OPENGL_FUN(glVertexAttribPointer, FF_PFNGLVERTEXATTRIBPOINTERPROC)
|
||||
+#else
|
||||
+ procs->glActiveTexture = glActiveTexture;
|
||||
+ procs->glGenBuffers = glGenBuffers;
|
||||
+ procs->glDeleteBuffers = glDeleteBuffers;
|
||||
+ procs->glBufferData = glBufferData;
|
||||
+ procs->glBindBuffer = glBindBuffer;
|
||||
+ procs->glGetAttribLocation = glGetAttribLocation;
|
||||
+ procs->glGetUniformLocation = glGetUniformLocation;
|
||||
+ procs->glUniform1f = glUniform1f;
|
||||
+ procs->glUniform1i = glUniform1i;
|
||||
+ procs->glUniformMatrix4fv = glUniformMatrix4fv;
|
||||
+ procs->glCreateProgram = glCreateProgram;
|
||||
+ procs->glDeleteProgram = glDeleteProgram;
|
||||
+ procs->glUseProgram = glUseProgram;
|
||||
+ procs->glLinkProgram = glLinkProgram;
|
||||
+ procs->glGetProgramiv = glGetProgramiv;
|
||||
+ procs->glGetProgramInfoLog = glGetProgramInfoLog;
|
||||
+ procs->glAttachShader = glAttachShader;
|
||||
+ procs->glCreateShader = glCreateShader;
|
||||
+ procs->glDeleteShader = glDeleteShader;
|
||||
+ procs->glCompileShader = glCompileShader;
|
||||
+ procs->glShaderSource = glShaderSource;
|
||||
+ procs->glGetShaderiv = glGetShaderiv;
|
||||
+ procs->glGetShaderInfoLog = glGetShaderInfoLog;
|
||||
+ procs->glEnableVertexAttribArray = glEnableVertexAttribArray;
|
||||
+ procs->glVertexAttribPointer = (FF_PFNGLVERTEXATTRIBPOINTERPROC) glVertexAttribPointer;
|
||||
+#endif
|
||||
|
||||
return 0;
|
||||
|
||||
+#undef CAN_DYNAMIC_LOAD
|
||||
#undef SelectedGetProcAddress
|
||||
#undef LOAD_OPENGL_FUN
|
||||
}
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From 62c2f041890a6e20770350721a0a2138d0b38634 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Davis Jr <vince@underview.tech>
|
||||
Date: Sat, 3 Dec 2022 23:35:51 -0600
|
||||
Subject: [PATCH] libavcodec: fix v4l2_req_devscan.h
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
Fixes minor differences between v4l2_req_devscan.c
|
||||
and v4l2_req_devscan.h after all patches have been
|
||||
applied.
|
||||
|
||||
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
||||
---
|
||||
libavcodec/v4l2_req_devscan.h | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libavcodec/v4l2_req_devscan.h b/libavcodec/v4l2_req_devscan.h
|
||||
index 0baef365..cd9c49ac 100644
|
||||
--- a/libavcodec/v4l2_req_devscan.h
|
||||
+++ b/libavcodec/v4l2_req_devscan.h
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef _DEVSCAN_H_
|
||||
#define _DEVSCAN_H_
|
||||
|
||||
+#include <stdint.h>
|
||||
+
|
||||
struct devscan;
|
||||
struct decdev;
|
||||
enum v4l2_buf_type;
|
||||
@@ -13,7 +15,8 @@ const char *decdev_video_path(const struct decdev *const dev);
|
||||
enum v4l2_buf_type decdev_src_type(const struct decdev *const dev);
|
||||
uint32_t decdev_src_pixelformat(const struct decdev *const dev);
|
||||
|
||||
-const struct decdev *devscan_find(struct devscan *const scan, const uint32_t src_fmt_v4l2);
|
||||
+const struct decdev *devscan_find(struct devscan *const scan,
|
||||
+ const uint32_t src_fmt_v4l2);
|
||||
|
||||
int devscan_build(void * const dc, struct devscan **pscan);
|
||||
void devscan_delete(struct devscan **const pScan);
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From 0dfb56e12fa709794525cda1471091f6699905d5 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Davis Jr <vince@underview.tech>
|
||||
Date: Thu, 8 Dec 2022 10:49:03 -0600
|
||||
Subject: [PATCH] libavcodec: omx replace /opt/vc path with /usr/lib
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
||||
raspiberry pi support.
|
||||
|
||||
Configures omx.c for OE usages as libbcm_host.so
|
||||
and libopenmaxil.so are located in a different
|
||||
location.
|
||||
|
||||
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
||||
---
|
||||
libavcodec/omx.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
|
||||
index 0a6a3083..8c6e9193 100644
|
||||
--- a/libavcodec/omx.c
|
||||
+++ b/libavcodec/omx.c
|
||||
@@ -141,7 +141,7 @@ static av_cold OMXContext *omx_init(void *logctx, const char *libname, const cha
|
||||
{
|
||||
static const char * const libnames[] = {
|
||||
#if CONFIG_OMX_RPI
|
||||
- "/opt/vc/lib/libopenmaxil.so", "/opt/vc/lib/libbcm_host.so",
|
||||
+ "/usr/lib/libopenmaxil.so", "/usr/lib/libbcm_host.so",
|
||||
#else
|
||||
"libOMX_Core.so", NULL,
|
||||
"libOmxCore.so", NULL,
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -33,23 +33,27 @@ RPROVIDES:${PN} = "${PROVIDES}"
|
|||
DEPENDS = "nasm-native"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
|
||||
opengl udev sdl2 ffplay alsa bzlib lzma pic pthreads shared theora zlib \
|
||||
libvorbis x264 gpl sand rpi vout-drm vout-egl \
|
||||
${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal', d)} \
|
||||
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample ffplay \
|
||||
v4l2 drm udev alsa bzlib lzma pic pthreads shared theora zlib libvorbis x264 gpl \
|
||||
${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal rpi sand vout-drm', d)} \
|
||||
${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb vout-egl epoxy', '', d)}"
|
||||
|
||||
SRC_URI = "\
|
||||
git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bullseye \
|
||||
file://0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch \
|
||||
file://0002-Fix-build-on-powerpc-and-ppc64.patch \
|
||||
file://0003-avcodec-pngenc-remove-monowhite-from-apng-formats.patch \
|
||||
file://0004-ffmpeg-4.3.2-rpi_10.patch \
|
||||
file://0005-fix_flags.diff \
|
||||
"
|
||||
file://0004-ffmpeg-4.3.4-rpi_14.patch \
|
||||
file://0005-fix-flags.diff \
|
||||
file://2001-configure-setup-for-OE-core-usage.patch \
|
||||
file://2002-libavdevice-opengl_enc-update-dynamic-function-loader.patch \
|
||||
file://2003-libavcodec-fix-v4l2_req_devscan.patch \
|
||||
file://2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch \
|
||||
"
|
||||
|
||||
SRCREV = "ea72093f350f38edcd39c480b331c3219c377642"
|
||||
SRCREV = "246e1a55a0eca931537d8706acd8b133c07beb05"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -70,7 +74,7 @@ PACKAGECONFIG[altivec] = "--enable-altivec,--disable-altivec,"
|
|||
PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2"
|
||||
PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac"
|
||||
PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
|
||||
PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl"
|
||||
PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgles2"
|
||||
PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
|
||||
PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
|
||||
PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
|
||||
|
|
@ -90,9 +94,11 @@ PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
|
|||
PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb"
|
||||
PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
|
||||
PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
|
||||
#PACKAGECONFIG[snappy] = "--enable-libsnappy,--enable-libsnappy,snappy"
|
||||
PACKAGECONFIG[snappy] = "--enable-libsnappy,--disable-libsnappy,snappy"
|
||||
PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev"
|
||||
PACKAGECONFIG[v4l2] = "--enable-libv4l2 --enable-v4l2-request --enable-libdrm,,v4l-utils"
|
||||
PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm"
|
||||
PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy"
|
||||
PACKAGECONFIG[v4l2] = "--enable-libv4l2 --enable-v4l2-m2m --enable-v4l2-request,,v4l-utils"
|
||||
PACKAGECONFIG[mmal] = "--enable-omx --enable-omx-rpi --enable-mmal,,userland"
|
||||
PACKAGECONFIG[sand] = "--enable-sand,,"
|
||||
PACKAGECONFIG[rpi] = "--enable-rpi,,"
|
||||
|
|
@ -138,11 +144,6 @@ EXTRA_OECONF = " \
|
|||
"
|
||||
EXTRA_OECONF:append:linux-gnux32 = " --disable-asm"
|
||||
|
||||
# Directly specify the include directories the contain headers for
|
||||
# libdrm
|
||||
# openmaxil
|
||||
TARGET_CFLAGS:append = " -I${STAGING_INCDIR}/IL -I${STAGING_INCDIR}/drm"
|
||||
|
||||
# gold crashes on x86, another solution is to --disable-asm but thats more hacky
|
||||
# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
|
||||
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
Loading…
Reference in New Issue
Block a user