From ed39ad7319b9c4bd26365052dabf40efdc0ebe79 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 22 Jun 2021 15:30:20 -0700 Subject: [PATCH] device-purism-librem5: add workaround for ucm2 breaking audio (MR 2267) For reference: https://source.puri.sm/Librem5/librem5-base/-/issues/48 [ci:skip-build] already built successfully in CI --- ...em5.pa-rename-sinks-for-alsa-ucm-con.patch | 42 +++++++++++++++++++ device/main/device-purism-librem5/APKBUILD | 4 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 device/main/device-purism-librem5/0002-audio-pulse-librem5.pa-rename-sinks-for-alsa-ucm-con.patch diff --git a/device/main/device-purism-librem5/0002-audio-pulse-librem5.pa-rename-sinks-for-alsa-ucm-con.patch b/device/main/device-purism-librem5/0002-audio-pulse-librem5.pa-rename-sinks-for-alsa-ucm-con.patch new file mode 100644 index 000000000..e1cd19689 --- /dev/null +++ b/device/main/device-purism-librem5/0002-audio-pulse-librem5.pa-rename-sinks-for-alsa-ucm-con.patch @@ -0,0 +1,42 @@ +From cd9a517ca3ad3c0f263a25f575452f125b715138 Mon Sep 17 00:00:00 2001 +From: Clayton Craft +Date: Tue, 22 Jun 2021 15:25:22 -0700 +Subject: [PATCH] audio/pulse/librem5.pa: rename sinks for alsa-ucm-conf 1.2.5 + +--- + default/audio/pulse/librem5.pa | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/default/audio/pulse/librem5.pa b/default/audio/pulse/librem5.pa +index 69cd5eb..aeb11c7 100644 +--- a/default/audio/pulse/librem5.pa ++++ b/default/audio/pulse/librem5.pa +@@ -2,9 +2,9 @@ + + # devkit + .ifexists /sys/devices/platform/sound/308b0000.sai-sgtl5000 +-set-default-sink alsa_output.platform-sound.HiFi__hw_Devkit_0__sink +-set-default-source alsa_input.platform-sound.HiFi__hw_Devkit_0__source +-update-source-proplist alsa_input.platform-sound.HiFi__hw_Devkit_0__source filter.apply.echo-cancel.parameters="channels=1 use_master_format=yes aec_args=\"analog_gain_control=0 voice_detection=0 high_pass_filter=0 noise_suppression=0\"" ++set-default-sink alsa_output.platform-sound.VoiceCall___ucm0001.hw_CARD_sgtl5000__sink ++set-default-source alsa_input.platform-sound.VoiceCall___ucm0001.hw_CARD_sgtl5000__source ++update-source-proplist alsa_input.platform-sound.VoiceCall___ucm0001.hw_CARD_sgtl5000__source filter.apply.echo-cancel.parameters="channels=1 use_master_format=yes aec_args=\"analog_gain_control=0 voice_detection=0 high_pass_filter=0 noise_suppression=0\"" + .endif + + # phone +@@ -14,9 +14,9 @@ load-module module-alsa-card device_id="Modem" name="platform-sound-wwan" card_p + + .ifexists /sys/devices/platform/sound/308b0000.sai-wm8962 + set-card-profile alsa_card.platform-sound HiFi +-set-default-sink alsa_output.platform-sound.HiFi__hw_L5_0__sink +-set-default-source alsa_input.platform-sound.HiFi__hw_L5_0__source +-update-source-proplist alsa_input.platform-sound.HiFi__hw_L5_0__source filter.apply.echo-cancel.parameters="channels=1 use_master_format=yes aec_args=\"analog_gain_control=0 voice_detection=0 high_pass_filter=0 noise_suppression=0\"" ++set-default-sink alsa_output.platform-sound.HiFi___ucm0001.hw_L5_0__sink ++set-default-source alsa_input.platform-sound.HiFi___ucm0001.hw_L5_0__source ++update-source-proplist alsa_input.platform-sound.HiFi___ucm0001.hw_L5_0__source filter.apply.echo-cancel.parameters="channels=1 use_master_format=yes aec_args=\"analog_gain_control=0 voice_detection=0 high_pass_filter=0 noise_suppression=0\"" + .endif + + # cork/mute audio streams when on a phone call +-- +2.32.0 + diff --git a/device/main/device-purism-librem5/APKBUILD b/device/main/device-purism-librem5/APKBUILD index e160b3944..85941bb64 100644 --- a/device/main/device-purism-librem5/APKBUILD +++ b/device/main/device-purism-librem5/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Bhushan Shah pkgname=device-purism-librem5 pkgdesc="Purism Librem 5 Phone" -pkgver=1.22 +pkgver=1.23 pkgrel=0 _confver=38 _purismrel=1 @@ -41,6 +41,7 @@ source=" uboot-script.cmd xorg.conf 0001-librem5-pm.udev-disable-PM-for-broadmobi-modem.patch + 0002-audio-pulse-librem5.pa-rename-sinks-for-alsa-ucm-con.patch " subpackages=" $pkgname-phosh @@ -143,4 +144,5 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f aa06920d47ca3781d76473a8a4efebd243ebb1c1d81e1714ef5ade3fed91e0a7a7113e5fa00c7c77163556745962e57102469517f9ea3ad868bc4033387bf428 uboot-script.cmd 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616 xorg.conf f535b43b8defe75e72049e4eee181bfe821f6304a096413bccf6d08c8bb11b947fa1fee305af85616abd778745fadd52ebd610c2d135a4f907915b99ab2c526a 0001-librem5-pm.udev-disable-PM-for-broadmobi-modem.patch +6420866a32ee6094cfc7da59ab0c4b1d4db940ce7ab9c1d7e92fb3646284d48c60908f001507a543fef47ae3be195c815ab77510e7fb169cd16464478a72d2a8 0002-audio-pulse-librem5.pa-rename-sinks-for-alsa-ucm-con.patch "