diff options
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-backport-libatomic-issue-patch.patch | 41 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb) | 3 |
2 files changed, 1 insertions, 43 deletions
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 @@ | |||
1 | From f8c802aa778804f02b30a191cd3bcce285023076 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Wed, 2 Apr 2025 09:47:41 +0000 | ||
4 | Subject: [PATCH] backport libatomic issue patch | ||
5 | |||
6 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8637/commits?commit_id=f2b5c0b6020b50f5173e449b45a6f7a7be31c48f] | ||
7 | |||
8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
9 | --- | ||
10 | gst-libs/gst/cuda/meson.build | 15 ++++++--------- | ||
11 | 1 file changed, 6 insertions(+), 9 deletions(-) | ||
12 | |||
13 | diff --git a/gst-libs/gst/cuda/meson.build b/gst-libs/gst/cuda/meson.build | ||
14 | index 3a25244..50ae027 100644 | ||
15 | --- a/gst-libs/gst/cuda/meson.build | ||
16 | +++ b/gst-libs/gst/cuda/meson.build | ||
17 | @@ -48,15 +48,12 @@ if host_system not in ['windows', 'linux'] | ||
18 | subdir_done() | ||
19 | endif | ||
20 | |||
21 | -# Linux ARM would need -latomic for std::atomic<int64_t> | ||
22 | -if host_system == 'linux' and host_machine.cpu_family() in ['aarch64', 'arm'] | ||
23 | - libatomic_dep = cxx.find_library('atomic', required: get_option('cuda-nvmm')) | ||
24 | - if not libatomic_dep.found() | ||
25 | - subdir_done() | ||
26 | - endif | ||
27 | - | ||
28 | - gstcuda_platform_dep += [libatomic_dep] | ||
29 | -endif | ||
30 | +# Check for libatomic for use of C11 atomics: some architectures need | ||
31 | +# to link explicitly to this library. | ||
32 | +# TODO: Once meson 1.7 is in use, this can be updated to | ||
33 | +# dependency('atomic') | ||
34 | +atomic_dep = cxx.find_library('atomic', required: false) | ||
35 | +gstcuda_platform_dep += [atomic_dep] | ||
36 | |||
37 | cuda_win32_headers = [ | ||
38 | 'initguid.h', | ||
39 | -- | ||
40 | 2.43.0 | ||
41 | |||
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 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 | |||
9 | file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ | 9 | file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ |
10 | file://0002-avoid-including-sys-poll.h-directly.patch \ | 10 | file://0002-avoid-including-sys-poll.h-directly.patch \ |
11 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ | 11 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ |
12 | file://0001-backport-libatomic-issue-patch.patch \ | ||
13 | " | 12 | " |
14 | SRC_URI[sha256sum] = "f8287a84c5f66368a5a50da5f969994a02c47f20220ffe1ca3154193e65af216" | 13 | SRC_URI[sha256sum] = "9b8415b1bb3726a499578fb39907952981716643f660215fe68628fbd8629197" |
15 | 14 | ||
16 | S = "${WORKDIR}/gst-plugins-bad-${PV}" | 15 | S = "${WORKDIR}/gst-plugins-bad-${PV}" |
17 | 16 | ||