mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
gstreamer1.0: 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, only pick subprojects/gstreamer/meson.build part that affect us https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8637/commits?commit_id=f2b5c0b6020b50f5173e449b45a6f7a7be31c48f (From OE-Core rev: b5114ecd6e7a87f290f5ee9407dcf7c0eddf4f22) Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
89fe8327ee
commit
df1bfb1dfa
|
@ -0,0 +1,36 @@
|
|||
From 459afbb556432eb417bff5a33719efd596ef7502 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@fujitsu.com>
|
||||
Date: Wed, 2 Apr 2025 08:16:51 +0000
|
||||
Subject: [PATCH] Fix atomic 64 issue on armv5
|
||||
|
||||
| /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':
|
||||
| /usr/src/debug/gstreamer1.0/1.26.0/gst/gstbuffer.c:180:(.text+0x38c8): undefined reference to `__atomic_fetch_add_8'
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8637/commits?commit_id=f2b5c0b6020b50f5173e449b45a6f7a7be31c48f]
|
||||
|
||||
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
|
||||
---
|
||||
meson.build | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index f4c146d..9c24596 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -599,6 +599,13 @@ if nsl_lib.found()
|
||||
network_deps += nsl_lib
|
||||
endif
|
||||
|
||||
+# Check for libatomic for use of C11 atomics: some architectures need
|
||||
+# to link explicitly to this library.
|
||||
+# TODO: Once meson 1.7 is in use, this can be updated to
|
||||
+# dependency('atomic')
|
||||
+atomic_dep = cc.find_library('atomic', required: false)
|
||||
+platform_deps += atomic_dep
|
||||
+
|
||||
gir = find_program('g-ir-scanner', required : get_option('introspection'))
|
||||
gnome = import('gnome')
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From a9d99eea162dfb6dcd5cb90adb7dd9261ec676bc Mon Sep 17 00:00:00 2001
|
||||
From cb49c5433f343aa9ae6c0656d2e835365330922b 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: respect the idententaion used in meson
|
||||
|
@ -11,10 +11,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
|||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tests/check/meson.build b/tests/check/meson.build
|
||||
index 7d68212..bf0021f 100644
|
||||
index e8419fc..4cc4618 100644
|
||||
--- a/tests/check/meson.build
|
||||
+++ b/tests/check/meson.build
|
||||
@@ -146,11 +146,11 @@ foreach t : core_tests
|
||||
@@ -149,11 +149,11 @@ foreach t : core_tests
|
||||
|
||||
if not skip_test
|
||||
exe = executable(test_name, fname,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f0076c5801bd847c464e31ab11fdb06f1ad0fccd Mon Sep 17 00:00:00 2001
|
||||
From d9ad7d4fd596ece5f7a2ce25ed583b5c302984cf 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 dc9dbe2..55e85b3 100644
|
||||
index f1be50c..f4c146d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -645,6 +645,10 @@ if bashcomp_dep.found()
|
||||
@@ -657,6 +657,10 @@ if bashcomp_dep.found()
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -34,7 +34,7 @@ index dc9dbe2..55e85b3 100644
|
|||
|
||||
pkgconfig = import('pkgconfig')
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 340fb58..5b87f68 100644
|
||||
index 39255cf..78af552 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
|
||||
|
@ -46,10 +46,10 @@ 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 bf0021f..9a8c42c 100644
|
||||
index 4cc4618..f290e2e 100644
|
||||
--- a/tests/check/meson.build
|
||||
+++ b/tests/check/meson.build
|
||||
@@ -125,10 +125,16 @@ test_defines = [
|
||||
@@ -128,10 +128,16 @@ test_defines = [
|
||||
'-UG_DISABLE_ASSERT',
|
||||
'-UG_DISABLE_CAST_CHECKS',
|
||||
'-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
|
||||
|
@ -67,7 +67,7 @@ index bf0021f..9a8c42c 100644
|
|||
# sanity checking
|
||||
if get_option('check').disabled()
|
||||
if get_option('tests').enabled()
|
||||
@@ -151,6 +157,8 @@ foreach t : core_tests
|
||||
@@ -154,6 +160,8 @@ foreach t : core_tests
|
||||
include_directories : [configinc],
|
||||
link_with : link_with_libs,
|
||||
dependencies : gst_deps + test_deps,
|
||||
|
@ -76,7 +76,7 @@ index bf0021f..9a8c42c 100644
|
|||
)
|
||||
|
||||
env = environment()
|
||||
@@ -162,6 +170,18 @@ foreach t : core_tests
|
||||
@@ -165,6 +173,18 @@ foreach t : core_tests
|
||||
env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
|
||||
env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f9544b0e2d35bf9f9a89cff42bb741bc16e37cc8 Mon Sep 17 00:00:00 2001
|
||||
From d24110809da4588354ad3df4ae99556e8c62838a Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sat, 24 Apr 2021 10:34:47 +0100
|
||||
Subject: [PATCH] tests: use a dictionaries for environment
|
||||
|
@ -14,10 +14,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
|||
1 file changed, 13 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/tests/check/meson.build b/tests/check/meson.build
|
||||
index 9a8c42c..6bb346a 100644
|
||||
index f290e2e..a3ffcb6 100644
|
||||
--- a/tests/check/meson.build
|
||||
+++ b/tests/check/meson.build
|
||||
@@ -161,14 +161,19 @@ foreach t : core_tests
|
||||
@@ -164,14 +164,19 @@ foreach t : core_tests
|
||||
install: installed_tests_enabled,
|
||||
)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 39764bd2b9f9da4a07079f76a2f68baf40c143b9 Mon Sep 17 00:00:00 2001
|
||||
From 3b9ae399b57cfb6e332fac6a90997a3abd33c819 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sun, 2 May 2021 01:58:01 +0100
|
||||
Subject: [PATCH] tests: add helper script to run the installed_tests
|
||||
|
@ -18,10 +18,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
|||
create mode 100755 tests/check/template.sh.in
|
||||
|
||||
diff --git a/tests/check/meson.build b/tests/check/meson.build
|
||||
index 6bb346a..fe57935 100644
|
||||
index a3ffcb6..b907dcf 100644
|
||||
--- a/tests/check/meson.build
|
||||
+++ b/tests/check/meson.build
|
||||
@@ -185,6 +185,23 @@ foreach t : core_tests
|
||||
@@ -188,6 +188,23 @@ foreach t : core_tests
|
||||
install_dir: installed_tests_metadir,
|
||||
configuration: test_conf
|
||||
)
|
||||
|
|
|
@ -21,8 +21,9 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
|
|||
file://0002-tests-add-support-for-install-the-tests.patch \
|
||||
file://0003-tests-use-a-dictionaries-for-environment.patch \
|
||||
file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
|
||||
file://0001-Fix-atomic-64-issue-on-armv5.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "b3522d1b4fe174fff3b3c7f0603493e2367bd1c43f5804df15b634bd22b1036f"
|
||||
SRC_URI[sha256sum] = "1b2ee4028010c25b776effa7c396c7e3e1861b60b9417e416f4914abcdff279f"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
|
||||
check \
|
Loading…
Reference in New Issue
Block a user