jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pipewire: update to 0.3.33

Browse source 
Set auto-features=enabled because we want the majority of the auto features
enabled and to avoid relying on auto-detection.
In addition, this update enables echo-cancel-webrtc, libpulse and avahi
This commit is contained in:
Stefano Ragni 2021-08-06 23:28:40 +02:00 committed by Michal Vasilek
parent a704b43c5a
commit 3407d0541b
2 changed files with 18 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
srcpkgs/pipewire/patches/gettid.patch
View file

@ -1,64 +0,0 @@
From master, will be in 0.3.33
diff --git a/meson.build b/meson.build
index 838fb66be8ca0e2d66009696f6c00c2ff7580b6e..977ce9ba1f22a2785efcb1b5a5bee08cf2e4bec3 100644
--- a/meson.build
+++ b/meson.build
@@ -254,6 +254,9 @@ endif
if cc.has_function('getpagesize', prefix : '#include<unistd.h>')
cdata.set('HAVE_GETPAGESIZE', 1)
endif
+if cc.has_function('gettid', prefix : '#include<unistd.h>', args: [ '-D_GNU_SOURCE' ])
+ cdata.set('HAVE_GETTID', 1)
+endif
if cc.has_function('clock_gettime', prefix : '#include <time.h>')
cdata.set('HAVE_CLOCK_GETTIME', 1)
endif
diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
index 1f13aa371192bee738c4e10b45917473d2f9856d..7d55fb758cdc0a3073e3e3f2536949e824ffa223 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
}
diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
index de30f4123cf017f8be2eb7d4cd3bababb51da6fc..419e4be815a46d0f466969a02813f481d48ee5a1 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);
diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
index 419e4be815a46d0f466969a02813f481d48ee5a1..1f13aa371192bee738c4e10b45917473d2f9856d 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;

27
srcpkgs/pipewire/template
View file

@ -1,15 +1,24 @@
# Template file for 'pipewire'
pkgname=pipewire
version=0.3.32
revision=2
version=0.3.33
revision=1
build_style=meson
configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
-Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
-Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
configure_args="
--auto-features=enabled
-Db_ndebug=false
-Ddocs=enabled
-Dlibcamera=disabled
-Droc=disabled
-Dsdl2=$(vopt_if sdl2 enabled disabled)
-Dsystemd=disabled
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
"
hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
short_desc="Server and user space API to deal with multimedia pipelines"
@ -18,7 +27,7 @@ license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
checksum=8b2af6138529fd9214dd148f2a6304f13c16e0b0d3a4a98c1afa87b7e65c574f
checksum=f60662be410523cbb767dbee81156f9e9e3bd2b06d0ea21e94c11eb7a6530bcc
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"