diff mbox series

[04/19] gstreamer1.0-plugins-bad: upgrade 1.26.0 -> 1.26.1

Message ID 1746762980-12783-4-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-backport-libatomic-issue-patch.patch
removed since it's included in 1.26.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-backport-libatomic-issue-patch.patch | 41 -------------------
 ....bb => gstreamer1.0-plugins-bad_1.26.1.bb} |  3 +-
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-backport-libatomic-issue-patch.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.26.0.bb => gstreamer1.0-plugins-bad_1.26.1.bb} (98%)
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-backport-libatomic-issue-patch.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-backport-libatomic-issue-patch.patch
deleted file mode 100644
index 7ac605fb65..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-backport-libatomic-issue-patch.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From f8c802aa778804f02b30a191cd3bcce285023076 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui@fujitsu.com>
-Date: Wed, 2 Apr 2025 09:47:41 +0000
-Subject: [PATCH] backport libatomic issue patch
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8637/commits?commit_id=f2b5c0b6020b50f5173e449b45a6f7a7be31c48f]
-
-Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
----
- gst-libs/gst/cuda/meson.build | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/gst-libs/gst/cuda/meson.build b/gst-libs/gst/cuda/meson.build
-index 3a25244..50ae027 100644
---- a/gst-libs/gst/cuda/meson.build
-+++ b/gst-libs/gst/cuda/meson.build
-@@ -48,15 +48,12 @@ if host_system not in ['windows', 'linux']
-   subdir_done()
- endif
- 
--# Linux ARM would need -latomic for std::atomic<int64_t>
--if host_system == 'linux' and host_machine.cpu_family() in ['aarch64', 'arm']
--  libatomic_dep = cxx.find_library('atomic', required: get_option('cuda-nvmm'))
--  if not libatomic_dep.found()
--    subdir_done()
--  endif
--
--  gstcuda_platform_dep += [libatomic_dep]
--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 = cxx.find_library('atomic', required: false)
-+gstcuda_platform_dep += [atomic_dep]
- 
- cuda_win32_headers = [
-   'initguid.h',
--- 
-2.43.0
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.1.bb
similarity index 98%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.1.bb
index 2e409558d1..a68e9306a5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.1.bb
@@ -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-backport-libatomic-issue-patch.patch \
            "
-SRC_URI[sha256sum] = "f8287a84c5f66368a5a50da5f969994a02c47f20220ffe1ca3154193e65af216"
+SRC_URI[sha256sum] = "9b8415b1bb3726a499578fb39907952981716643f660215fe68628fbd8629197"
 
 S = "${WORKDIR}/gst-plugins-bad-${PV}"