mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-05 05:04:45 +02:00
1f33240549
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>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
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: Inappropriate
|
|
|
|
RPI-Distro repo clones original ffmpeg and applies patches to enable
|
|
raspiberry pi support.
|
|
|
|
---
|
|
libswscale/ppc/yuv2rgb_altivec.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
|
|
index 5365452..930ef6b 100644
|
|
--- a/libswscale/ppc/yuv2rgb_altivec.c
|
|
+++ b/libswscale/ppc/yuv2rgb_altivec.c
|
|
@@ -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)
|
|
+{
|
|
+ const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
|
|
+ vector unsigned char align_perm = vec_lvsl(offset, addr);
|
|
+
|
|
+ return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
|
|
+}
|
|
+#endif /* !HAVE_VSX */
|
|
+
|
|
#define DEFCSP420_CVT(name, out_pixels) \
|
|
static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
|
|
int *instrides, int srcSliceY, int srcSliceH, \
|