0003-build-sys-Add-missing-libatomic_ops-dependencies.patch 6.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129
  1. From 96361ff2a8f37dd3ce7ea188ce4e7b038bb6a5aa Mon Sep 17 00:00:00 2001
  2. From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
  3. Date: Mon, 4 Jul 2022 13:49:34 +0200
  4. Subject: [PATCH] build-sys: Add missing libatomic_ops dependencies
  5. Add libatomic_ops dependencies to libraries/modules that showed a
  6. failure on an arch that does not have native atomic operations support.
  7. Not all optional dependencies were tested, so it is possible that
  8. some optional modules are still missing libatomic_ops dependencies.
  9. Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
  10. Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732]
  11. ---
  12. src/meson.build | 2 +-
  13. src/modules/meson.build | 6 +++---
  14. src/pulse/meson.build | 2 +-
  15. src/pulsecore/meson.build | 10 +++++-----
  16. 4 files changed, 10 insertions(+), 10 deletions(-)
  17. diff --git a/src/meson.build b/src/meson.build
  18. index 96dcec354..9efb561d8 100644
  19. --- a/src/meson.build
  20. +++ b/src/meson.build
  21. @@ -205,7 +205,7 @@ else
  22. libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
  23. x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true),
  24. gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep,
  25. - platform_dep, platform_socket_dep, execinfo_dep,
  26. + platform_dep, platform_socket_dep, execinfo_dep, libatomic_ops_dep,
  27. ],
  28. implicit_include_directories : false)
  29. diff --git a/src/modules/meson.build b/src/modules/meson.build
  30. index 1d8004300..1e12569dc 100644
  31. --- a/src/modules/meson.build
  32. +++ b/src/modules/meson.build
  33. @@ -14,7 +14,7 @@ all_modules = [
  34. [ 'module-cli-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_TCP_SOCKETS'], [], libprotocol_cli ],
  35. [ 'module-cli-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_UNIX_SOCKETS'], [], libprotocol_cli ],
  36. [ 'module-combine', 'module-combine.c' ],
  37. - [ 'module-combine-sink', 'module-combine-sink.c' ],
  38. + [ 'module-combine-sink', 'module-combine-sink.c', [], [], [libatomic_ops_dep] ],
  39. # [ 'module-coreaudio-detect', 'macosx/module-coreaudio-detect.c' ],
  40. # [ 'module-coreaudio-device', 'macosx/module-coreaudio-device.c' ],
  41. [ 'module-default-device-restore', 'module-default-device-restore.c', [], [], [], libprotocol_native ],
  42. @@ -73,7 +73,7 @@ endif
  43. if host_machine.system() != 'windows'
  44. all_modules += [
  45. - [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [], librtp ],
  46. + [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [libatomic_ops_dep], librtp ],
  47. [ 'module-rtp-send', 'rtp/module-rtp-send.c' , [], [], [], librtp ],
  48. ]
  49. endif
  50. @@ -243,7 +243,7 @@ module_echo_cancel_sources = [
  51. ]
  52. module_echo_cancel_orc_sources = []
  53. module_echo_cancel_flags = []
  54. -module_echo_cancel_deps = []
  55. +module_echo_cancel_deps = [libatomic_ops_dep]
  56. module_echo_cancel_libs = []
  57. if get_option('adrian-aec')
  58. diff --git a/src/pulse/meson.build b/src/pulse/meson.build
  59. index c2128e087..1b82c807c 100644
  60. --- a/src/pulse/meson.build
  61. +++ b/src/pulse/meson.build
  62. @@ -85,7 +85,7 @@ libpulse = shared_library('pulse',
  63. link_args : [nodelete_link_args, versioning_link_args],
  64. install : true,
  65. install_rpath : privlibdir,
  66. - dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep],
  67. + dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep, libatomic_ops_dep],
  68. implicit_include_directories : false)
  69. libpulse_dep = declare_dependency(link_with: libpulse)
  70. diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
  71. index b30264b3a..b37fec499 100644
  72. --- a/src/pulsecore/meson.build
  73. +++ b/src/pulsecore/meson.build
  74. @@ -251,7 +251,7 @@ libcli = shared_library('cli',
  75. c_args : [pa_c_args, server_c_args, database_c_args],
  76. link_args : [nodelete_link_args],
  77. include_directories : [configinc, topinc],
  78. - dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
  79. + dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep],
  80. install : true,
  81. install_rpath : privlibdir,
  82. install_dir : modlibexecdir,
  83. @@ -268,7 +268,7 @@ libprotocol_cli = shared_library('protocol-cli',
  84. c_args : [pa_c_args, server_c_args, database_c_args],
  85. link_args : [nodelete_link_args],
  86. include_directories : [configinc, topinc],
  87. - dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep],
  88. + dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep, libatomic_ops_dep],
  89. install : true,
  90. install_rpath : rpath_dirs,
  91. install_dir : modlibexecdir,
  92. @@ -280,7 +280,7 @@ libprotocol_http = shared_library('protocol-http',
  93. c_args : [pa_c_args, server_c_args, database_c_args],
  94. link_args : [nodelete_link_args],
  95. include_directories : [configinc, topinc],
  96. - dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
  97. + dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep],
  98. install : true,
  99. install_rpath : privlibdir,
  100. install_dir : modlibexecdir,
  101. @@ -292,7 +292,7 @@ libprotocol_native = shared_library('protocol-native',
  102. c_args : [pa_c_args, server_c_args, database_c_args],
  103. link_args : [nodelete_link_args],
  104. include_directories : [configinc, topinc],
  105. - dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep],
  106. + dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, libatomic_ops_dep],
  107. install : true,
  108. install_rpath : privlibdir,
  109. install_dir : modlibexecdir,
  110. @@ -304,7 +304,7 @@ libprotocol_simple = shared_library('protocol-simple',
  111. c_args : [pa_c_args, server_c_args, database_c_args],
  112. link_args : [nodelete_link_args],
  113. include_directories : [configinc, topinc],
  114. - dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
  115. + dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep],
  116. install : true,
  117. install_rpath : privlibdir,
  118. install_dir : modlibexecdir,
  119. --
  120. 2.36.1