Merge branch 'master' into upgrade_vlc

Author: gizahNL

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

@@ -1,4 +1,4 @@
-From 702742f9575c87ac8c496d76daf51af7d4aaebd7 Mon Sep 17 00:00:00 2001
+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
@@ -25,10 +25,10 @@ Signed-off-by: Vincent Davis Jr <vince@underview.tech>
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/configure b/configure
-index 7214c221..7a541e63 100755
+index e4b48ee1..664b31fb 100755
 --- a/configure
 +++ b/configure
-@@ -5898,6 +5898,9 @@ enable_weak_pic() {
+@@ -6178,6 +6178,9 @@ enable_weak_pic() {
  }
 
  enabled pic && enable_weak_pic
@@ -38,7 +38,7 @@ index 7214c221..7a541e63 100755
 
  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
+@@ -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 &&
@@ -49,11 +49,11 @@ index 7214c221..7a541e63 100755
                                   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
+@@ -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 "-Wl,-framework,OpenGL" ||
-                                check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
-+			       check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
+                                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 ||
@@ -65,7 +65,7 @@ index 7214c221..7a541e63 100755
                                 die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
                               enable omx
  enabled omx               && require_headers OMX_Core.h
-@@ -6788,7 +6792,7 @@ fi
+@@ -7190,7 +7194,7 @@ fi
 
  if enabled sdl2; then
      SDL2_CONFIG="${cross_prefix}sdl2-config"
@@ -74,6 +74,3 @@ index 7214c221..7a541e63 100755
      if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
          sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
          sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
--- 
-2.34.1
-

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

@@ -1,4 +1,4 @@
-From 0dfb56e12fa709794525cda1471091f6699905d5 Mon Sep 17 00:00:00 2001
+From 53f736cdb4d85633286287594675e5f3c7fa8df9 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
@@ -18,10 +18,10 @@ Signed-off-by: Vincent Davis Jr <vince@underview.tech>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libavcodec/omx.c b/libavcodec/omx.c
-index 0a6a3083..8c6e9193 100644
+index 2c386550..f0e75216 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
+@@ -143,7 +143,7 @@ static av_cold OMXContext *omx_init(void *logctx, const char *libname, const cha
  {
      static const char * const libnames[] = {
  #if CONFIG_OMX_RPI
@@ -30,6 +30,3 @@ index 0a6a3083..8c6e9193 100644
  #else
          "libOMX_Core.so", NULL,
          "libOmxCore.so", NULL,
--- 
-2.38.1
-