diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2025-05-09 11:56:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-12 22:01:56 +0100 |
commit | 2a757944ba64b4e634cfba0714051accd14d116d (patch) | |
tree | a6e8c97f99a13c391fdca96bbe4db919aa80a816 | |
parent | 844244cb1c231bd20da4ca0e03e31281053bd7c6 (diff) | |
download | poky-2a757944ba64b4e634cfba0714051accd14d116d.tar.gz |
gstreamer1.0: upgrade 1.26.0 -> 1.26.1
0001-Fix-atomic-64-issue-on-armv5.patch
removed since it's included in 1.26.1
0002-tests-add-support-for-install-the-tests.patch
refreshed in 1.26.1
(From OE-Core rev: 7714d0d4d2927ee9d2393a59de78afe847e7ede1)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-atomic-64-issue-on-armv5.patch | 36 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch | 6 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb) | 3 |
3 files changed, 4 insertions, 41 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-atomic-64-issue-on-armv5.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-atomic-64-issue-on-armv5.patch deleted file mode 100644 index 19a09f6829..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-atomic-64-issue-on-armv5.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 459afbb556432eb417bff5a33719efd596ef7502 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Wed, 2 Apr 2025 08:16:51 +0000 | ||
4 | Subject: [PATCH] Fix atomic 64 issue on armv5 | ||
5 | |||
6 | | /mnt/test/build_auh/tmp/work/armv5e-poky-linux-gnueabi/gstreamer1.0/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/libgstreamer-1.0.so.0.2600.0.p/gstbuffer.c.o: in function `gst_atomic_int64_inc': | ||
7 | | /usr/src/debug/gstreamer1.0/1.26.0/gst/gstbuffer.c:180:(.text+0x38c8): undefined reference to `__atomic_fetch_add_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 | meson.build | 7 +++++++ | ||
14 | 1 file changed, 7 insertions(+) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index f4c146d..9c24596 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -599,6 +599,13 @@ if nsl_lib.found() | ||
21 | network_deps += nsl_lib | ||
22 | endif | ||
23 | |||
24 | +# Check for libatomic for use of C11 atomics: some architectures need | ||
25 | +# to link explicitly to this library. | ||
26 | +# TODO: Once meson 1.7 is in use, this can be updated to | ||
27 | +# dependency('atomic') | ||
28 | +atomic_dep = cc.find_library('atomic', required: false) | ||
29 | +platform_deps += atomic_dep | ||
30 | + | ||
31 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
32 | gnome = import('gnome') | ||
33 | |||
34 | -- | ||
35 | 2.43.0 | ||
36 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index 7274d3862f..ba8e410669 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d9ad7d4fd596ece5f7a2ce25ed583b5c302984cf Mon Sep 17 00:00:00 2001 | 1 | From bfb530d2f0761f28c2645e2c45de5147b0528e4d Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | 3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 |
4 | Subject: [PATCH] tests: add support for install the tests | 4 | Subject: [PATCH] tests: add support for install the tests |
@@ -19,10 +19,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
19 | create mode 100644 tests/check/template.test.in | 19 | create mode 100644 tests/check/template.test.in |
20 | 20 | ||
21 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
22 | index f1be50c..f4c146d 100644 | 22 | index ba50005..09c7212 100644 |
23 | --- a/meson.build | 23 | --- a/meson.build |
24 | +++ b/meson.build | 24 | +++ b/meson.build |
25 | @@ -657,6 +657,10 @@ if bashcomp_dep.found() | 25 | @@ -664,6 +664,10 @@ if bashcomp_dep.found() |
26 | endif | 26 | endif |
27 | endif | 27 | endif |
28 | 28 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.1.bb index a908ecd166..e4579d7342 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.1.bb | |||
@@ -21,9 +21,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x | |||
21 | file://0002-tests-add-support-for-install-the-tests.patch \ | 21 | file://0002-tests-add-support-for-install-the-tests.patch \ |
22 | file://0003-tests-use-a-dictionaries-for-environment.patch \ | 22 | file://0003-tests-use-a-dictionaries-for-environment.patch \ |
23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ | 23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ |
24 | file://0001-Fix-atomic-64-issue-on-armv5.patch \ | ||
25 | " | 24 | " |
26 | SRC_URI[sha256sum] = "1b2ee4028010c25b776effa7c396c7e3e1861b60b9417e416f4914abcdff279f" | 25 | SRC_URI[sha256sum] = "30a4c4a5e48345583eb596aa265d0f53c0feb93011d93a6aaa70dd6e3c519dc4" |
27 | 26 | ||
28 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | 27 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ |
29 | check \ | 28 | check \ |