main/sxmo-common: allow switching between pipewire and pulseaudio (MR 3711)

Users can switch to pulseaudio with:
  doas apk add sxmo-audio-common-pulse

We can make the poco f1 device APKBUILD depend on
sxmo-common-audio-pulse. This allows you to install pulseaudio on Sxmo
which was the reason Joel said the poco f1 was having issues with call
audio: https://gitlab.com/postmarketOS/pmaports/-/issues/1821

After installing pulseaudio with this patch, the other side still
cannot hear me. I am posting this work so that others can just run
pulseaudio on sxmo and find out what's causing this bug.

Note by ollieparanoid: while it doesn't fix the bug completely, it seems
it's required to make calling work again, something we definitively want
to have in v22.12 so I'm merging this now. Also the sxmo-utils patch was
merged to sxmo-utils upstream, but isn't in alpine yet. Adding this
package (previous patch) temporarily makes sense.

Co-developed-by: Oliver Smith <ollieparanoid@postmarketos.org>
[ci:skip-vercheck]: pkg forked from alpine has pkgrel > 0
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Anjandev Momi 2022-12-10 16:30:12 -08:00 committed by Oliver Smith
parent 3ff8cfa528
commit 8c466207dd
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 30 additions and 5 deletions

View file

@ -0,0 +1,28 @@
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=sxmo-common-audio
pkgver=1.0.0
pkgrel=0
pkgdesc="SXMO/SWMO audio backends"
url="http://sr.ht/~mil/Sxmo"
arch="noarch !armhf"
license="MIT"
subpackages="$pkgname-pipewire $pkgname-pulse"
options="!check" # has no tests
package() {
mkdir -p "$pkgdir"
}
pipewire() {
provides="sxmo-common-audio"
provider_priority="20"
depends="pipewire-pulse pipewire wireplumber"
mkdir -p "$subpkgdir"
}
pulse() {
provides="sxmo-common-audio"
provider_priority="10"
depends="pulseaudio pulseaudio-alsa !pipewire-pulse !sxmo-common-bluetooth !pipewire-alsa"
mkdir -p "$subpkgdir"
}

View file

@ -2,7 +2,7 @@
# Maintainer: Miles Alan <m@milesalan.com> # Maintainer: Miles Alan <m@milesalan.com>
pkgname=sxmo-common pkgname=sxmo-common
pkgver=1.11.0 pkgver=1.11.0
pkgrel=0 pkgrel=1
pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments" pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments"
url="http://sr.ht/~mil/Sxmo" url="http://sr.ht/~mil/Sxmo"
arch="noarch !armhf" arch="noarch !armhf"
@ -38,14 +38,13 @@ depends="
networkmanager-wifi networkmanager-wifi
networkmanager-wwan networkmanager-wwan
pamixer pamixer
pipewire
pipewire-pulse
pn pn
polkit polkit
polkit-openrc polkit-openrc
postmarketos-base-ui postmarketos-base-ui
pulseaudio-utils pulseaudio-utils
superd superd
sxmo-common-audio
sxmo-utils sxmo-utils
sxmo-utils-openrc sxmo-utils-openrc
terminus-font terminus-font
@ -55,7 +54,6 @@ depends="
v4l-utils v4l-utils
vim vim
vvmd vvmd
wireplumber
xdg-user-dirs xdg-user-dirs
yt-dlp yt-dlp
" "
@ -98,7 +96,6 @@ bluetooth() {
provides="postmarketos-ui-sxmo-bluetooth=$pkgver-r$pkgrel" provides="postmarketos-ui-sxmo-bluetooth=$pkgver-r$pkgrel"
} }
sha512sums=" sha512sums="
bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 sxmo-qt-mobile-controls.sh bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 sxmo-qt-mobile-controls.sh
cc4e4404b135ce484e0976b243973e39f1137aa9dd5e9297f767b2ea65b719ca82e84cc66cb093950ce330dbf786981ced2e5b0d16350deb5706a08ffccb4606 postmarketos.conf cc4e4404b135ce484e0976b243973e39f1137aa9dd5e9297f767b2ea65b719ca82e84cc66cb093950ce330dbf786981ced2e5b0d16350deb5706a08ffccb4606 postmarketos.conf