extra/pipewire to 0.3.11-1

This commit is contained in:
Kevin Mihelich 2020-09-11 23:55:36 +00:00
parent a0d9dbb51f
commit 2baf0bb0be
2 changed files with 4 additions and 61 deletions

View file

@ -1,52 +0,0 @@
From ff849ed1b0d254afa4dd591ca01d8d74c03344ec Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 11 Mar 2020 07:28:28 -0600
Subject: [PATCH] atomic
---
pipewire-jack/src/meson.build | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
index a052eaa8..1f08f0a5 100644
--- a/pipewire-jack/src/meson.build
+++ b/pipewire-jack/src/meson.build
@@ -33,13 +33,34 @@ configure_file(input : 'pw-jack.in',
configuration : tools_config,
install_dir : pipewire_bindir)
+# Check for GCC style atomics
+dep_atomic = declare_dependency()
+
+if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE); }',
+ name : 'GCC atomic builtins')
+ # Not all atomic calls can be turned into lock-free instructions, in which
+ # GCC will make calls into the libatomic library. Check whether we need to
+ # link with -latomic.
+ #
+ # This can happen for 64-bit atomic operations on 32-bit architectures such
+ # as ARM.
+ if not cc.links('''#include <stdint.h>
+ int main() {
+ uint64_t n;
+ return (int)__atomic_load_n(&n, __ATOMIC_ACQUIRE);
+ }''',
+ name : 'GCC atomic builtins required -latomic')
+ dep_atomic = cc.find_library('atomic')
+ endif
+endif
+
pipewire_jack = shared_library('jack',
pipewire_jack_sources,
soversion : soversion,
version : libversion,
c_args : pipewire_jack_c_args,
include_directories : [configinc],
- dependencies : [pipewire_dep, jack_dep, mathlib],
+ dependencies : [pipewire_dep, jack_dep, mathlib, dep_atomic],
install : true,
install_dir : libjack_path,
)
--
2.26.2

View file

@ -3,11 +3,10 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - remove makedepend on valgrind
# - patch to check for and link with libatomic
pkgbase=pipewire
pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse pipewire-alsa)
pkgver=0.3.10
pkgver=0.3.11
pkgrel=1
pkgdesc="Server and user space API to deal with multimedia pipelines"
url="https://pipewire.org"
@ -16,11 +15,9 @@ arch=(x86_64)
makedepends=(git meson doxygen graphviz xmltoman jack2 libpulse
alsa-lib gstreamer gst-plugins-base sbc rtkit vulkan-icd-loader
dbus libsndfile bluez-libs vulkan-headers)
_commit=69be14186e20ffaa42c4a635be5da49173c45b97 # tags/0.3.10
source=("git+https://github.com/PipeWire/pipewire#commit=$_commit"
0001-atomic.patch)
sha256sums=('SKIP'
'4453fecf0fc9dbb3399018e43f032d2f178f521f4d44482be87ff207b8d9e789')
_commit=b0c758719dfd661d9d2237e780f93d56ea181669 # tags/0.3.11
source=("git+https://github.com/PipeWire/pipewire#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd $pkgbase
@ -29,8 +26,6 @@ pkgver() {
prepare() {
cd $pkgbase
patch -p1 -i ../0001-atomic.patch
}
build() {