From 5f33e3ce7df4b96cb35131c59cc481cf4f8a0a64 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 5 Oct 2020 18:59:25 +0000 Subject: [PATCH] extra/pulseaudio to 13.99.2+7+g6101798c7-1 --- extra/pulseaudio/0001-disable-neon.patch | 6 +-- ...e-TUNNEL_SINK-for-module-tunnel-sink.patch | 28 ---------- extra/pulseaudio/PKGBUILD | 51 +++++++++---------- 3 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 extra/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch diff --git a/extra/pulseaudio/0001-disable-neon.patch b/extra/pulseaudio/0001-disable-neon.patch index a074768ff..67feba1d9 100644 --- a/extra/pulseaudio/0001-disable-neon.patch +++ b/extra/pulseaudio/0001-disable-neon.patch @@ -1,4 +1,4 @@ -From 253893b4a7eec97e96114bfad6a974d03c0a0bbb Mon Sep 17 00:00:00 2001 +From bc4cdcd76159b3b2fadd3274322433a9b9e72966 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 12 Sep 2019 05:44:39 -0600 Subject: [PATCH] disable neon @@ -8,7 +8,7 @@ Subject: [PATCH] disable neon 1 file changed, 1 deletion(-) diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build -index 19f6b9e99..09193eb19 100644 +index 5f78be012..4955e859e 100644 --- a/src/pulsecore/meson.build +++ b/src/pulsecore/meson.build @@ -174,7 +174,6 @@ simd = import('unstable-simd') @@ -20,5 +20,5 @@ index 19f6b9e99..09193eb19 100644 include_directories : [configinc, topinc], implicit_include_directories : false, -- -2.23.0 +2.28.0 diff --git a/extra/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch b/extra/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch deleted file mode 100644 index 6e6beeade..000000000 --- a/extra/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c7e0c4373a304e167b11a68575b9da9506345dab Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sun, 15 Sep 2019 13:47:19 +0200 -Subject: [PATCH] meson: Define TUNNEL_SINK for module-tunnel-sink - -This was missing, so it was building another tunnel-source instead. - -Fixes https://bugs.archlinux.org/task/63755 ---- - src/modules/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 92d5871f9..dd2241f42 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -55,7 +55,7 @@ all_modules = [ - [ 'module-suspend-on-idle', 'module-suspend-on-idle.c' ], - [ 'module-switch-on-connect', 'module-switch-on-connect.c' ], - [ 'module-switch-on-port-available', 'module-switch-on-port-available.c' ], -- [ 'module-tunnel-sink', 'module-tunnel.c', [], [], [x11_dep] ], -+ [ 'module-tunnel-sink', 'module-tunnel.c', [], ['-DTUNNEL_SINK=1'], [x11_dep] ], - [ 'module-tunnel-sink-new', 'module-tunnel-sink-new.c' ], - [ 'module-tunnel-source', 'module-tunnel.c', [], [], [x11_dep] ], - [ 'module-tunnel-source-new', 'module-tunnel-source-new.c' ], --- -2.23.0 - diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 1dbcd2fcf..8b6981054 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,30 +1,25 @@ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Daniel J Griffiths -# Contributor: Corrado Primier -# Contributor: William Rea +# Maintainer: Jan Alexander Steffens (heftig) # ALARM: Kevin Mihelich # - patch to remove meson NEON check pkgbase=pulseaudio -pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer}) +pkgname=(pulseaudio libpulse alsa-card-profiles pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer}) pkgdesc="A featureful, general-purpose sound server" -pkgver=13.0 -pkgrel=3 +pkgver=13.99.2+7+g6101798c7 +pkgrel=1 arch=(x86_64) url="https://www.freedesktop.org/wiki/Software/PulseAudio/" license=(GPL) makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr speexdsp tdb systemd dbus avahi bluez bluez-libs jack2 sbc lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson - xmltoman) -_commit=200618b32f0964a479d69c9b6e5073e6931c370a # tags/v13.0^0 + xmltoman gst-plugins-base-libs) +_commit=6101798c7a4fa5b8ce7f5589706b03d87a3aee76 # master source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit" - 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch '0001-disable-neon.patch') sha256sums=('SKIP' - '4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d' - 'b1c20e992511e62f28434f0c4217c13aa9a557ae93dda5df4127aa42b0800614') + '7572bfc1a185f8b6f7757db217d35f9134128fc8cd047845f34acb17e2fe67d1') pkgver() { cd pulseaudio @@ -37,9 +32,6 @@ prepare() { # Freeze version before patching ./git-version-gen doesnt-exist >.tarball-version - # https://bugs.archlinux.org/task/63755 - git apply -3 ../0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch - if [[ $CARCH != "aarch64" ]]; then patch -p1 -i ../0001-disable-neon.patch fi @@ -47,10 +39,11 @@ prepare() { build() { arch-meson pulseaudio build \ - -D gcov=false \ + -D alsadatadir=/usr/share/alsa-card-profile/mixer \ -D pulsedsp-location='/usr/\$LIB/pulseaudio' \ + -D stream-restore-clear-old-devices=true \ -D udevrulesdir=/usr/lib/udev/rules.d - ninja -C build + meson compile -C build } check() { @@ -69,8 +62,8 @@ _pick() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr - webrtc-audio-processing) + depends=("libpulse=$pkgver-$pkgrel" alsa-card-profiles rtkit libltdl speexdsp + tdb orc libsoxr webrtc-audio-processing gst-plugins-base-libs) optdepends=('pulseaudio-alsa: ALSA configuration (recommended)') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install @@ -86,14 +79,6 @@ package_pulseaudio() { cd "$pkgdir" - # Assumes that any volume adjustment is intended by the user, who can control - # each app's volume. Misbehaving clients can trigger earsplitting volume - # jumps. App volumes can diverge wildly and cause apps without their own - # volume control to fall below sink volume; a sink-only volume control will - # suddenly be unable to make such an app loud enough. - sed -e '/flat-volumes/iflat-volumes = no' \ - -i etc/pulse/daemon.conf - # Superseded by socket activation sed -e '/autospawn/iautospawn = no' \ -i etc/pulse/client.conf @@ -120,6 +105,9 @@ package_pulseaudio() { _pick libpulse usr/share/man/man5/pulse-client.conf.5 _pick libpulse usr/share/vala +### Split alsa-card-profiles + _pick alsa-card-profiles usr/share/alsa-card-profile + ### Split modules local moddir=usr/lib/pulse-$pulsever/modules @@ -150,6 +138,13 @@ package_libpulse() { mv libpulse/* "$pkgdir" } +package_alsa-card-profiles() { + pkgdesc="ALSA card profiles shared by PulseAudio" + license=(LGPL) + + mv alsa-card-profiles/* "$pkgdir" +} + package_pulseaudio-zeroconf(){ pkgdesc="Zeroconf support for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl) @@ -180,7 +175,7 @@ package_pulseaudio-bluetooth(){ package_pulseaudio-equalizer(){ pkgdesc="Equalizer for PulseAudio" - depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus,sip} fftw) + depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw) mv equalizer/* "$pkgdir" }