Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 audio-drivers/alsa-utils/DETAILS         |    1 +
 audio-drivers/alsa-utils/HISTORY         |    4 ++++
 audio-drivers/alsa-utils/PRE_BUILD       |    2 ++
 audio-drivers/alsa-utils/patches/p1.diff |   22 ++++++++++++++++++++++
 audio-drivers/alsa-utils/patches/p2.diff |   13 +++++++++++++
 5 files changed, 42 insertions(+)

New commits:
commit 5ecb9118ffa1179bdb49e83abf7931a101c25e74
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    alsa-utils - upstream fixes

diff --git a/audio-drivers/alsa-utils/DETAILS 
b/audio-drivers/alsa-utils/DETAILS
index a5afd19..1133464 100755
--- a/audio-drivers/alsa-utils/DETAILS
+++ b/audio-drivers/alsa-utils/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
          VERSION=1.2.13
+PATCHLEVEL=1
      
SOURCE_HASH=sha512:0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/audio-drivers/alsa-utils/HISTORY 
b/audio-drivers/alsa-utils/HISTORY
index 633f3a5..d2e5661 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,7 @@
+2024-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++
+       * PRE_BUILD patches: upstream fixes
+
 2024-11-13 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.2.13
 
diff --git a/audio-drivers/alsa-utils/PRE_BUILD 
b/audio-drivers/alsa-utils/PRE_BUILD
index 5162c16..253668f 100755
--- a/audio-drivers/alsa-utils/PRE_BUILD
+++ b/audio-drivers/alsa-utils/PRE_BUILD
@@ -19,4 +19,6 @@ if [[ $ALSA_UTILS_BRANCH == scm ]]; then
   automake --foreign --copy --add-missing &&
   touch depcomp &&
   autoconf
+else
+  apply_patch_dir patches
 fi
diff --git a/audio-drivers/alsa-utils/patches/p1.diff 
b/audio-drivers/alsa-utils/patches/p1.diff
new file mode 100644
index 0000000..4f3b072
--- /dev/null
+++ b/audio-drivers/alsa-utils/patches/p1.diff
@@ -0,0 +1,22 @@
+diff --git a/alsactl/90-alsa-restore.rules.in 
b/alsactl/90-alsa-restore.rules.in
+index 85f0b15f..dae2ed8c 100644
+--- a/alsactl/90-alsa-restore.rules.in
++++ b/alsactl/90-alsa-restore.rules.in
+@@ -3,6 +3,8 @@
+ ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", 
KERNELS!="card*",@extratest@ GOTO="alsa_restore_go"
+ GOTO="alsa_restore_end"
+ 
++LABEL="alsa_restore_go"
++
+ ENV{ALSA_CARD_NUMBER}="$attr{device/number}"
+ 
+ # mark HDA analog card; HDMI/DP card does not have capture devices
+@@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", 
GOTO="alsa_restore_std"
+ IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card"
+ ENV{ALSA_CARD_HDA_ANALOG}!="", 
ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}"
+ 
+-LABEL="alsa_restore_go"
++LABEL="alsa_restore_std"
+ TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore 
$env{ALSA_CARD_NUMBER}"
+ TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore 
$env{ALSA_CARD_NUMBER}"
+ 
diff --git a/audio-drivers/alsa-utils/patches/p2.diff 
b/audio-drivers/alsa-utils/patches/p2.diff
new file mode 100644
index 0000000..bd4f223
--- /dev/null
+++ b/audio-drivers/alsa-utils/patches/p2.diff
@@ -0,0 +1,13 @@
+diff --git a/alsactl/90-alsa-restore.rules.in 
b/alsactl/90-alsa-restore.rules.in
+index dae2ed8c..5db6080b 100644
+--- a/alsactl/90-alsa-restore.rules.in
++++ b/alsactl/90-alsa-restore.rules.in
+@@ -14,7 +14,7 @@ DRIVERS=="snd_hda_intel", 
TEST=="device/pcmC$env{ALSA_CARD_NUMBER}D0p", RUN+="/b
+ TEST=="device/device/acp3x-dmic-capture", GOTO="alsa_hda_analog"
+ TEST=="device/device/acp6x-dmic-capture", GOTO="alsa_hda_analog"
+ TEST=="device/device/acp63-dmic-capture", GOTO="alsa_hda_analog"
+-TEST=="device/device/acp-pdm-dmic", GOTO="alsa_hda_analog"
++TEST=="device/device/acp-dmic-codec", GOTO="alsa_hda_analog"
+ GOTO="alsa_restore_std"
+ 
+ LABEL="alsa_hda_analog"