Changes - SailfishOS Open Build Service

Changes of Revision 76

[-] [+]	Changed	_service:tar_git:droid-config-pinephone.spec
@@ -92,7 +92,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1+master.20230324222053.8737c00 +Version: 1+master.20230325100820.808c088 %if 0%{?_obs_build_project:1} Release: 1 %else @@ -804,6 +804,7 @@ # sound Requires: alsa-utils +Requires: alsa-ucm-conf # Cameras Requires: v4l-utils
[-] [+]	Deleted	_service:tar_git:droid-config-pinephone-1+master.20230324222053.8737c00.tar.bz2/sparse/usr/share/alsa/ucm2/ucm.conf ^
@@ -1,166 +0,0 @@ -# -# This is the toplevel file included from the alsa-lib. -# -# It allows to add extra lookups for the old kernels or so. -# -# You may specify the directory (relative to the toplevel) and -# the master configuration file which defines the verbs. -# - -# -# Syntax version is reset for the master configuration file. -# - -Syntax 3 - -Define.V1 "" # non-empty string to enable ucm v1 paths -Define.V2ConfD yes # empty string to disable -Define.V2Module yes # non-empty string to enable module name lookups (obsolete) -Define.V2Name yes # non-empty string to enable driver & card name lookups (obsolete) - -If.driver { - Condition { - Type String - Empty "${CardNumber}" - } - True { - # - # The probed path for no-hw-card: - # - # ucm2/${OpenName}/${OpenName}.conf - # - UseCasePath { - legacy { - Directory "${OpenName}" - File "${OpenName}.conf" - } - } - } - False { - - # - # The probed path when hw-card is found: - # - # ucm2/conf.d/[${CardDriver}\|${KernelDriver}]/${CardLongName}.conf - # ucm2/conf.d/[${CardDriver}\|${KernelDriver}]/[${CardDriver}\|${KernelDriver}].conf - # ucm2/${KernelModule}/${KernelModule}.conf (obsolete) - # ucm2/${CardDriver}/${CardLongName}.conf (obsolete) - # ucm2/${CardDriver}/${CardDriver}.conf (obsolete) - # - - If.V2ConfD { - Condition { - Type String - Empty "${var:V2ConfD}" - } - False { - Define.Driver "${CardDriver}" - If.nodrv { - Condition { - Type String - Empty "${var:Driver}" - } - True.Define { - KernelDriverPath "class/sound/card${CardNumber}/device/driver" - Driver "${sys:$KernelDriverPath}" - } - } - UseCasePath.confd1 { - Directory "conf.d/${var:Driver}" - File "${CardLongName}.conf" - } - UseCasePath.confd2 { - Directory "conf.d/${var:Driver}" - File "${var:Driver}.conf" - } - } - } - If.V2Module { - Condition { - Type String - Empty "${var:V2Module}" - } - False { - Define.KernelModulePath "class/sound/card${CardNumber}/device/driver/module" - Define.KernelModule "$${sys:$KernelModulePath}" - UseCasePath.module { - Directory "module" - File "${var:KernelModule}.conf" - } - } - } - If.V2Name { - Condition { - Type String - Empty "${var:V2Name}" - } - False.UseCasePath { - longname { - Directory "${CardDriver}" - File "${CardLongName}.conf" - } - driver { - Directory "${CardDriver}" - File "${CardDriver}.conf" - } - } - } - } -} - -If.V1 { - Condition { - Type String - Empty "${var:V1}" - } - False.If.v1_driver { - Condition { - Type String - Empty "${CardNumber}" - } - True { - # - # The probed path for no-hw-card: - # - # ucm/${OpenName}/${OpenName}.conf - # - UseCasePath.v1_legacy { - Version 1 - Directory "${OpenName}" - File "${OpenName}.conf" - } - } - False { - # - # The ucm v1 probed path when hw-card is found: - # - # ucm/${CardLongName}/${CardLongName}.conf - # ucm/${CardName}/${CardName}.conf or \ - # ucm/${OpenName}/${OpenName}.conf - # - UseCasePath.v1_longname { - Version 1 - Directory "${CardLongName}" - File "${CardLongName}.conf" - } - If.v1_hw { - Condition { - Type String - Haystack "${OpenName}" - Needle "hw:" - } - True.UseCasePath.v1_cardnamme { - Version 1 - Directory "${CardName}" - File "${CardName}.conf" - } - False.UseCasePath.v1_openname { - Version 1 - Directory "${OpenName}" - File "${OpenName}.conf" - } - } - } - } -} -
[-] [+]	Changed	_service:tar_git:droid-config-pinephone-1+master.20230325100820.808c088.tar.bz2/patterns/patterns-sailfish-device-adaptation-pinephone.inc ^
@@ -69,6 +69,7 @@ # sound Requires: alsa-utils +Requires: alsa-ucm-conf # Cameras Requires: v4l-utils
[-] [+]	Changed	_service:tar_git:droid-config-pinephone-1+master.20230325100820.808c088.tar.bz2/sparse/etc/pulse/xpolicy.conf ^
@@ -32,11 +32,11 @@ card = alsa_card.0 card_profile_default = HiFi card_profile_voicecall = "Voice Call" -dev_sink = alsa_output.0.HiFi__hw_PinePhone_0__sink +dev_sink = alsa_input.0.HiFi___ucm0001.hw_PinePhone_0__sink sink_headset = "[Out] Headphones" sink_speaker = "[Out] Speaker" sink_earpiece = "[Out] Earpiece" -dev_source = alsa_input.0.HiFi__hw_PinePhone_0__source +dev_source = alsa_input.0.HiFi___ucm0001.hw_PinePhone_0__source source_headset = "[In] Headset" source_builtin_mic = "[In] Mic"
[-] [+]	Changed	_service:tar_git:droid-config-pinephone-1+master.20230325100820.808c088.tar.bz2/sparse/usr/share/alsa/ucm2/PinePhone/HiFi.conf ^
@@ -9,7 +9,7 @@ cset "name='Mic2 Playback Switch' off" cset "name='AIF1 DA0 Playback Volume' 160" cset "name='AIF3 ADC Source Capture Route' None" - cset "name='AIF2 DAC Source Playback Route' None" + cset "name='AIF2 DAC Source Playback Route' AIF2" cset "name='DAC Playback Switch' on" cset "name='DAC Playback Volume' 160" cset "name='ADC Digital DAC Playback Switch' off" @@ -99,6 +99,7 @@ CapturePriority 100 CapturePCM "hw:${CardId},0" CaptureChannels 2 + CaptureMixerElem "ADC" CaptureVolume "ADC Capture Volume" CaptureSwitch "Mic1 Capture Switch" } @@ -118,6 +119,7 @@ CapturePriority 500 CapturePCM "hw:${CardId},0" CaptureChannels 2 + CaptureMixerElem "ADC" CaptureVolume "ADC Capture Volume" CaptureSwitch "Mic2 Capture Switch" JackControl "Headset Microphone Jack"
[-] [+]	Added	_service:tar_git:droid-config-pinephone-1+master.20230325100820.808c088.tar.bz2/sparse/usr/share/alsa/ucm2/PinePhone/PinePhone.conf ^
@@ -0,0 +1,15 @@ +Syntax 2 + +# https://wiki.pine64.org/index.php/PinePhone +# https://files.pine64.org/doc/PinePhone/PinePhone%20v1.2%20Released%20Schematic.pdf +# https://xnux.eu/devices/feature/audio-pp.html + +SectionUseCase."HiFi" { + File "/PinePhone/HiFi.conf" + Comment "Play HiFi quality music" +} + +SectionUseCase."Voice Call" { + File "/PinePhone/VoiceCall.conf" + Comment "Make a phone call" +}
[-] [+]	Changed	_service:tar_git:droid-config-pinephone-1+master.20230325100820.808c088.tar.bz2/sparse/usr/share/alsa/ucm2/PinePhone/VoiceCall.conf ^
@@ -10,7 +10,7 @@ cset "name='AIF1 DA0 Playback Volume' 160" cset "name='AIF2 DAC Playback Volume' 160" cset "name='AIF3 ADC Source Capture Route' None" - cset "name='AIF2 DAC Source Playback Route' None" + cset "name='AIF2 DAC Source Playback Route' AIF2" cset "name='DAC Playback Switch' on" cset "name='DAC Playback Volume' 160" cset "name='ADC Digital DAC Playback Switch' off" @@ -22,11 +22,11 @@ cset "name='Line In Capture Switch' off" cset "name='Mic1 Capture Switch' off" - cset "name='Mic1 Boost Volume' 2" - cset "name='Mic1 Playback Volume' 4" + cset "name='Mic1 Boost Volume' 0" + cset "name='Mic1 Playback Volume' 7" cset "name='Mic2 Capture Switch' off" - cset "name='Mic2 Boost Volume' 2" - cset "name='Mic2 Playback Volume' 4" + cset "name='Mic2 Boost Volume' 0" + cset "name='Mic2 Playback Volume' 7" cset "name='Mixer Capture Switch' off" cset "name='Mixer Reversed Capture Switch' off" cset "name='ADC Capture Volume' 160" @@ -103,6 +103,7 @@ Value { CapturePriority 200 CapturePCM "hw:${CardId},0" + CaptureMixerElem "ADC" CaptureVolume "ADC Capture Volume" CaptureSwitch "Mic1 Capture Switch" CaptureChannels 2 @@ -123,6 +124,7 @@ CapturePriority 500 CapturePCM "hw:${CardId},0" CaptureChannels 2 + CaptureMixerElem "ADC" CaptureVolume "ADC Capture Volume" CaptureSwitch "Mic2 Capture Switch" JackControl "Headset Microphone Jack"
[-] [+]	Changed	_service:tar_git:droid-config-pinephone-1+master.20230325100820.808c088.tar.bz2/sparse/usr/share/alsa/ucm2/simple-card/PinePhone.conf ^
@@ -1,11 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "/PinePhone/HiFi.conf" - Comment "Play HiFi quality music" -} - -SectionUseCase."Voice Call" { - File "/PinePhone/VoiceCall.conf" - Comment "Make a phone call" -} +(symlink to /usr/share/alsa/ucm2/PinePhone/PinePhone.conf)