git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 677a40c1f5b0793598a92cbba0a621fef89c4a26 Mon Sep 17 00:00:00 2001
   2 From: Lei Maohui <leimaohui@fujitsu.com>
   3 Date: Wed, 2 Apr 2025 09:37:24 +0000
   4 Subject: [PATCH] gstreamer1.0-plugins-base: Fix atomic 64 issue on armv5
   5
   6 | /mnt/test/build_auh/tmp/work/armv5e-poky-linux-gnueabi/gstreamer1.0-plugins-base/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-libs/gst/audio/libgstaudio-1.0.so.0.2600.0.p/gstaudioringbuffer.c.o: in function `gst_atomic_uint64_get':
   7 | /usr/src/debug/gstreamer1.0-plugins-base/1.26.0/gst-libs/gst/audio/gstaudioringbuffer.c:72:(.text+0x4e00): undefined reference to `__atomic_load_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  gst-libs/gst/audio/meson.build | 2 +-
  14  meson.build                    | 9 +++++++++
  15  2 files changed, 10 insertions(+), 1 deletion(-)
  16
  17 diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
  18 index 1d69713..cf8935b 100644
  19 --- a/gst-libs/gst/audio/meson.build
  20 +++ b/gst-libs/gst/audio/meson.build
  21 @@ -162,7 +162,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
  22    soversion : soversion,
  23    darwin_versions : osxversion,
  24    install : true,
  25 -  dependencies : gstaudio_deps,
  26 +  dependencies : [ gstaudio_deps, base_platform_dep ],
  27  )
  28  pkg_name = 'gstreamer-audio-1.0'
  29  pkgconfig.generate(gstaudio,
  30 diff --git a/meson.build b/meson.build
  31 index a470af0..c195376 100644
  32 --- a/meson.build
  33 +++ b/meson.build
  34 @@ -398,6 +398,15 @@ else
  35    core_conf.set('DISABLE_ORC', 1)
  36  endif
  37
  38 +base_platform_dep = []
  39 +# Check for libatomic for use of C11 atomics: some architectures need
  40 +# to link explicitly to this library.
  41 +# TODO: Once meson 1.7 is in use, this can be updated to
  42 +# dependency('atomic')
  43 +atomic_dep = cc.find_library('atomic', required: false)
  44 +
  45 +base_platform_dep += [atomic_dep]
  46 +
  47  # Used to build SSE* things in audio-resampler
  48  sse_args = '-msse'
  49  sse2_args = '-msse2'
  50 --
  51 2.43.0
  52