mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
gstreamer: upgrade 1.24.4 -> 1.24.5
0001-uvcgadget-Use-g_path_get_basename-instead-of-libc-ba.patch 0002-tests-add-support-for-install-the-tests.patch refreshed for 1.24.5 Changelog: https://gstreamer.freedesktop.org/releases/1.24 (From OE-Core rev: ff2a4c61df810cfb8c3378e83ae19fc3fc642bfb) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3516ceb189
commit
9ebc31e361
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
|
||||
file://0001-connect-has-a-different-signature-on-musl.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "8bff1b388522e03d761786e61fe9aff1f9867b8f7cc230043cbb2622dcf6f0fe"
|
||||
SRC_URI[sha256sum] = "a96675898129a480d05bbf91071ec4e40154dcad6d62f3944154a6cb326045a4"
|
||||
|
||||
DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
|
||||
RRECOMMENDS:${PN} = "git"
|
||||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
|
||||
"
|
||||
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "4d3803f36008e847fc4842c8dd366162baf8359526cc46c1851bf68bb638da73"
|
||||
SRC_URI[sha256sum] = "7fd16bdfa56ed51c40b474648fc35c4edde3e8ac934b12b82b49727b5d703521"
|
||||
|
||||
S = "${WORKDIR}/gst-libav-${PV}"
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
From 7c558e8ef9375aea953d1e7c854b25947c967f76 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jun 2024 23:09:54 -0700
|
||||
Subject: [PATCH] uvcgadget: Use g_path_get_basename instead of libc basename
|
||||
|
||||
Musl does not implement GNU basename and have fixed a bug where the
|
||||
prototype was leaked into string.h [1], which resullts in compile errors
|
||||
with GCC-14 and Clang-17+
|
||||
|
||||
| sys/uvcgadget/configfs.c:262:21: error: call to undeclared function 'basename'
|
||||
ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
| 262 | const char *v = basename (globbuf.gl_pathv[i]);
|
||||
| | ^
|
||||
|
||||
Use glib function instead makes it portable across musl and glibc on
|
||||
linux
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7a
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/7006]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
.../gst-plugins-bad/sys/uvcgadget/configfs.c | 18 ++++++++++++------
|
||||
1 file changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/sys/uvcgadget/configfs.c
|
||||
+++ b/sys/uvcgadget/configfs.c
|
||||
@@ -7,7 +7,7 @@
|
||||
* Contact: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
||||
*/
|
||||
|
||||
-/* To provide basename and asprintf from the GNU library. */
|
||||
+/* To provide asprintf from the GNU library. */
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include <dirent.h>
|
||||
@@ -259,9 +259,10 @@ udc_find_video_device (const char *udc,
|
||||
}
|
||||
|
||||
if (i < globbuf.gl_pathc) {
|
||||
- const char *v = basename (globbuf.gl_pathv[i]);
|
||||
+ gchar *v = g_path_get_basename (globbuf.gl_pathv[i]);
|
||||
|
||||
video = path_join ("/dev", v);
|
||||
+ g_free (v);
|
||||
}
|
||||
|
||||
globfree (&globbuf);
|
||||
@@ -894,6 +895,7 @@ configfs_parse_uvc_function (const char
|
||||
{
|
||||
struct uvc_function_config *fc;
|
||||
char *fpath;
|
||||
+ gchar *bname;
|
||||
int ret = 0;
|
||||
|
||||
fc = malloc (sizeof *fc);
|
||||
@@ -923,11 +925,10 @@ configfs_parse_uvc_function (const char
|
||||
* Parse the function configuration. Remove the gadget name qualifier
|
||||
* from the function name, if any.
|
||||
*/
|
||||
- if (function)
|
||||
- function = basename (function);
|
||||
+ bname = g_path_get_basename (function);
|
||||
|
||||
fc->udc = attribute_read_str (fpath, "../../UDC");
|
||||
- fc->video = udc_find_video_device (fc->udc, function);
|
||||
+ fc->video = udc_find_video_device (fc->udc, bname);
|
||||
if (!fc->video) {
|
||||
ret = -ENODEV;
|
||||
goto done;
|
||||
@@ -942,6 +943,7 @@ done:
|
||||
}
|
||||
|
||||
free (fpath);
|
||||
+ g_free (bname);
|
||||
|
||||
return fc;
|
||||
}
|
||||
@@ -979,12 +981,16 @@ configfs_parse_uvc_videodev (int fd, con
|
||||
char *function = NULL;
|
||||
char rpath[PATH_MAX];
|
||||
char *res;
|
||||
+ gchar *bname;
|
||||
|
||||
res = realpath (video, rpath);
|
||||
if (!res)
|
||||
return NULL;
|
||||
|
||||
- function = video_find_config_name (basename (rpath));
|
||||
+ bname = g_path_get_basename (rpath);
|
||||
+ function = video_find_config_name (bname);
|
||||
+ g_free (bname);
|
||||
+
|
||||
if (!function)
|
||||
return NULL;
|
||||
|
||||
@@ -9,9 +9,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
|
||||
file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
|
||||
file://0002-avoid-including-sys-poll.h-directly.patch \
|
||||
file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
|
||||
file://0001-uvcgadget-Use-g_path_get_basename-instead-of-libc-ba.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3"
|
||||
SRC_URI[sha256sum] = "3029bfd7265314d609dc8eab503675a344ea46e8274fd73ab34566c8442dc847"
|
||||
|
||||
S = "${WORKDIR}/gst-plugins-bad-${PV}"
|
||||
|
||||
@@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
|
||||
file://0003-viv-fb-Make-sure-config.h-is-included.patch \
|
||||
file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "09f4ddf246eeb819da1494ce336316edbbcb28fdff3ee2f9804891e84df39b2a"
|
||||
SRC_URI[sha256sum] = "0e33ec9b59eef5ef3a6a53bbd55c44340e681d0000910caca12541a73db38a7d"
|
||||
|
||||
S = "${WORKDIR}/gst-plugins-base-${PV}"
|
||||
|
||||
@@ -6,7 +6,7 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues
|
||||
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz"
|
||||
|
||||
SRC_URI[sha256sum] = "023096d661cf58cde3e0dcdbf56897bf588830232358c305f3e15fd63e116626"
|
||||
SRC_URI[sha256sum] = "badcfc5292b035bde99a77327d468b2f0b116b40420bc9f25fb8e3970824ba75"
|
||||
|
||||
S = "${WORKDIR}/gst-plugins-good-${PV}"
|
||||
|
||||
@@ -15,7 +15,7 @@ SRC_URI = " \
|
||||
https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "4604f8709c0bc4d6960ef6ae6fd91e0b20af011bfe22e103f5b85377cf3f1ef4"
|
||||
SRC_URI[sha256sum] = "333267b6e00770440a4a00402910dd59ed8fd619eaebf402815fbe111da7776d"
|
||||
|
||||
S = "${WORKDIR}/gst-plugins-ugly-${PV}"
|
||||
|
||||
@@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
|
||||
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "5510358316eb5c965829a393714b4d88306033cd64db3eae8cc62b41ae80a392"
|
||||
SRC_URI[sha256sum] = "c23570c144e6276efd9e82de2ac0cea46b168a57fb2e436bed96cb285d641bf6"
|
||||
|
||||
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
|
||||
RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
|
||||
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server"
|
||||
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
|
||||
|
||||
SRC_URI[sha256sum] = "eeca811cef6312fa21433294ae216b3c6fa0a389d8980727102516bdcf973eae"
|
||||
SRC_URI[sha256sum] = "a3062665e41814d3dba3e02b7b06b77326d54d2b6f178ffcb196af9b91a1bfb9"
|
||||
|
||||
S = "${WORKDIR}/${PNREAL}-${PV}"
|
||||
|
||||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
|
||||
|
||||
SRC_URI[sha256sum] = "2dfb322e37370b6671b62ff60dc1da81f87dac5a17c1c7ef15a783d2355900b8"
|
||||
SRC_URI[sha256sum] = "fdb2da26b23895c56b20c6bad9edcf0faec3a3887765bc62c88f0955ed5b7c72"
|
||||
|
||||
S = "${WORKDIR}/${REALPN}-${PV}"
|
||||
DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
|
||||
@@ -1,4 +1,4 @@
|
||||
From 31dea17a1d5de0003719a875a1089df43a50219a Mon Sep 17 00:00:00 2001
|
||||
From 19b1768acde5b30def36f0d1ac2725b265151d13 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sun, 11 Apr 2021 19:48:13 +0100
|
||||
Subject: [PATCH] tests: add support for install the tests
|
||||
@@ -19,10 +19,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
create mode 100644 tests/check/template.test.in
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index efcf189..c97d9a8 100644
|
||||
index 0809b4c..ffb61c4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -624,6 +624,10 @@ if bashcomp_dep.found()
|
||||
@@ -645,6 +645,10 @@ if bashcomp_dep.found()
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -46,7 +46,7 @@ index 340fb58..5b87f68 100644
|
||||
# Feature options
|
||||
option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
|
||||
diff --git a/tests/check/meson.build b/tests/check/meson.build
|
||||
index e9501fe..08f8fd8 100644
|
||||
index bf0021f..9a8c42c 100644
|
||||
--- a/tests/check/meson.build
|
||||
+++ b/tests/check/meson.build
|
||||
@@ -125,10 +125,16 @@ test_defines = [
|
||||
|
||||
@@ -22,7 +22,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
|
||||
file://0003-tests-use-a-dictionaries-for-environment.patch \
|
||||
file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "52c93bc48e03533aa676fd8c15eb6b5fc326c68db311c50bcc0a865f31a6c653"
|
||||
SRC_URI[sha256sum] = "2bdef209252bf146351843134b797db6b6e7adb4c00d82e83bd5abe608253a7b"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
|
||||
check \
|
||||
Reference in New Issue
Block a user