CVS commit: pkgsrc/audio/alsa-lib

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sat Nov 20 23:38:13 UTC 2021

Modified Files:
        pkgsrc/audio/alsa-lib: Makefile distinfo
Added Files:
        pkgsrc/audio/alsa-lib/patches: patch-src_conf_alsa.conf

Log Message:
Substitute pkgsrc paths in alsa.conf


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/audio/alsa-lib/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/alsa-lib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/alsa-lib/patches/patch-src_conf_alsa.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/alsa-lib/Makefile
diff -u pkgsrc/audio/alsa-lib/Makefile:1.25 pkgsrc/audio/alsa-lib/Makefile:1.26
--- pkgsrc/audio/alsa-lib/Makefile:1.25 Tue Aug 10 20:39:51 2021
+++ pkgsrc/audio/alsa-lib/Makefile      Sat Nov 20 23:38:12 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/08/10 20:39:51 triaxx Exp $
+# $NetBSD: Makefile,v 1.26 2021/11/20 23:38:12 hauke Exp $
 
 DISTNAME=      alsa-lib-1.2.5.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +18,11 @@ USE_TOOLS+=  pkg-config gmake
 
 PKGCONFIG_OVERRIDE+=   utils/alsa.pc.in
 
+SUBST_CLASSES+=                conf-path
+SUBST_STAGE.conf-path= pre-configure
+SUBST_FILES.conf-path= src/conf/alsa.conf
+SUBST_VARS.conf-path=  VARBASE PKG_SYSCONFDIR
+
 CONFIGURE_ARGS+=       --disable-python
 
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__ -DBSD_COMP -DMAP_FILE=0

Index: pkgsrc/audio/alsa-lib/distinfo
diff -u pkgsrc/audio/alsa-lib/distinfo:1.33 pkgsrc/audio/alsa-lib/distinfo:1.34
--- pkgsrc/audio/alsa-lib/distinfo:1.33 Tue Oct 26 09:58:46 2021
+++ pkgsrc/audio/alsa-lib/distinfo      Sat Nov 20 23:38:12 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 09:58:46 nia Exp $
+$NetBSD: distinfo,v 1.34 2021/11/20 23:38:12 hauke Exp $
 
 BLAKE2s (alsa-lib-1.2.5.1.tar.bz2) = e5212f8be6654397b93d9163942c75f9ec8eba53fb5502c8d4cb32829589afac
 SHA512 (alsa-lib-1.2.5.1.tar.bz2) = 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
@@ -21,6 +21,7 @@ SHA1 (patch-include_sound_uapi_asoc.h) =
 SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026
 SHA1 (patch-include_type__compat.h) = 3cb245d8ea171f987859e1b5a89b0908c2037492
 SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
+SHA1 (patch-src_conf_alsa.conf) = 1a3d2a0ce15b2f903095bc7103c7765fcd6270c0
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
 SHA1 (patch-src_pcm_pcm__mmap.c) = 6d2325ebbc029e0b964f3a2de0516705ca8263e2
 SHA1 (patch-src_seq_seq__midi__event.c) = cf4ff866cf2cff3e78dc589b43840e16a1cf40b1

Added files:

Index: pkgsrc/audio/alsa-lib/patches/patch-src_conf_alsa.conf
diff -u /dev/null pkgsrc/audio/alsa-lib/patches/patch-src_conf_alsa.conf:1.1
--- /dev/null   Sat Nov 20 23:38:13 2021
+++ pkgsrc/audio/alsa-lib/patches/patch-src_conf_alsa.conf      Sat Nov 20 23:38:12 2021
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_conf_alsa.conf,v 1.1 2021/11/20 23:38:12 hauke Exp $
+
+Substitute pkgsrc paths
+
+--- src/conf/alsa.conf.orig    2021-06-14 10:28:44.000000000 +0000
++++ src/conf/alsa.conf
+@@ -8,10 +8,9 @@
+       {
+               func load
+               files [
+-                      "/var/lib/alsa/conf.d"
+-                      "/usr/etc/alsa/conf.d"
+-                      "/etc/alsa/conf.d"
+-                      "/etc/asound.conf|||/usr/etc/asound.conf"
++                      "@VARBASE@/lib/alsa/conf.d"
++                      "@PKG_SYSCONFDIR@/alsa/conf.d"
++                      "@PKG_SYSCONFDIR@/asound.conf"
+                       "~/.asoundrc"
+                       {
+                               @func concat