diff options
author | leimaohui <leimaohui@fujitsu.com> | 2025-04-02 18:33:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-02 21:28:12 +0100 |
commit | ba799ad6675fd99ec314481dd463dee25452af06 (patch) | |
tree | 098677c81e6a5e32b332446a31576ede29128f88 | |
parent | 15b7ec56e92722eac5aecfb0a5a76b0684b3672b (diff) | |
download | poky-ba799ad6675fd99ec314481dd463dee25452af06.tar.gz |
gstreamer1.0-plugins-base: upgrade 1.24.12 -> 1.26.0
- add backport patch to fix undefined reference to `__atomic_fetch_add_8' issue
This patch is part of upstream commit
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8637/commits?commit_id=f2b5c0b6020b50f5173e449b45a6f7a7be31c48f
(From OE-Core rev: cb35a29d41a219c386e9ba2b5e6e24ed98792885)
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer1.0-plugins-base-Fix-atomic-64-issue-on-arm.patch | 52 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.12.bb) | 3 |
5 files changed, 58 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch index e35ec026e4..7373bd3e26 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e0478a9b3bb1b49c34aaf076152ed8e49cf909e0 Mon Sep 17 00:00:00 2001 | 1 | From bd1436f0027bb09cdcf90386910a497422d9a871 Mon Sep 17 00:00:00 2001 |
2 | From: zhouming <b42586@freescale.com> | 2 | From: zhouming <b42586@freescale.com> |
3 | Date: Wed, 14 May 2014 10:16:20 +0800 | 3 | Date: Wed, 14 May 2014 10:16:20 +0800 |
4 | Subject: [PATCH] ENGR00312515: get caps from src pad when query caps | 4 | Subject: [PATCH] ENGR00312515: get caps from src pad when query caps |
@@ -16,7 +16,7 @@ Signed-off-by: zhouming <b42586@freescale.com> | |||
16 | diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c | 16 | diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c |
17 | old mode 100644 | 17 | old mode 100644 |
18 | new mode 100755 | 18 | new mode 100755 |
19 | index ef0ff90..53f05c8 | 19 | index 975fe83..df82840 |
20 | --- a/gst-libs/gst/tag/gsttagdemux.c | 20 | --- a/gst-libs/gst/tag/gsttagdemux.c |
21 | +++ b/gst-libs/gst/tag/gsttagdemux.c | 21 | +++ b/gst-libs/gst/tag/gsttagdemux.c |
22 | @@ -1796,6 +1796,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) | 22 | @@ -1796,6 +1796,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer1.0-plugins-base-Fix-atomic-64-issue-on-arm.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer1.0-plugins-base-Fix-atomic-64-issue-on-arm.patch new file mode 100644 index 0000000000..437409854f --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer1.0-plugins-base-Fix-atomic-64-issue-on-arm.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 677a40c1f5b0793598a92cbba0a621fef89c4a26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Wed, 2 Apr 2025 09:37:24 +0000 | ||
4 | Subject: [PATCH] gstreamer1.0-plugins-base: Fix atomic 64 issue on armv5 | ||
5 | |||
6 | | /mnt/test/build_auh/tmp/work/armv5e-poky-linux-gnueabi/gstreamer1.0-plugins-base/1.26.0/recipe-sysroot-native/usr/bin/arm-poky-linux-gnueabi/../../libexec/arm-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/14.2.0/ld: gst-libs/gst/audio/libgstaudio-1.0.so.0.2600.0.p/gstaudioringbuffer.c.o: in function `gst_atomic_uint64_get': | ||
7 | | /usr/src/debug/gstreamer1.0-plugins-base/1.26.0/gst-libs/gst/audio/gstaudioringbuffer.c:72:(.text+0x4e00): undefined reference to `__atomic_load_8' | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8637/commits?commit_id=f2b5c0b6020b50f5173e449b45a6f7a7be31c48f] | ||
10 | |||
11 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
12 | --- | ||
13 | gst-libs/gst/audio/meson.build | 2 +- | ||
14 | meson.build | 9 +++++++++ | ||
15 | 2 files changed, 10 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build | ||
18 | index 1d69713..cf8935b 100644 | ||
19 | --- a/gst-libs/gst/audio/meson.build | ||
20 | +++ b/gst-libs/gst/audio/meson.build | ||
21 | @@ -162,7 +162,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version), | ||
22 | soversion : soversion, | ||
23 | darwin_versions : osxversion, | ||
24 | install : true, | ||
25 | - dependencies : gstaudio_deps, | ||
26 | + dependencies : [ gstaudio_deps, base_platform_dep ], | ||
27 | ) | ||
28 | pkg_name = 'gstreamer-audio-1.0' | ||
29 | pkgconfig.generate(gstaudio, | ||
30 | diff --git a/meson.build b/meson.build | ||
31 | index a470af0..c195376 100644 | ||
32 | --- a/meson.build | ||
33 | +++ b/meson.build | ||
34 | @@ -398,6 +398,15 @@ else | ||
35 | core_conf.set('DISABLE_ORC', 1) | ||
36 | endif | ||
37 | |||
38 | +base_platform_dep = [] | ||
39 | +# Check for libatomic for use of C11 atomics: some architectures need | ||
40 | +# to link explicitly to this library. | ||
41 | +# TODO: Once meson 1.7 is in use, this can be updated to | ||
42 | +# dependency('atomic') | ||
43 | +atomic_dep = cc.find_library('atomic', required: false) | ||
44 | + | ||
45 | +base_platform_dep += [atomic_dep] | ||
46 | + | ||
47 | # Used to build SSE* things in audio-resampler | ||
48 | sse_args = '-msse' | ||
49 | sse2_args = '-msse2' | ||
50 | -- | ||
51 | 2.43.0 | ||
52 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch index 810a4ba676..fc9ad474d9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1b9887421de593854632571327b4918b880900c6 Mon Sep 17 00:00:00 2001 | 1 | From 1cc876662b7707eb5a2f668654f7921b5642e108 Mon Sep 17 00:00:00 2001 |
2 | From: Mingke Wang <mingke.wang@freescale.com> | 2 | From: Mingke Wang <mingke.wang@freescale.com> |
3 | Date: Thu, 19 Mar 2015 14:17:10 +0800 | 3 | Date: Thu, 19 Mar 2015 14:17:10 +0800 |
4 | Subject: [PATCH] ssaparse: enhance SSA text lines parsing. | 4 | Subject: [PATCH] ssaparse: enhance SSA text lines parsing. |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch index 8fa46d809a..06b5bc41ed 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 22a0e3a5288486991a15c48fdcb730eaa6dc08e5 Mon Sep 17 00:00:00 2001 | 1 | From c0c6944eca0c497477aa9f2cec2c83c4ea7a70e5 Mon Sep 17 00:00:00 2001 |
2 | From: Carlos Rafael Giani <crg7475@mailbox.org> | 2 | From: Carlos Rafael Giani <crg7475@mailbox.org> |
3 | Date: Tue, 21 May 2019 14:01:11 +0200 | 3 | Date: Tue, 21 May 2019 14:01:11 +0200 |
4 | Subject: [PATCH] viv-fb: Make sure config.h is included | 4 | Subject: [PATCH] viv-fb: Make sure config.h is included |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.12.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.bb index f4505d831e..afb02f6042 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.12.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.bb | |||
@@ -10,8 +10,9 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba | |||
10 | file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ | 10 | file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ |
11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ | 12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ |
13 | file://0001-gstreamer1.0-plugins-base-Fix-atomic-64-issue-on-arm.patch \ | ||
13 | " | 14 | " |
14 | SRC_URI[sha256sum] = "f6efbaa8fea8d00bc380bccca76a530527b1f083e8523eafb3e9b1e18bc653d3" | 15 | SRC_URI[sha256sum] = "e23189fbed2ec486690382d1055c19eeaf5aae3e95e2576fc4c884d96a90e69e" |
15 | 16 | ||
16 | S = "${WORKDIR}/gst-plugins-base-${PV}" | 17 | S = "${WORKDIR}/gst-plugins-base-${PV}" |
17 | 18 | ||