aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-08-18 05:46:29 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-08-18 05:48:30 +0000
commit1f88ee9f75b1fcf8a98ddc1d0db5ef2a113a46ff (patch)
treec43688fc21d5f292271019ded6b9307d2ce07df9
parent1d3717bebc12493bb9b896db37db728c9d7a661e (diff)
downloadaports-1f88ee9f75b1fcf8a98ddc1d0db5ef2a113a46ff.tar.gz
aports-1f88ee9f75b1fcf8a98ddc1d0db5ef2a113a46ff.tar.bz2
aports-1f88ee9f75b1fcf8a98ddc1d0db5ef2a113a46ff.tar.xz
community/pipewire: remove redudant patch
Patch is already included in this release, so it no longer needs to be applied.
-rw-r--r--community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch40
-rw-r--r--community/pipewire/APKBUILD7
2 files changed, 2 insertions, 45 deletions
diff --git a/community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch b/community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch
deleted file mode 100644
index fbb253227f..0000000000
--- a/community/pipewire/407ea745130f3ea47e2b636bbdf9889325de9bdd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 bb7bb65aad..465812c085 100644
--- a/community/pipewire/APKBUILD
+++ b/community/pipewire/APKBUILD
@@ -12,9 +12,7 @@ makedepends="meson alsa-lib-dev libx11-dev sdl2-dev ffmpeg-dev eudev-dev dbus-de
bluez-dev jack-dev vulkan-loader-dev pulseaudio-dev"
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
- 407ea745130f3ea47e2b636bbdf9889325de9bdd.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/PipeWire/pipewire/archive/$pkgver.tar.gz"
build() {
abuild-meson \
@@ -50,5 +48,4 @@ jack() {
mv "$pkgdir/usr/bin/pw-jack" "$subpkgdir/usr/bin/"
}
-sha512sums="f2db26e554def1566cb11ff0ea73c31890fb9dd666d9650dcac351ba2a7407e0b5e6c4cc8f11f6290c00845824f97c205b6d3162598d5906fd97f80f56f6a061 pipewire-0.3.9.tar.gz
-0089cc40a861358c5663175623753bdb9b4bc83e38523b9f2c7752a3d4800c5a09932ffd241a02f9af4fb083425cb943df4deb06b53a9a14581e3ad8425807b4 407ea745130f3ea47e2b636bbdf9889325de9bdd.patch"
+sha512sums="f2db26e554def1566cb11ff0ea73c31890fb9dd666d9650dcac351ba2a7407e0b5e6c4cc8f11f6290c00845824f97c205b6d3162598d5906fd97f80f56f6a061 pipewire-0.3.9.tar.gz"