diff mbox series

[10/19] gstreamer1.0: upgrade 1.26.0 -> 1.26.1

Message ID 1746762980-12783-10-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/19] glslang: upgrade 1.4.309.0 -> 1.4.313.0 | expand

Commit Message

Mingyu Wang (Fujitsu) May 9, 2025, 3:56 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-Fix-atomic-64-issue-on-armv5.patch   | 36 -------------------
 ...ts-add-support-for-install-the-tests.patch |  6 ++--
 ...er1.0_1.26.0.bb => gstreamer1.0_1.26.1.bb} |  3 +-
 3 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-atomic-64-issue-on-armv5.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.26.0.bb => gstreamer1.0_1.26.1.bb} (95%)
diff mbox series

Patch

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 @@ 
-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
-
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 @@ 
-From d9ad7d4fd596ece5f7a2ce25ed583b5c302984cf Mon Sep 17 00:00:00 2001
+From bfb530d2f0761f28c2645e2c45de5147b0528e4d 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 f1be50c..f4c146d 100644
+index ba50005..09c7212 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -657,6 +657,10 @@ if bashcomp_dep.found()
+@@ -664,6 +664,10 @@ if bashcomp_dep.found()
    endif
  endif
  
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.1.bb
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb
rename to 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
            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] = "1b2ee4028010c25b776effa7c396c7e3e1861b60b9417e416f4914abcdff279f"
+SRC_URI[sha256sum] = "30a4c4a5e48345583eb596aa265d0f53c0feb93011d93a6aaa70dd6e3c519dc4"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    check \