From 64ab8ce76b2586d06dce48fb16368a088ce0d2fa Mon Sep 17 00:00:00 2001 From: Anton Bambura Date: Sat, 2 Jul 2022 07:31:00 +0300 Subject: [PATCH] temp/alsa-ucm-conf-google-veyron: drop (MR 3270) --- .../device-google-veyron-jerry/APKBUILD | 4 +- .../device-google-veyron-minnie/APKBUILD | 4 +- .../device-google-veyron-speedy/APKBUILD | 4 +- temp/alsa-ucm-conf-google-veyron/APKBUILD | 22 ---- temp/alsa-ucm-conf-google-veyron/HiFi.conf | 122 ------------------ .../VEYRON-I2S.conf | 8 -- 6 files changed, 6 insertions(+), 158 deletions(-) delete mode 100644 temp/alsa-ucm-conf-google-veyron/APKBUILD delete mode 100644 temp/alsa-ucm-conf-google-veyron/HiFi.conf delete mode 100644 temp/alsa-ucm-conf-google-veyron/VEYRON-I2S.conf diff --git a/device/testing/device-google-veyron-jerry/APKBUILD b/device/testing/device-google-veyron-jerry/APKBUILD index e828ed71d..7dd4bc976 100644 --- a/device/testing/device-google-veyron-jerry/APKBUILD +++ b/device/testing/device-google-veyron-jerry/APKBUILD @@ -3,13 +3,13 @@ pkgname=device-google-veyron-jerry pkgdesc="Google Veyron Jerry Chromebook" pkgver=0.6 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" - alsa-ucm-conf-google-veyron + alsa-ucm-conf>=1.2.7.1-r0 linux-postmarketos-rockchip mesa-dri-gallium postmarketos-base diff --git a/device/testing/device-google-veyron-minnie/APKBUILD b/device/testing/device-google-veyron-minnie/APKBUILD index f17f9138b..5bf2290ed 100644 --- a/device/testing/device-google-veyron-minnie/APKBUILD +++ b/device/testing/device-google-veyron-minnie/APKBUILD @@ -4,14 +4,14 @@ pkgname=device-google-veyron-minnie pkgdesc="ASUS Chromebook Flip C100" pkgver=1 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" # pmb:strict: avoid grub-related install error during build with pmbootstrap options="!check !archcheck pmb:strict" depends=" - alsa-ucm-conf-google-veyron + alsa-ucm-conf>=1.2.7.1-r0 linux-postmarketos-rockchip u-boot-veyron-minnie mesa-dri-gallium diff --git a/device/testing/device-google-veyron-speedy/APKBUILD b/device/testing/device-google-veyron-speedy/APKBUILD index bbf335f72..58f2a79a5 100644 --- a/device/testing/device-google-veyron-speedy/APKBUILD +++ b/device/testing/device-google-veyron-speedy/APKBUILD @@ -3,14 +3,14 @@ pkgname=device-google-veyron-speedy pkgdesc="ASUS Chromebook C201" pkgver=1 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" # pmb:strict: avoid grub-related install error during build with pmbootstrap options="!check !archcheck pmb:strict" depends=" - alsa-ucm-conf-google-veyron + alsa-ucm-conf>=1.2.7.1-r0 linux-postmarketos-rockchip u-boot-veyron-speedy mesa-dri-gallium diff --git a/temp/alsa-ucm-conf-google-veyron/APKBUILD b/temp/alsa-ucm-conf-google-veyron/APKBUILD deleted file mode 100644 index 9669ceb86..000000000 --- a/temp/alsa-ucm-conf-google-veyron/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# A temporary package to include https://github.com/alsa-project/alsa-ucm-conf/pull/164 -# Maintainer: Jenneron -pkgname=alsa-ucm-conf-google-veyron -pkgver=1 -pkgrel=0 -pkgdesc="ALSA Use Case Manager configuration for Google Veyron Chromebooks" -url="https://alsa-project.org" -arch="noarch" -license="BSD-3-Clause" -source="VEYRON-I2S.conf HiFi.conf" -options="!check" # no tests -depends="alsa-ucm-conf" - -package() { - install -Dm644 VEYRON-I2S.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/VEYRON-I2S/VEYRON-I2S.conf - install -Dm644 HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/VEYRON-I2S/HiFi.conf -} - -sha512sums=" -8bb831b75bda07442c5c434e0b2280a059a66ea7c8ae092ddfff9ecb12dd7adc9cc6fa406188876b0661a7b438515926d17a02a696b209d0985278b3e73d1694 VEYRON-I2S.conf -e90e25fed8fdfed49b387ffd362826323835efb39c6dd77bc041b9555c31606d6c206354d00c211b892d2cb5b5497123db04a479dae03a1004c874822feb6f77 HiFi.conf -" diff --git a/temp/alsa-ucm-conf-google-veyron/HiFi.conf b/temp/alsa-ucm-conf-google-veyron/HiFi.conf deleted file mode 100644 index f2b6ab75a..000000000 --- a/temp/alsa-ucm-conf-google-veyron/HiFi.conf +++ /dev/null @@ -1,122 +0,0 @@ -SectionVerb { - Value { - MinBufferLevel "512" - } - - EnableSequence [ - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Headphone Left Switch' off" - cset "name='Headphone Right Switch' off" - cset "name='Digital EQ 3 Band Switch' off" - cset "name='Digital EQ 5 Band Switch' off" - cset "name='Digital EQ 7 Band Switch' off" - cset "name='Biquad Switch' off" - cset "name='Filter Mode' Music" - cset "name='ADC Oversampling Rate' 0" - - cset "name='DMIC Mux' DMIC" - cset "name='MIC2 Mux' IN34" - cset "name='Right ADC Mixer MIC2 Switch' on" - cset "name='Left ADC Mixer MIC2 Switch' on" - cset "name='MIC2 Volume' 20" - cset "name='Headset Mic Switch' off" - cset "name='Int Mic Switch' on" - - cset "name='ADCR Boost Volume' 4" - cset "name='ADCL Boost Volume' 4" - cset "name='ADCR Volume' 11" - cset "name='ADCL Volume' 11" - - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Speaker Left Mixer Volume' 2" - cset "name='Speaker Right Mixer Volume' 2" - cset "name='Record Path DC Blocking' on" - cset "name='Playback Path DC Blocking' on" - - cset "name='Speaker Left Switch' on" - cset "name='Speaker Right Switch' on" - cset "name='Speaker Switch' on" - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - PlaybackVolume "Speaker Volume" - } - - EnableSequence [ - cset "name='Speaker Switch' on" - ] - - DisableSequence [ - cset "name='Speaker Switch' off" - ] -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - cset "name='Int Mic Switch' on" - ] - - DisableSequence [ - cset "name='Int Mic Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - PlaybackVolume "Headphone Volume" - } - - EnableSequence [ - cset "name='Speaker Switch' off" - cset "name='Headphone Left Switch' on" - cset "name='Headphone Right Switch' on" - ] - DisableSequence [ - cset "name='Headphone Left Switch' off" - cset "name='Headphone Right Switch' off" - cset "name='Speaker Switch' on" - ] -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - cset "name='Int Mic Switch' off" - cset "name='DMIC Mux' ADC" - cset "name='Headset Mic Switch' on" - cset "name='Record Path DC Blocking' on" - ] - - DisableSequence [ - cset "name='Headset Mic Switch' off" - cset "name='DMIC Mux' DMIC" - cset "name='Int Mic Switch' on" - cset "name='Record Path DC Blocking' off" - ] -} diff --git a/temp/alsa-ucm-conf-google-veyron/VEYRON-I2S.conf b/temp/alsa-ucm-conf-google-veyron/VEYRON-I2S.conf deleted file mode 100644 index 670f15b82..000000000 --- a/temp/alsa-ucm-conf-google-veyron/VEYRON-I2S.conf +++ /dev/null @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "Rockchip Veyron card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -}