From 9f351519f80e325f8e5dfb2d1bd97b40ea82b01e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 7 Aug 2021 13:53:00 +0200 Subject: [PATCH 1/2] New package: libfreeaptx-0.1.1 --- common/shlibs | 1 + srcpkgs/libfreeaptx-devel | 1 + srcpkgs/libfreeaptx/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/libfreeaptx-devel create mode 100644 srcpkgs/libfreeaptx/template diff --git a/common/shlibs b/common/shlibs index befa6484dfee..a53bbc8112f1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3992,6 +3992,7 @@ libspdlog.so.1 libspdlog-1.8.2_2 libmd.so.0 libmd-1.0.3_1 libldacBT_abr.so.2 ldacBT-2.0.2.3_1 libldacBT_enc.so.2 ldacBT-2.0.2.3_1 +libfreeaptx.so.0 libfreeaptx-0.1.1_1 libgumbo.so.1 gumbo-parser-0.10.1_2 libmariadb.so.3 libmariadbclient-10.5.9_1 libmariadbd.so.19 libmariadbclient-10.5.9_1 diff --git a/srcpkgs/libfreeaptx-devel b/srcpkgs/libfreeaptx-devel new file mode 120000 index 000000000000..fe4a33a76eb2 --- /dev/null +++ b/srcpkgs/libfreeaptx-devel @@ -0,0 +1 @@ +libfreeaptx \ No newline at end of file diff --git a/srcpkgs/libfreeaptx/template b/srcpkgs/libfreeaptx/template new file mode 100644 index 000000000000..81306855682a --- /dev/null +++ b/srcpkgs/libfreeaptx/template @@ -0,0 +1,21 @@ +# Template file for 'libfreeaptx' +pkgname=libfreeaptx +version=0.1.1 +revision=1 +build_style=gnu-makefile +short_desc="Open Source implementation of Audio Processing Technology codec (aptX)" +maintainer="Michal Vasilek " +license="LGPL-2.1-or-later" +homepage="https://github.com/iamthehorker/libfreeaptx/" +distfiles="https://github.com/iamthehorker/libfreeaptx/archive/refs/tags/$version.tar.gz" +checksum=7acf514446cae59585d9bc21e4f98f4a3856f4741c3a7a09d06e8ac5bf2f7315 + +libfreeaptx-devel_package() { + depends="libfreeaptx>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From c1f2ba26915b26b70e8c6f279eb65f865d1797db Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Fri, 6 Aug 2021 23:28:40 +0200 Subject: [PATCH 2/2] pipewire: update to 0.3.33 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 --- srcpkgs/pipewire/patches/gettid.patch | 64 --------------------------- srcpkgs/pipewire/template | 27 +++++++---- 2 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 srcpkgs/pipewire/patches/gettid.patch diff --git a/srcpkgs/pipewire/patches/gettid.patch b/srcpkgs/pipewire/patches/gettid.patch deleted file mode 100644 index 0911051e1a0c..000000000000 --- a/srcpkgs/pipewire/patches/gettid.patch +++ /dev/null @@ -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') - 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 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; diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 2e7da142b0c2..fcd2617e2cad 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -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"