diff -pruN 1.2.8-1/debian/90-alsa-ucm.rules 1.2.8-1ubuntu1/debian/90-alsa-ucm.rules --- 1.2.8-1/debian/90-alsa-ucm.rules 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/90-alsa-ucm.rules 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1,14 @@ +SUBSYSTEM!="sound", GOTO="sound_end" +ACTION!="change", GOTO="sound_end" +KERNEL!="card*", GOTO="sound_end" + +ATTRS{id}=="PandaBoard", RUN+="/usr/bin/alsaucm -c PandaBoard set _verb HiFi" +ATTRS{id}=="PandaBoard", RUN+="/usr/bin/alsaucm -c PandaBoard set _verb Record" +ATTRS{id}=="PandaBoardES", RUN+="/usr/bin/alsaucm -c PandaBoardES set _verb HiFi" +ATTRS{id}=="PandaBoardES", RUN+="/usr/bin/alsaucm -c PandaBoardES set _verb Record" +ATTRS{id}=="SDP4430", RUN+="/usr/bin/alsaucm -c SDP4430 set _verb HiFi" +ATTRS{id}=="SDP4430", RUN+="/usr/bin/alsaucm -c SDP4430 set _verb Record" +ATTRS{id}=="tegraalc5632", RUN+="/usr/bin/alsaucm -c tegraalc5632" +ATTRS{id}=="DAISY-I2S", RUN+="/usr/bin/alsaucm -c DAISY-I2S set _verb HiFi" + +LABEL="sound_end" diff -pruN 1.2.8-1/debian/changelog 1.2.8-1ubuntu1/debian/changelog --- 1.2.8-1/debian/changelog 2022-11-30 17:36:16.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/changelog 2022-11-23 13:42:37.000000000 +0000 @@ -1,3 +1,12 @@ +alsa-utils (1.2.8-1ubuntu1) lunar; urgency=medium + + * Merge from Debian unstable (LP: #1997569). Remaining changes: + - add 4 patches unset_pulse_internal.patch, + add_extra_volume_defaults.patch, vmware_audio_volume.patch, + create_run_alsa.patch + + -- Nathan Pratta Teodosio Wed, 23 Nov 2022 10:42:37 -0300 + alsa-utils (1.2.8-1) unstable; urgency=medium * New upstream release. @@ -15,6 +24,15 @@ alsa-utils (1.2.7-1) unstable; urgency=m -- Jordi Mallach Wed, 06 Jul 2022 03:19:19 +0200 +alsa-utils (1.2.6-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - add 4 patches unset_pulse_internal.patch, + add_extra_volume_defaults.patch, vmware_audio_volume.patch, + create_run_alsa.patch + + -- Hui Wang Wed, 12 Jan 2022 15:13:36 +0000 + alsa-utils (1.2.6-1) unstable; urgency=medium * New upstream release. @@ -24,6 +42,16 @@ alsa-utils (1.2.6-1) unstable; urgency=m -- Jordi Mallach Wed, 12 Jan 2022 10:42:19 +0100 +alsa-utils (1.2.5.1-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Pick the change of 1.2.4-1ubuntu1 and minor changes on it, + drop 2 patches alsa-info_call_home.patch and + udev_test_alsactl.patch since unstable already has them, + and refresh the patch unset_pulse_internal.patch. + + -- Hui Wang Sat, 09 Oct 2021 17:14:15 +0000 + alsa-utils (1.2.5.1-1) unstable; urgency=low [ Jordi Mallach ] @@ -38,6 +66,52 @@ alsa-utils (1.2.5.1-1) unstable; urgency -- Jordi Mallach Thu, 26 Aug 2021 17:54:15 +0200 +alsa-utils (1.2.4-1ubuntu4) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:09:19 +0200 + +alsa-utils (1.2.4-1ubuntu3) hirsute; urgency=medium + + * d/p/0013-aplay-try-to-use-16-bit-format-to-increase-capture-q.patch + - aplay: try to use 16-bit format to increase capture quality + (LP: #1923841) + + -- Kai-Heng Feng Wed, 14 Apr 2021 16:27:22 +0800 + +alsa-utils (1.2.4-1ubuntu2) hirsute; urgency=medium + + * No-change rebuild to drop the udeb package. + + -- Matthias Klose Mon, 22 Feb 2021 10:30:00 +0100 + +alsa-utils (1.2.4-1ubuntu1) hirsute; urgency=medium + + * Resynchronize on Debian, remaining changes: + - Move init script volume settings to new alsactl database: + + Set sane level for 'Speaker' and 'Headphone', needed for Dell Mini 9 + and Dell E series + + Mute PC Beep on hda cards that support it during initial volume setup + + Mute *Analog/Digital Control for Creative cards by default + + Default Digital Input Source to be Digital Mic 1 so that users + with digital mic will be able to use it out of the box + + Mute "IEC958 Optical Raw" by default + + Set sane level for headphone 1 for Dell Studio XPS with 2.6.30 + + Prefer built-in digital mics on newer Dells + + Unmute 'Line HP Swap' for Dove boards + + Set reasonable volume levels for VMWare guests using snd.ens1371 + - debian/README.init.cs4236: Include in /usr/share/doc/alsa-utils so that + users of snd-cs4236 (e.g., ThinkPad 600) can have audible sound + - debian/patches/unset_pulse_internal.patch: We don't want alsamixer to + show the pulse mixer by default, since it can be controlled from + pulseaudio itself + - Add udev rule to apply UCM profiles for panda and equivalent hardware + - Put the daemon file in /var/lib/alsa + - Create /run/alsa directory so that systemd services don't fail + + -- Sebastien Bacher Mon, 11 Jan 2021 16:38:25 +0100 + alsa-utils (1.2.4-1) unstable; urgency=medium * New upstream release. @@ -1862,3 +1936,4 @@ alsautils (0.0.3-1) unstable; urgency=lo * Initial release -- Wichert Akkerman Sun, 7 Jun 1998 16:53:01 +0200 + diff -pruN 1.2.8-1/debian/control 1.2.8-1ubuntu1/debian/control --- 1.2.8-1/debian/control 2022-07-06 00:58:09.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/control 2022-11-23 13:42:37.000000000 +0000 @@ -1,7 +1,8 @@ Source: alsa-utils Section: sound Priority: optional -Maintainer: Debian ALSA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , Elimar Riesebieter , Luke Yelavich @@ -15,7 +16,7 @@ Build-Depends: debhelper-compat (= 13), python3-docutils, systemd, xmlto -Standards-Version: 4.6.1 +Standards-Version: 4.6.0 Homepage: https://www.alsa-project.org/ Vcs-Git: https://salsa.debian.org/alsa-team/alsa-utils.git Vcs-Browser: https://salsa.debian.org/alsa-team/alsa-utils diff -pruN 1.2.8-1/debian/docs 1.2.8-1ubuntu1/debian/docs --- 1.2.8-1/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/docs 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1 @@ +debian/README.init.cs4236 diff -pruN 1.2.8-1/debian/patches/add_extra_volume_defaults.patch 1.2.8-1ubuntu1/debian/patches/add_extra_volume_defaults.patch --- 1.2.8-1/debian/patches/add_extra_volume_defaults.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/patches/add_extra_volume_defaults.patch 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1,113 @@ +Index: alsa-utils-1.1.1/alsactl/init/default +=================================================================== +--- alsa-utils-1.1.1.orig/alsactl/init/default ++++ alsa-utils-1.1.1/alsactl/init/default +@@ -206,6 +206,12 @@ CTL{name}="DAC Playback Switch",CTL{do_s + CTL{values}="on" + + CTL{reset}="mixer" ++CTL{name}="DAC Playback Volume",CTL{index}="1",CTL{do_search}=="1", \ ++ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++CTL{name}="DAC Playback Switch",CTL{index}="1",CTL{do_search}=="1", \ ++ CTL{values}="on" ++ ++CTL{reset}="mixer" + CTL{name}="Synth Playback Volume",CTL{do_search}=="1", \ + CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" + CTL{name}="Synth Playback Switch",CTL{do_search}=="1", \ +@@ -247,6 +253,81 @@ CTL{name}="AC97 Playback Volume",CTL{do_ + CTL{name}="AC97 Playback Switch",CTL{do_search}=="1", \ + CTL{values}="on" + ++# Ubuntu bug #19648 ++CTL{reset}="mixer" ++CTL{name}="IEC958 Switch",CTL{do_search}=="1", \ ++ CTL{values}="off" ++CTL{name}="IEC958 Capture Monitor",CTL{do_search}=="1", \ ++ CTL{values}="off" ++# Ubuntu #408370 ++CTL{name}="Optical Raw Playback Switch",CTL{do_search}=="1", \ ++ CTL{values}="off" ++ ++# Ubuntu unknown bug (bug nr probably similar to 5813) ++CTL{reset}="mixer" ++CTL{name}="Master Surround Playback Volume",CTL{do_search}=="1", \ ++ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++CTL{name}="Master Surround Playback Switch",CTL{do_search}=="1", \ ++ CTL{values}="on" ++ ++# dropped - name not present in kernel 2.6.38: ++# Dynamic Range Compression Volume/Switch ++# VIA DXS ++ ++# Ubuntu - Required for SB Live 7.1/24-bit (ca0106) ++CTL{reset}="mixer" ++CTL{name}="Analog Front Playback Volume",CTL{do_search}=="1", \ ++ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++CTL{name}="Analog Front Playback Switch",CTL{do_search}=="1", \ ++ CTL{values}="on" ++ ++# Ubuntu #597791 ++CTL{reset}="mixer" ++CTL{name}="Front Speaker Playback Volume",CTL{do_search}=="1", \ ++ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++CTL{name}="Front Speaker Playback Switch",CTL{do_search}=="1", \ ++ CTL{values}="on" ++ ++# Ubuntu #331589 ++CTL{reset}="mixer" ++CTL{name}="PC Beep Playback Volume",CTL{do_search}=="1", \ ++ CTL{values}="0%" ++CTL{name}="PC Beep Playback Switch",CTL{do_search}=="1", \ ++ CTL{values}="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. ++CTL{reset}="mixer" ++CTL{name}="IEC958 Playback AC97-SPSA",CTL{do_search}=="1", \ ++ CTL{values}="0" ++ ++# Required on some notebooks with ICH4: ++CTL{reset}="mixer" ++CTL{name}="Headphone Jack Sense",CTL{do_search}=="1", \ ++ CTL{values}="off" ++CTL{name}="Line Jack Sense",CTL{do_search}=="1", \ ++ CTL{values}="off" ++ ++CTL{reset}="mixer" ++CTL{name}="Audigy Analog/Digital Output Jack",CTL{do_search}=="1", \ ++ CTL{values}="off" ++CTL{name}="SB Live Analog/Digital Output Jack",CTL{do_search}=="1", \ ++ CTL{values}="off" ++ ++# HDA-Intel w/ "Digital" capture mixer (See Ubuntu #193823) ++CTL{reset}="mixer" ++CTL{name}="Digital Playback Volume",CTL{do_search}=="1", \ ++ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++CTL{name}="Digital Playback Switch",CTL{do_search}=="1", \ ++ CTL{values}="on" ++ ++# Dove boards need 'Line HP Swap' unmuted for the jack adjacent ++# to the serial port (Ubuntu #451635) ++CTL{reset}="mixer" ++CTL{name}="Line HP Swap Switch",CTL{do_search}=="1", \ ++ CTL{values}="on" ++ ++ + # + # Powermacs + # +@@ -272,11 +353,13 @@ LABEL="" + + CTL{name}="Input Source",PROGRAM!="__ctl_search", GOTO="" + CTL{enums}=="*|Internal Mic|*",CTL{values}="Internal Mic", GOTO="" ++CTL{enums}=="*|Digital Mic|*",CTL{values}="Digital Mic", GOTO="" + CTL{enums}=="*|Mic|*",CTL{values}="Mic" + LABEL="" + + CTL{name}="Digital Input Source",PROGRAM!="__ctl_search", GOTO="" + CTL{enums}=="*|Digital Mic 1|*",CTL{values}="Digital Mic 1", GOTO="" ++CTL{enums}=="*|Digital Mic|*",CTL{values}="Digital Mic", GOTO="" + CTL{enums}=="*|Mic|*",CTL{values}="Mic" + LABEL="" + diff -pruN 1.2.8-1/debian/patches/create_run_alsa.patch 1.2.8-1ubuntu1/debian/patches/create_run_alsa.patch --- 1.2.8-1/debian/patches/create_run_alsa.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/patches/create_run_alsa.patch 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1,22 @@ +Index: alsa-utils-1.2.3/alsactl/alsa-restore.service.in +=================================================================== +--- alsa-utils-1.2.3.orig/alsactl/alsa-restore.service.in ++++ alsa-utils-1.2.3/alsactl/alsa-restore.service.in +@@ -13,5 +13,6 @@ After=alsa-state.service + [Service] + Type=oneshot + RemainAfterExit=true ++ExecStartPre=/bin/mkdir -p @alsactlhome@ + ExecStart=-@sbindir@/alsactl -E HOME=@alsactlhome@ -E XDG_RUNTIME_DIR=@alsactlruntime@ restore + ExecStop=-@sbindir@/alsactl -E HOME=@alsactlhome@ -E XDG_RUNTIME_DIR=@alsactlruntime@ store +Index: alsa-utils-1.2.3/alsactl/alsa-state.service.in +=================================================================== +--- alsa-utils-1.2.3.orig/alsactl/alsa-state.service.in ++++ alsa-utils-1.2.3/alsactl/alsa-state.service.in +@@ -10,5 +10,6 @@ ConditionPathExists=@daemonswitch@ + + [Service] + Type=simple ++ExecStartPre=/bin/mkdir -p @alsactlhome@ + ExecStart=-@sbindir@/alsactl -E HOME=@alsactlhome@ -E XDG_RUNTIME_DIR=@alsactlruntime@ -s -n 19 -c rdaemon + ExecStop=-@sbindir@/alsactl -E HOME=@alsactlhome@ -E XDG_RUNTIME_DIR=@alsactlruntime@ -s kill save_and_quit diff -pruN 1.2.8-1/debian/patches/series 1.2.8-1ubuntu1/debian/patches/series --- 1.2.8-1/debian/patches/series 2020-06-30 05:07:55.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/patches/series 2022-11-23 13:42:37.000000000 +0000 @@ -6,3 +6,7 @@ udev_test_alsactl.patch spellfixes.patch systemd_Documentation_key.patch Don-t-run-both-systemd-services-in-paralell.patch +unset_pulse_internal.patch +add_extra_volume_defaults.patch +vmware_audio_volume.patch +create_run_alsa.patch diff -pruN 1.2.8-1/debian/patches/unset_pulse_internal.patch 1.2.8-1ubuntu1/debian/patches/unset_pulse_internal.patch --- 1.2.8-1/debian/patches/unset_pulse_internal.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/patches/unset_pulse_internal.patch 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1,59 @@ +Index: alsa-utils-1.2.6-1ubuntu1/alsamixer/cli.c +=================================================================== +--- alsa-utils-1.2.6-1ubuntu1.orig/alsamixer/cli.c ++++ alsa-utils-1.2.6-1ubuntu1/alsamixer/cli.c +@@ -150,6 +150,10 @@ int main(int argc, char *argv[]) + textdomain(PACKAGE); + #endif + ++ /* We don't want to control a pulseaudio mixer, since that can be done from ++ * pulseaudio itself. */ ++ setenv("PULSE_INTERNAL", "0", 1); ++ + parse_options(argc, argv); + + create_mixer_object(&selem_regopt); +Index: alsa-utils-1.2.6-1ubuntu1/amixer/amixer.c +=================================================================== +--- alsa-utils-1.2.6-1ubuntu1.orig/amixer/amixer.c ++++ alsa-utils-1.2.6-1ubuntu1/amixer/amixer.c +@@ -1777,6 +1777,11 @@ int main(int argc, char *argv[]) + { + int badopt, retval, level = 0; + int read_stdin = 0; ++ ++ /* We don't want to control a pulseaudio mixer, since that can be done ++ * from pulseaudio itself. */ ++ setenv("PULSE_INTERNAL", "0", 1); ++ + static const struct option long_option[] = + { + {"help", 0, NULL, 'h'}, +Index: alsa-utils-1.2.6-1ubuntu1/iecset/iecset.c +=================================================================== +--- alsa-utils-1.2.6-1ubuntu1.orig/iecset/iecset.c ++++ alsa-utils-1.2.6-1ubuntu1/iecset/iecset.c +@@ -324,6 +324,10 @@ int main(int argc, char **argv) + char tmpname[32]; + int parms[IDX_LAST]; + ++ /* We don't want to control a pulseaudio mixer, since that can be done ++ * from pulseaudio itself. */ ++ setenv("PULSE_INTERNAL", "0", 1); ++ + for (i = 0; i < IDX_LAST; i++) + parms[i] = -1; /* not set */ + +Index: alsa-utils-1.2.6-1ubuntu1/alsactl/alsactl.c +=================================================================== +--- alsa-utils-1.2.6-1ubuntu1.orig/alsactl/alsactl.c ++++ alsa-utils-1.2.6-1ubuntu1/alsactl/alsactl.c +@@ -227,6 +227,8 @@ static void do_nice(int use_nice, int sc + + int main(int argc, char *argv[]) + { ++ setenv("PULSE_INTERNAL", "0", 1); ++ + static const char *const devfiles[] = { + "/dev/snd/controlC", + "/dev/snd/pcmC", diff -pruN 1.2.8-1/debian/patches/vmware_audio_volume.patch 1.2.8-1ubuntu1/debian/patches/vmware_audio_volume.patch --- 1.2.8-1/debian/patches/vmware_audio_volume.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/patches/vmware_audio_volume.patch 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1,45 @@ +Index: alsa-utils-1.1.3/alsactl/init/Makefile.am +=================================================================== +--- alsa-utils-1.1.3.orig/alsactl/init/Makefile.am ++++ alsa-utils-1.1.3/alsactl/init/Makefile.am +@@ -1,7 +1,7 @@ + + init_files = \ + 00main default help info test \ +- hda ca0106 ++ hda ca0106 ens1371 + EXTRA_DIST = $(init_files) + alsainitdir = $(datadir)/alsa/init + alsainit_DATA = $(init_files) +Index: alsa-utils-1.1.3/alsactl/init/00main +=================================================================== +--- alsa-utils-1.1.3.orig/alsactl/init/00main ++++ alsa-utils-1.1.3/alsactl/init/00main +@@ -32,6 +32,7 @@ RESULT=="skip", GOTO="init_end" + # real ALSA configuration database + CARDINFO{driver}=="HDA-Intel", INCLUDE="hda", GOTO="init_end" + CARDINFO{driver}=="CA0106", INCLUDE="ca0106", GOTO="init_end" ++CARDINFO{driver}=="ENS1371", INCLUDE="ens1371", GOTO="init_end" + CARDINFO{driver}=="Test", INCLUDE="test", GOTO="init_end" + + LABEL="init_end" +Index: alsa-utils-1.1.3/alsactl/init/ens1371 +=================================================================== +--- /dev/null ++++ alsa-utils-1.1.3/alsactl/init/ens1371 +@@ -0,0 +1,15 @@ ++# Configuration for ensoniq based cards ++ ++CARDINFO{mixername}=="Cirrus Logic CS4297A rev 3", \ ++ ATTR{subsystem_vendor}=="0x1274", ATTR{subsystem_device}=="0x1371", \ ++ GOTO="vmware-ac97" ++RESULT="false", EXIT="return" ++ ++LABEL="vmware-ac97" ++# playback ++CTL{reset}="mixer" ++CTL{name}="Master Playback Volume", CTL{value}="0dB,0dB" ++CTL{name}="Master Playback Switch", CTL{value}="on" ++CTL{name}="PCM Playback Volume", CTL{value}="51dB,51dB" ++CTL{name}="PCM Playback Switch", CTL{value}="on" ++RESULT="true", EXIT="return" diff -pruN 1.2.8-1/debian/README.init.cs4236 1.2.8-1ubuntu1/debian/README.init.cs4236 --- 1.2.8-1/debian/README.init.cs4236 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.8-1ubuntu1/debian/README.init.cs4236 2022-11-23 13:42:37.000000000 +0000 @@ -0,0 +1,45 @@ +#! /bin/bash + +## Provided by Mkarcher at http://www.thinkwiki.org/wiki/Script_for_configuring_the_CS4239_sound_chip_in_PnP_mode +## Modified by Daniel T Chen for Debian/Ubuntu, redistributable +## under GPLv2 or later + +for dev in /sys/bus/pnp/devices/* +do + grep CSC0100 $dev/id > /dev/null && WSSDEV=$dev + grep CSC0110 $dev/id > /dev/null && CTLDEV=$dev +done + +echo activate > $WSSDEV/resources +echo activate > $CTLDEV/resources + +{ read + read bla port1 + read bla port2 + read bla port3 + read bla irq + read bla dma1 + read bla dma2 + # Hack: with PnPBIOS: ports are: port1: WSS, port2: OPL, port3: sb (unneeded) + # with ACPI-PnP:ports are: port1: OPL, port2: sb, port3: WSS + # (ACPI bios seems to be wrong here, the PnP-card-code in snd-cs4236.c uses the + # PnPBIOS port order) + # Detect port order using the fixed OPL port as reference + if [ ${port2%%-*} = 0x388 ] + then + # PnPBIOS: usual order + port=${port1%%-*} + oplport=${port2%%-*} + else + # ACPI: mixed-up order + port=${port3%%-*} + oplport=${port1%%-*} + fi + } < $WSSDEV/resources + +{ read + read bla port1 + cport=${port1%%-*} +} < $CTLDEV/resources + +modprobe snd-cs4236 port=$port cport=$cport fm_port=$oplport irq=$irq dma1=$dma1 dma2=$dma2 isapnp=0