[arch-releng] FS#63166 - accessibility for blind and visual impaired users
Hello. sending a patch to support accessibility for the blind in arch-iso. I hope that everything is clear and correct.
--- configs/releng/packages.x86_64 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 46febfd..a8ed8fd 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,5 +1,7 @@ +alsa-utils arch-install-scripts b43-fwcutter +brltty broadcom-wl btrfs-progs clonezilla @@ -15,6 +17,7 @@ dnsmasq dnsutils dosfstools elinks +espeakup ethtool exfat-utils f2fs-tools -- 2.23.0
for sound activation and sound card selection. --- .../system/livecd-alsa-unmuter.service | 15 ++ .../airootfs/root/customize_airootfs.sh | 2 +- .../airootfs/usr/bin/livecd-alsa-unmuter | 8 + configs/releng/airootfs/usr/bin/pick-a-card | 54 +++++ configs/releng/airootfs/usr/bin/talk-to-me | 10 + .../usr/share/livecd-sound/asound.conf.in | 12 ++ .../airootfs/usr/share/livecd-sound/functions | 199 ++++++++++++++++++ 7 files changed, 299 insertions(+), 1 deletion(-) create mode 100644 configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service create mode 100755 configs/releng/airootfs/usr/bin/livecd-alsa-unmuter create mode 100755 configs/releng/airootfs/usr/bin/pick-a-card create mode 100755 configs/releng/airootfs/usr/bin/talk-to-me create mode 100644 configs/releng/airootfs/usr/share/livecd-sound/asound.conf.in create mode 100644 configs/releng/airootfs/usr/share/livecd-sound/functions diff --git a/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service new file mode 100644 index 0000000..73a4d2e --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/livecd-alsa-unmuter.service @@ -0,0 +1,15 @@ +[Unit] +Description=Unmute All Sound Card Controls For Use With The Live TalkingArch Environment +# This needs to run after the audio device becomes available. +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service sound.target +DefaultDependencies=no +Before=shutdown.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/livecd-alsa-unmuter +StandardOutput=syslog + +[Install] +WantedBy=sound.target diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index bf5210c..697555b 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -19,5 +19,5 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf -systemctl enable pacman-init.service choose-mirror.service +systemctl enable pacman-init.service choose-mirror.service livecd-alsa-unmuter.service brltty.service systemctl set-default multi-user.target diff --git a/configs/releng/airootfs/usr/bin/livecd-alsa-unmuter b/configs/releng/airootfs/usr/bin/livecd-alsa-unmuter new file mode 100755 index 0000000..6de05a0 --- /dev/null +++ b/configs/releng/airootfs/usr/bin/livecd-alsa-unmuter @@ -0,0 +1,8 @@ +#!/bin/bash + +# Properly initialize the sound card so that we have audio at boot. +# This script is released under the GNU General Public License. +source /usr/share/livecd-sound/functions + +preinit_levels all +sanify_levels all diff --git a/configs/releng/airootfs/usr/bin/pick-a-card b/configs/releng/airootfs/usr/bin/pick-a-card new file mode 100755 index 0000000..7f469e8 --- /dev/null +++ b/configs/releng/airootfs/usr/bin/pick-a-card @@ -0,0 +1,54 @@ +#!/bin/bash + +# If there are multiple usable sound cards, prompt the user to choose one, +# using auditory feedback. +# This script is released under the GNU General Public License. + +source /usr/share/livecd-sound/functions + +nwords() { + echo $# +} + +is_numeric() { + local str=$1 + expr match "$str" '[[:digit:]]\+$' > /dev/null 2>&1 +} + +set_default_card() { + local card=$1 + sed -e "s/%card%/$card/g" < /usr/share/livecd-sound/asound.conf.in \ + > /etc/asound.conf +} + +play_on_card() { + local card=$1 file=$2 + aplay "-Dplughw:$card,0" "$file" +} + +set -f +usable_cards="$(list_non_pcsp_cards)" +num_usable_cards=$(nwords $usable_cards) + +if [ "$num_usable_cards" -eq 1 ]; then + exit 0 +fi + +for card in $usable_cards; do + if ! is_numeric "$card"; then + continue + fi + play_on_card "$card" /usr/share/livecd-sound/sounds/pick-a-card.wav& +done +wait +sleep 1 +for card in $usable_cards; do + if ! is_numeric "$card"; then + continue + fi + play_on_card "$card" /usr/share/livecd-sound/sounds/beep.wav + if read -t 10; then + set_default_card "$card" + break + fi +done diff --git a/configs/releng/airootfs/usr/bin/talk-to-me b/configs/releng/airootfs/usr/bin/talk-to-me new file mode 100755 index 0000000..73998d8 --- /dev/null +++ b/configs/releng/airootfs/usr/bin/talk-to-me @@ -0,0 +1,10 @@ +#!/bin/sh +started_flag=/run/speech-is-running +if [ -f $started_flag ]; then + exit 0 +fi +systemctl stop espeakup +sleep 5 +pick-a-card +systemctl start espeakup +touch $started_flag diff --git a/configs/releng/airootfs/usr/share/livecd-sound/asound.conf.in b/configs/releng/airootfs/usr/share/livecd-sound/asound.conf.in new file mode 100644 index 0000000..851f829 --- /dev/null +++ b/configs/releng/airootfs/usr/share/livecd-sound/asound.conf.in @@ -0,0 +1,12 @@ +pcm.!default { + type plug + slave.pcm { + type hw + card %card% + } +} + +ctl.!default { + type hw + card %card% +} diff --git a/configs/releng/airootfs/usr/share/livecd-sound/functions b/configs/releng/airootfs/usr/share/livecd-sound/functions new file mode 100644 index 0000000..e517795 --- /dev/null +++ b/configs/releng/airootfs/usr/share/livecd-sound/functions @@ -0,0 +1,199 @@ +# Functions for setting up sound on the live CD. +# This library is released under the GNU General Public License, +# and it incorporates code from the /etc/init.d/alsa-utils included with +# Ubuntu 8.04. Proper credit also goes to Debian. + +# Start code copied from Debian / Ubuntu: + +bugout () { + printf "/etc/rc.d/livecdsound: programming error" + stat_fail +} + +echo_card_indices() +{ + if [ -f /proc/asound/cards ] ; then + sed -n -e's/^[[:space:]]*\([0-7]\)[[:space:]].*/\1/p' /proc/asound/cards + fi +} + +filter_amixer_output() +{ + sed \ + -e '/Unable to find simple control/d' \ + -e '/Unknown playback setup/d' \ + -e '/^$/d' +} + +# The following functions try to set many controls. +# No card has all the controls and so some of the attempts are bound to fail. +# Because of this, the functions can't return useful status values. + +# $1 <control> +# $2 <level> +# $CARDOPT +unmute_and_set_level() +{ + { [ "$2" ] && [ "$CARDOPT" ] ; } || bugout + amixer $CARDOPT -q set "$1" "$2" unmute 2>&1 | filter_amixer_output || : + return 0 +} + +# $1 <control> +# $CARDOPT +mute_and_zero_level() +{ + { [ "$1" ] && [ "$CARDOPT" ] ; } || bugout + amixer $CARDOPT -q set "$1" "0%" mute 2>&1 | filter_amixer_output || : + return 0 +} + +# $1 <control> +# $2 "on" | "off" +# $CARDOPT +switch_control() +{ + { [ "$2" ] && [ "$CARDOPT" ] ; } || bugout + amixer $CARDOPT -q set "$1" "$2" 2>&1 | filter_amixer_output || : + return 0 +} + +# $1 <card ID> +sanify_levels_on_card() +{ + CARDOPT="-c $1" + + unmute_and_set_level "Front" "80%" + unmute_and_set_level "Master" "80%" + unmute_and_set_level "Master Mono" "80%" + unmute_and_set_level "Master Digital" "80%" # E.g., cs4237B + unmute_and_set_level "Playback" "80%" + unmute_and_set_level "Headphone" "100%" + unmute_and_set_level "PCM" "80%" + unmute_and_set_level "PCM,1" "80%" # E.g., ess1969 + unmute_and_set_level "DAC" "80%" # E.g., envy24, cs46xx + unmute_and_set_level "DAC,0" "80%" # E.g., envy24 + unmute_and_set_level "DAC,1" "80%" # E.g., envy24 + unmute_and_set_level "Synth" "80%" + unmute_and_set_level "CD" "80%" + unmute_and_set_level "PC Speaker" "100%" + + mute_and_zero_level "Mic" + mute_and_zero_level "IEC958" # Ubuntu #19648 + + # Intel P4P800-MX + switch_control "Master Playback Switch" on + switch_control "Master Surround" on + + # Trident/YMFPCI/emu10k1: + unmute_and_set_level "Wave" "80%" + unmute_and_set_level "Music" "80%" + unmute_and_set_level "AC97" "80%" + + # DRC: + unmute_and_set_level "Dynamic Range Compression" "80%" + + # Required for HDA Intel (hda-intel): + unmute_and_set_level "Front" "80%" + + # Required for SB Live 7.1/24-bit (ca0106): + unmute_and_set_level "Analog Front" "80%" + + # Required at least for Via 823x hardware on DFI K8M800-MLVF Motherboard + switch_control "IEC958 Capture Monitor" off + + # Required for hardware allowing toggles for AC97 through IEC958, + # valid values are 0, 1, 2, 3. Needs to be set to 0 for PCM1. + unmute_and_set_level "IEC958 Playback AC97-SPSA" "0" + + # Required for newer Via hardware + unmute_and_set_level "VIA DXS,0" "80%" + unmute_and_set_level "VIA DXS,1" "80%" + unmute_and_set_level "VIA DXS,2" "80%" + unmute_and_set_level "VIA DXS,3" "80%" + + # Required on some notebooks with ICH4: + switch_control "Headphone Jack Sense" off + switch_control "Line Jack Sense" off + + # Some machines need one or more of these to be on; + # others need one or more of these to be off: + # + # switch_control "External Amplifier" on + switch_control "Audigy Analog/Digital Output Jack" on + switch_control "SB Live Analog/Digital Output Jack" on + + # D1984 -- Thinkpad T61/X61 + switch_control "Speaker" on + switch_control "Headphone" on + + # HDA-Intel w/ "Digital" capture mixer (See Ubuntu #193823) + unmute_and_set_level "Digital" "80%" + + return 0 +} + +# $1 <card ID> | "all" +sanify_levels() +{ + TTSDML_RETURNSTATUS=0 + case "$1" in + all) + for CARD in $(echo_card_indices) ; do + sanify_levels_on_card "$CARD" || TTSDML_RETURNSTATUS=1 + done + ;; + *) + sanify_levels_on_card "$1" || TTSDML_RETURNSTATUS=1 + ;; + esac + return $TTSDML_RETURNSTATUS +} + +# $1 <card ID> +preinit_levels_on_card() +{ + CARDOPT="-c $1" + + # Silly dance to activate internal speakers by default on PowerMac + # Snapper and Tumbler + id=`cat /proc/asound/card$1/id 2>/dev/null` + if [ "$id" = "Snapper" -o "$id" = "Tumbler" ]; then + switch_control "Auto Mute" off + switch_control "PC Speaker" off + switch_control "Auto Mute" on + fi +} + +# $1 <card ID> | "all" +preinit_levels() +{ + TTSDML_RETURNSTATUS=0 + case "$1" in + all) + for CARD in $(echo_card_indices) ; do + preinit_levels_on_card "$CARD" || TTSDML_RETURNSTATUS=1 + done + ;; + *) + preinit_levels_on_card "$1" || TTSDML_RETURNSTATUS=1 + ;; + esac + return $TTSDML_RETURNSTATUS +} + +# End copied code. + +# List all cards that *should* be usable for PCM audio. In my experience, +# the console speaker (handled by the pcsp driver) isn't a suitable playback +# device, so we'll exclude it. +list_non_pcsp_cards() +{ + for card in $(echo_card_indices); do + local cardfile="/proc/asound/card${card}/id" + if [ -r "$cardfile" -a -f "$cardfile" ] && \ + [ "$(cat "$cardfile")" != pcsp ]; then + echo "$card" + fi + done +} -- 2.23.0
to indicate the sound card selection.
---
.../usr/share/livecd-sound/sounds/beep.wav | Bin 0 -> 192080 bytes
.../share/livecd-sound/sounds/pick-a-card.wav | Bin 0 -> 121460 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 configs/releng/airootfs/usr/share/livecd-sound/sounds/beep.wav
create mode 100644 configs/releng/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav
diff --git a/configs/releng/airootfs/usr/share/livecd-sound/sounds/beep.wav b/configs/releng/airootfs/usr/share/livecd-sound/sounds/beep.wav
new file mode 100644
index 0000000000000000000000000000000000000000..495f90b920c608b0d8887e297da564552443d1f0
GIT binary patch
literal 192080
zcmeI5c{tVi`~Q)mBwJc!og`zVnwGI9OV%h6DP>Dqbd)1HIE$S^(JrA-Dv`AilPxXN
zsF1{vkdGvhCOO5|^Yi!b^T+S{eXr~L{e3?7T-RJPl{n|M-1q%{ocn%0w^*8)S$q@{
za58e-u;-w^vbunPz{I4W0Iz)Nf2Mw4SU_1|-qgRsQ@<3P`d2_eQh+BQa6>@*;^95+
zp8oiKeC=*`e|LO6{*f@=B~oZyGN-XlaNf`bU4`A3wyUPs?D)k@PWxBwKl`=gRva+g
zSzfXsWL~}X_@Z-mQSB;DX&D|aC;1NU2Kl32`7H+fnNKts>1!$vm(LmUH@|!@P&`gG
zXi2SV$nCS`Z0j3+oK*tZT!k-uZjDhlSDwF;nWW9^$YUY_EcBQ&%1
zwM^HJeHfeh+e`1utd}!ipl8*eZcOj>GW>a;$AJ%W?uR^mka7CWxYvy`$7a6IN+>w(
zF{1=w5Uyu5^~riKG1f6UWOw-ba3TC~_>J&cp(xlA)T+X(kfY)2!WLIZu
--- configs/releng/airootfs/root/.zlogin | 6 ++++++ configs/releng/build.sh | 1 + configs/releng/isolinux/BEEP | 1 + configs/releng/isolinux/isolinux.cfg | 1 + configs/releng/syslinux/archiso_head.cfg | 1 + configs/releng/syslinux/archiso_sys.cfg | 11 +++++++++++ 6 files changed, 21 insertions(+) create mode 100644 configs/releng/isolinux/BEEP diff --git a/configs/releng/airootfs/root/.zlogin b/configs/releng/airootfs/root/.zlogin index f598e43..1e88269 100644 --- a/configs/releng/airootfs/root/.zlogin +++ b/configs/releng/airootfs/root/.zlogin @@ -1 +1,7 @@ +if [ -n "$(grep -oP 'speakup.synth=\K\S+' /proc/cmdline)" ] +then + setopt singlelinezle + flock -n /run/talk-to-me.lck talk-to-me +fi ~/.automated_script.sh + diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 659e8de..67cab58 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -145,6 +145,7 @@ make_syslinux() { make_isolinux() { mkdir -p ${work_dir}/iso/isolinux sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg + cp ${script_path}/isolinux/BEEP ${work_dir}/iso/isolinux/ cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ diff --git a/configs/releng/isolinux/BEEP b/configs/releng/isolinux/BEEP new file mode 100644 index 0000000..7149f57 --- /dev/null +++ b/configs/releng/isolinux/BEEP @@ -0,0 +1 @@ + diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg index 10fd285..a469492 100644 --- a/configs/releng/isolinux/isolinux.cfg +++ b/configs/releng/isolinux/isolinux.cfg @@ -1,3 +1,4 @@ +DISPLAY BEEP PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index 81ad26e..4b96d0b 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -23,3 +23,4 @@ MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std MENU COLOR msg07 37;40 #90ffffff #a0000000 std MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU IMMEDIATE diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index a35a1ea..335422c 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -10,4 +10,15 @@ LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +# accessability boot option +LABEL arch64speatch +TEXT HELP +Boot the Arch Linux (x86_64) live medium with speakup enabled. +It allows you to install Arch Linux or perform system maintenance using speatch feedback. +ENDTEXT +MENU LABEL Boot Arch Linux (x86_64) with ^speatch +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% speakup.synth=soft + INCLUDE boot/syslinux/archiso_tail.cfg -- 2.23.0
--- configs/releng/build.sh | 6 ++++++ .../efiboot/loader/entries/archiso-x86_64-speech-cd.conf | 6 ++++++ .../efiboot/loader/entries/archiso-x86_64-speech-usb.conf | 6 ++++++ configs/releng/efiboot/loader/loader.conf | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 67cab58..d902e67 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -167,6 +167,9 @@ make_efi() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g" \ + ${script_path}/efiboot/loader/entries/archiso-x86_64-speech-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64-speech.conf # EFI Shell 2.0 for UEFI 2.3+ curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/ShellBinPkg/UefiShe... @@ -204,6 +207,9 @@ make_efiboot() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g" \ + ${script_path}/efiboot/loader/entries/archiso-x86_64-speech-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64-speech.conf cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/ diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf new file mode 100644 index 0000000..7cfe90c --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf @@ -0,0 +1,6 @@ +title speakup Arch Linux archiso x86_64 UEFI CD +linux /EFI/archiso/vmlinuz.efi +initrd /EFI/archiso/intel_ucode.img +initrd /EFI/archiso/amd_ucode.img +initrd /EFI/archiso/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% speakup.synth=soft diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf new file mode 100644 index 0000000..1ac83d8 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf @@ -0,0 +1,6 @@ +title speakup Arch Linux archiso x86_64 UEFI USB +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz +initrd /%INSTALL_DIR%/boot/intel_ucode.img +initrd /%INSTALL_DIR%/boot/amd_ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% speakup.synth=soft diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 62c4a83..39f105f 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,2 +1,2 @@ -timeout 3 +timeout 5 default archiso-x86_64 -- 2.23.0
participants (1)
-
Alexandr Epaneshnikov