From 1ad9c73b5625f7a2457931c435f8d2e34f199a0c Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 3 Feb 2024 05:56:13 +0100 Subject: [PATCH] audio/linux-c7-alsa-plugins-oss: install vendor config after 077152a79ad8 linux-c7-alsa-lib uses default config from alsa-lib since 1aaf3941aa56. $ /compat/linux/usr/bin/aplay foo.wav ALSA lib pcm.c:2565:(snd_pcm_open_noupdate) Unknown PCM oss aplay: main:828: audio open error: No such file or directory PR: 245321 --- audio/linux-c7-alsa-plugins-oss/Makefile | 5 +++-- .../files/patch-oss_50-oss.conf | 15 +++++++++++++++ audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 | 2 ++ audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 | 2 ++ audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 | 2 ++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile index 27781106b113..d2d0fcaab550 100644 --- a/audio/linux-c7-alsa-plugins-oss/Makefile +++ b/audio/linux-c7-alsa-plugins-oss/Makefile @@ -1,7 +1,7 @@ PORTNAME= alsa-plugins PORTVERSION= 1.1.6 DISTVERSIONSUFFIX= -1.el7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio linux MASTER_SITES= CENTOS_LINUX MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/Source/SPackages/ \ @@ -105,6 +105,7 @@ do-install: ${LOCALBASE}/bin/gmake install-strip \ DESTDIR=${STAGEDIR}${LINUXBASE}) ${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la - ${RM} -r ${STAGEDIR}${LINUXBASE}/etc ${STAGEDIR}${LINUXBASE}/usr/share + ${LN} -sf ../../../usr/share/alsa/alsa.conf.d/50-oss.conf \ + ${STAGEDIR}${LINUXBASE}/etc/alsa/conf.d .include diff --git a/audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf b/audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf new file mode 100644 index 000000000000..47f7c1d9773b --- /dev/null +++ b/audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf @@ -0,0 +1,15 @@ +https://github.com/alsa-project/alsa-plugins/commit/ed6684849298 + +ALSA lib pcm_oss.c:863:(_snd_pcm_oss_open) Unknown field port + +--- oss/50-oss.conf.orig 2018-04-03 07:02:58 UTC ++++ oss/50-oss.conf +@@ -5,7 +5,7 @@ pcm.oss { + default "/dev/dsp" + } + type oss +- port $DEVICE ++ device $DEVICE + hint { + show { + @func refer diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 index 894c95e4baa9..e129cafc77ba 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 @@ -1,2 +1,4 @@ +etc/alsa/conf.d/50-oss.conf usr/lib64/alsa-lib/libasound_module_ctl_oss.so usr/lib64/alsa-lib/libasound_module_pcm_oss.so +usr/share/alsa/alsa.conf.d/50-oss.conf diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 index d2715433a1ff..8340ccff7658 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 @@ -1,4 +1,6 @@ +etc/alsa/conf.d/50-oss.conf usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so usr/lib64/alsa-lib/libasound_module_ctl_oss.so usr/lib64/alsa-lib/libasound_module_pcm_oss.so +usr/share/alsa/alsa.conf.d/50-oss.conf diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 index f1114fa640b9..fdedf964fa72 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 @@ -1,2 +1,4 @@ +etc/alsa/conf.d/50-oss.conf usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so +usr/share/alsa/alsa.conf.d/50-oss.conf