pinebookpro-base: drop firmware dep, use ALSA UCM

Pinebook Pro kernel no longer supports video output via altmode dp, and
that was the only reason to install the linux-firmware dependency.

Replace the asound.state file with a dependency on ALSA UCM, which now
supports the Pinebook Pro.

srcpkgs/pinebookpro-base/files/asound.state

@@ -1,430 +0,0 @@
-state.rockchipes8316c {
-	control.1 {
-		iface CARD
-		name 'Headphones Jack'
-		value false
-		comment {
-			access read
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 2
-		value.1 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 3'
-			dbmin -4800
-			dbmax 0
-			dbvalue.0 -1200
-			dbvalue.1 -1200
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Headphone Mixer Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 11'
-			dbmin -1200
-			dbmax 0
-			dbvalue.0 -1200
-			dbvalue.1 -1200
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Playback Polarity'
-		value 'R Invert'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 Normal
-			item.1 'R Invert'
-			item.2 'L Invert'
-			item.3 'L + R Invert'
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'DAC Playback Volume'
-		value.0 192
-		value.1 192
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 192'
-			dbmin -9999999
-			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'DAC Soft Ramp Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'DAC Soft Ramp Rate'
-		value 4
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 4'
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'DAC Notch Filter Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'DAC Double Fs Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.10 {
-		iface MIXER
-		name 'DAC Stereo Enhancement'
-		value 5
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-		}
-	}
-	control.11 {
-		iface MIXER
-		name 'DAC Mono Mix Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.12 {
-		iface MIXER
-		name 'Capture Polarity'
-		value Normal
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 Normal
-			item.1 Invert
-		}
-	}
-	control.13 {
-		iface MIXER
-		name 'Mic Boost Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.14 {
-		iface MIXER
-		name 'ADC Capture Volume'
-		value 192
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 192'
-			dbmin -9999999
-			dbmax 0
-			dbvalue.0 0
-		}
-	}
-	control.15 {
-		iface MIXER
-		name 'ADC PGA Gain Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 10'
-		}
-	}
-	control.16 {
-		iface MIXER
-		name 'ADC Soft Ramp Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.17 {
-		iface MIXER
-		name 'ADC Double Fs Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.18 {
-		iface MIXER
-		name 'ALC Capture Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.19 {
-		iface MIXER
-		name 'ALC Capture Max Volume'
-		value 28
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 28'
-			dbmin -650
-			dbmax 3550
-			dbvalue.0 3550
-		}
-	}
-	control.20 {
-		iface MIXER
-		name 'ALC Capture Min Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 28'
-			dbmin -1200
-			dbmax 3000
-			dbvalue.0 -1200
-		}
-	}
-	control.21 {
-		iface MIXER
-		name 'ALC Capture Target Volume'
-		value 11
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 10'
-			dbmin -1650
-			dbmax -150
-			dbvalue.0 0
-		}
-	}
-	control.22 {
-		iface MIXER
-		name 'ALC Capture Hold Time'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 10'
-		}
-	}
-	control.23 {
-		iface MIXER
-		name 'ALC Capture Decay Time'
-		value 3
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 10'
-		}
-	}
-	control.24 {
-		iface MIXER
-		name 'ALC Capture Attack Time'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 10'
-		}
-	}
-	control.25 {
-		iface MIXER
-		name 'ALC Capture Noise Gate Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.26 {
-		iface MIXER
-		name 'ALC Capture Noise Gate Threshold'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 31'
-		}
-	}
-	control.27 {
-		iface MIXER
-		name 'ALC Capture Noise Gate Type'
-		value 'Constant PGA Gain'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'Constant PGA Gain'
-			item.1 'Mute ADC Output'
-		}
-	}
-	control.28 {
-		iface MIXER
-		name 'Differential Mux'
-		value lin1-rin1
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 lin1-rin1
-			item.1 lin2-rin2
-			item.2 'lin1-rin1 with 20db Boost'
-			item.3 'lin2-rin2 with 20db Boost'
-		}
-	}
-	control.29 {
-		iface MIXER
-		name 'Digital Mic Mux'
-		value 'dmic disable'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'dmic disable'
-			item.1 'dmic data at high level'
-			item.2 'dmic data at low level'
-		}
-	}
-	control.30 {
-		iface MIXER
-		name 'DAC Source Mux'
-		value 'LDATA TO LDAC, RDATA TO RDAC'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'LDATA TO LDAC, RDATA TO RDAC'
-			item.1 'LDATA TO LDAC, LDATA TO RDAC'
-			item.2 'RDATA TO LDAC, RDATA TO RDAC'
-			item.3 'RDATA TO LDAC, LDATA TO RDAC'
-		}
-	}
-	control.31 {
-		iface MIXER
-		name 'Left Headphone Mux'
-		value lin1-rin1
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 lin1-rin1
-			item.1 lin2-rin2
-			item.2 'lin-rin with Boost'
-			item.3 'lin-rin with Boost and PGA'
-		}
-	}
-	control.32 {
-		iface MIXER
-		name 'Right Headphone Mux'
-		value lin1-rin1
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 lin1-rin1
-			item.1 lin2-rin2
-			item.2 'lin-rin with Boost'
-			item.3 'lin-rin with Boost and PGA'
-		}
-	}
-	control.33 {
-		iface MIXER
-		name 'Left Headphone Mixer LLIN Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.34 {
-		iface MIXER
-		name 'Left Headphone Mixer Left DAC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.35 {
-		iface MIXER
-		name 'Right Headphone Mixer RLIN Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.36 {
-		iface MIXER
-		name 'Right Headphone Mixer Right DAC Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-}

srcpkgs/pinebookpro-base/template

@@ -1,19 +1,17 @@
 # Template file for 'pinebookpro-base'
 pkgname=pinebookpro-base
-version=0.4
+version=0.5
-revision=2
+revision=1
 archs="aarch64*"
 build_style=meta
-depends="pinebookpro-kernel linux-firmware pinebookpro-firmware
+depends="pinebookpro-kernel dracut pinebookpro-firmware pinebookpro-uboot
- pinebookpro-uboot dracut"
+ alsa-ucm-conf"
 short_desc="Void Linux Pinebook Pro platform package"
-maintainer="Renato Aguiar <renato@renatoaguiar.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
 license="Public Domain"
 homepage="https://www.voidlinux.org"
-mutable_files="/var/lib/alsa/asound.state"
 
 do_install() {
 	vinstall "${FILESDIR}/60-pinebookpro.rules" 644 usr/lib/udev/rules.d
 	vinstall "${FILESDIR}/10-pinebookpro.hwdb" 644 usr/lib/udev/hwdb.d
-	vinstall "${FILESDIR}/asound.state" 644 var/lib/alsa
 }