From 8654c8d80e06a1dc57590ada0fab48fb0445fffd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 9 Sep 2021 17:09:53 -0600 Subject: [PATCH] package/pipewire: bump to version 0.3.35 Update download to use official gitlab source url. Drop patches that are now upstream. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...n-fix-getrandom-detection-for-uclibc.patch | 49 ---------------- ...002-modules-fix-typo-in-module-rtkit.patch | 31 ---------- ...gettid-instead-of-getpid-in-fallback.patch | 28 --------- ...0004-modules-improve-_gettid-wrapper.patch | 58 ------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 5 +- 6 files changed, 4 insertions(+), 169 deletions(-) delete mode 100644 package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch delete mode 100644 package/pipewire/0002-modules-fix-typo-in-module-rtkit.patch delete mode 100644 package/pipewire/0003-rtkit-use-_gettid-instead-of-getpid-in-fallback.patch delete mode 100644 package/pipewire/0004-modules-improve-_gettid-wrapper.patch diff --git a/package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch b/package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch deleted file mode 100644 index e902869ce9..0000000000 --- a/package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a36bc959768e100d2d72e027746e3a9d95cf29af Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 12 May 2021 22:08:39 +0200 -Subject: [PATCH] meson: fix getrandom detection for uclibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The getrandom() detection from meson.build failes with the following error -message: - - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name 'size_t' - 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) - | ^~~~~~ - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? - -Fix it by adding stddef.h include to the meson getrandom() detection. - -Fixes: - - ../src/pipewire/impl-core.c:54:9: error: conflicting types for ‘getrandom’ - 54 | ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) { - | ^~~~~~~~~ - In file included from ../src/pipewire/impl-core.c:34: - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:12: note: previous declaration of ‘getrandom’ was here - 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) - | ^~~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 03a9d174..01b4c7c8 100644 ---- a/meson.build -+++ b/meson.build -@@ -274,7 +274,7 @@ if cc.has_function('memfd_create', prefix : '#include ', args : [ '- - cdata.set('HAVE_MEMFD_CREATE', 1) - endif - --if cc.has_function('getrandom', prefix : '#include ', args : [ '-D_GNU_SOURCE' ]) -+if cc.has_function('getrandom', prefix : '#include \n#include ', args : [ '-D_GNU_SOURCE' ]) - cdata.set('HAVE_GETRANDOM', 1) - endif - --- -2.31.1 - diff --git a/package/pipewire/0002-modules-fix-typo-in-module-rtkit.patch b/package/pipewire/0002-modules-fix-typo-in-module-rtkit.patch deleted file mode 100644 index 99d5167ebf..0000000000 --- a/package/pipewire/0002-modules-fix-typo-in-module-rtkit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9160a127b5069ee1ca3bdf11857a04f75099041d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Tue, 20 Jul 2021 12:01:21 -0300 -Subject: [PATCH] modules: fix typo in module-rtkit - -Was using the gettid() function directly instead of the _gettid() -wrapper. - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/9160a127b5069ee1ca3bdf11857a04f75099041d] -Signed-off-by: Fabrice Fontaine ---- - src/modules/module-rtkit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c -index de30f4123..419e4be81 100644 ---- a/src/modules/module-rtkit.c -+++ b/src/modules/module-rtkit.c -@@ -518,7 +518,7 @@ static void *custom_start(void *data) - struct impl *impl = this->impl; - - pthread_mutex_lock(&impl->lock); -- this->pid = gettid(); -+ this->pid = _gettid(); - pthread_cond_broadcast(&impl->cond); - pthread_mutex_unlock(&impl->lock); - --- -GitLab - diff --git a/package/pipewire/0003-rtkit-use-_gettid-instead-of-getpid-in-fallback.patch b/package/pipewire/0003-rtkit-use-_gettid-instead-of-getpid-in-fallback.patch deleted file mode 100644 index 854f268ba7..0000000000 --- a/package/pipewire/0003-rtkit-use-_gettid-instead-of-getpid-in-fallback.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a4b8bd6d5292c13c0e14db54d4b5819a2bbf066d Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Tue, 20 Jul 2021 17:13:26 +0200 -Subject: [PATCH] rtkit: use _gettid() instead of getpid() in fallback - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a4b8bd6d5292c13c0e14db54d4b5819a2bbf066d] -Signed-off-by: Fabrice Fontaine ---- - src/modules/module-rtkit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c -index 419e4be81..1f13aa371 100644 ---- a/src/modules/module-rtkit.c -+++ b/src/modules/module-rtkit.c -@@ -592,7 +592,7 @@ static pid_t impl_gettid(struct impl *impl, pthread_t pt) - if ((thr = find_thread_by_pt(impl, pt)) != NULL) - pid = thr->pid; - else -- pid = getpid(); -+ pid = _gettid(); - pthread_mutex_unlock(&impl->lock); - - return pid; --- -GitLab - diff --git a/package/pipewire/0004-modules-improve-_gettid-wrapper.patch b/package/pipewire/0004-modules-improve-_gettid-wrapper.patch deleted file mode 100644 index 56bdcf26f9..0000000000 --- a/package/pipewire/0004-modules-improve-_gettid-wrapper.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4c166709d06571b889a89812c962a91ba4d0a071 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Tue, 20 Jul 2021 12:10:40 -0300 -Subject: [PATCH] modules: improve _gettid wrapper - -- use meson to check for gettid() function, always use if available -- use syscall fallback on linux, if not -- restrict thr_self() fallback to *only* FreeBSD -- error out if there isn't any gettid impl - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4c166709d06571b889a89812c962a91ba4d0a071] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 3 +++ - src/modules/module-rtkit.c | 8 ++++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 838fb66be..977ce9ba1 100644 ---- a/meson.build -+++ b/meson.build -@@ -254,6 +254,9 @@ endif - if cc.has_function('getpagesize', prefix : '#include') - cdata.set('HAVE_GETPAGESIZE', 1) - endif -+if cc.has_function('gettid', prefix : '#include', args: [ '-D_GNU_SOURCE' ]) -+ cdata.set('HAVE_GETTID', 1) -+endif - if cc.has_function('clock_gettime', prefix : '#include ') - cdata.set('HAVE_CLOCK_GETTIME', 1) - endif -diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c -index 1f13aa371..7d55fb758 100644 ---- a/src/modules/module-rtkit.c -+++ b/src/modules/module-rtkit.c -@@ -182,12 +182,16 @@ void pw_rtkit_bus_free(struct pw_rtkit_bus *system_bus) - - static pid_t _gettid(void) - { --#ifndef __FreeBSD__ -+#if defined(HAVE_GETTID) - return (pid_t) gettid(); --#else -+#elif defined(__linux__) -+ return syscall(SYS_gettid); -+#elif defined(__FreeBSD__) - long pid; - thr_self(&pid); - return (pid_t)pid; -+#else -+#error "No gettid impl" - #endif - } - --- -GitLab - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index bcba64c6ca..a289464988 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8b2af6138529fd9214dd148f2a6304f13c16e0b0d3a4a98c1afa87b7e65c574f pipewire-0.3.32.tar.gz +sha256 ce7dbd71bce46c9d81c549d8c846e8f3a8a263a19bf981d141d57bd2d316e3ac pipewire-0.3.35.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index aee0191894..9259f0421f 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,8 +4,9 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.32 -PIPEWIRE_SITE = $(call github,PipeWire,pipewire,$(PIPEWIRE_VERSION)) +PIPEWIRE_VERSION = 0.3.35 +PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 +PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) PIPEWIRE_LICENSE_FILES = COPYING LICENSE PIPEWIRE_INSTALL_STAGING = YES -- 2.30.2