diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-08-04 09:12:03 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-08-04 07:20:59 +0000 |
| commit | 2db066b65d76b09903cf3d17bc85ba3c8e4c7166 (patch) | |
| tree | 543380b3282b1f3500580cb4683f32f17a8c7d7f | |
| parent | 107186d43f56f1be88cadf13729235d51914280e (diff) | |
community/pipewire: upgrade to 0.3.8
| -rw-r--r-- | community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch | 40 | ||||
| -rw-r--r-- | community/pipewire/APKBUILD | 8 |
2 files changed, 45 insertions, 3 deletions
diff --git a/community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch b/community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch new file mode 100644 index 00000000000..fbb253227f2 --- /dev/null +++ b/community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch @@ -0,0 +1,40 @@ +Upstream: Yes, https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/260 +From 407ea745130f3ea47e2b636bbdf9889325de9bdd Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Sun, 2 Aug 2020 12:50:56 +0200 +Subject: [PATCH] don't use qsort_r, it's not implemented everywhere + +Fixes #260 +--- + pipewire-jack/src/pipewire-jack.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c +index c0c8e2fb..f6a0f3ec 100644 +--- a/pipewire-jack/src/pipewire-jack.c ++++ b/pipewire-jack/src/pipewire-jack.c +@@ -4001,10 +4001,10 @@ int jack_recompute_total_latency (jack_client_t *client, jack_port_t* port) + return 0; + } + +-static int port_compare_func(const void *v1, const void *v2, void *arg) ++static int port_compare_func(const void *v1, const void *v2) + { +- struct client *c = arg; + const struct object *const*o1 = v1, *const*o2 = v2; ++ struct client *c = (*o1)->client; + int res; + bool is_cap1, is_cap2, is_def1 = false, is_def2 = false; + +@@ -4102,7 +4102,7 @@ const char ** jack_get_ports (jack_client_t *client, + pthread_mutex_unlock(&c->context.lock); + + if (count > 0) { +- qsort_r(tmp, count, sizeof(struct object *), port_compare_func, c); ++ qsort(tmp, count, sizeof(struct object *), port_compare_func); + + res = malloc(sizeof(char*) * (count + 1)); + for (i = 0; i < count; i++) +-- +GitLab + diff --git a/community/pipewire/APKBUILD b/community/pipewire/APKBUILD index 69dc83937d7..c8400334793 100644 --- a/community/pipewire/APKBUILD +++ b/community/pipewire/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=pipewire -pkgver=0.3.6 +pkgver=0.3.8 pkgrel=0 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" @@ -14,6 +14,7 @@ options="!check" # no tests subpackages="$pkgname-dev $pkgname-doc $pkgname-pulse $pkgname-jack" source="$pkgname-$pkgver.tar.gz::https://github.com/PipeWire/pipewire/archive/$pkgver.tar.gz fix-s390x.patch + 407ea745130f3ea47e2b636bbdf9889325de9bdd.patch " build() { @@ -50,5 +51,6 @@ jack() { mv "$pkgdir/usr/bin/pw-jack" "$subpkgdir/usr/bin/" } -sha512sums="a8d67bb6135432705d6de026074325f0cae7f01e3fe0b65fa7dafb128e5984ce126f8b4635bfbd9746777514df6f0880a78149fd007c7c1432ac29f95655ddcc pipewire-0.3.6.tar.gz -576a6fbb7d457bda70822a175a188b6f9dbf3b5cf9efa660e458f6d54ff6b88376821164534ec073f20b929d81c2232783f63612fc9ec5803bfe23356449f314 fix-s390x.patch" +sha512sums="a652040ef474932d307294ae198c58caf16cfe9a7c473cad44a595badc1b33de9195b46de476e8ee2d75c1d9412f3b4d1590342f70ae7414a4c31f47b00f78a1 pipewire-0.3.8.tar.gz +576a6fbb7d457bda70822a175a188b6f9dbf3b5cf9efa660e458f6d54ff6b88376821164534ec073f20b929d81c2232783f63612fc9ec5803bfe23356449f314 fix-s390x.patch +0089cc40a861358c5663175623753bdb9b4bc83e38523b9f2c7752a3d4800c5a09932ffd241a02f9af4fb083425cb943df4deb06b53a9a14581e3ad8425807b4 407ea745130f3ea47e2b636bbdf9889325de9bdd.patch" |