git: 077152a79ad8 - main - audio/alsa-plugins: install vendor OSS config after 44c14328c08e

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=077152a79ad8181830e324b2ede39301a94d4093

commit 077152a79ad8181830e324b2ede39301a94d4093
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-02-02 13:16:38 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-02-02 13:44:55 +0000

    audio/alsa-plugins: install vendor OSS config after 44c14328c08e
    
    Allows overriding /dev/dsp without adjusting config e.g.,
    
    $ aplay -D oss:/dev/dsp4 foo.wav
    
    PR:             245321
    See also:       https://github.com/alsa-project/alsa-plugins/commit/6e40eb5fd346
---
 audio/alsa-lib/Makefile                 | 1 +
 audio/alsa-lib/files/asound.conf.sample | 9 ---------
 audio/alsa-plugins/Makefile             | 2 +-
 audio/alsa-plugins/pkg-plist            | 4 ++--
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index f92cdb551931..4eb25c86dbb2 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	alsa-lib
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://www.alsa-project.org/files/pub/lib/
 
diff --git a/audio/alsa-lib/files/asound.conf.sample b/audio/alsa-lib/files/asound.conf.sample
index 4fef58bdb9d7..e97133e770cc 100644
--- a/audio/alsa-lib/files/asound.conf.sample
+++ b/audio/alsa-lib/files/asound.conf.sample
@@ -1,15 +1,6 @@
 #
 # FreeBSD/OSS
 #
-pcm.oss {
-	type oss
-	hint.description "Open Sound System"
-}
-
-ctl.oss {
-	type oss
-}
-
 pcm.!sysdefault pcm.plug:oss
 ctl.!sysdefault ctl.oss
 pcm.!default pcm.sysdefault
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 3c0692c7ea99..127343819c20 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.2.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://www.alsa-project.org/files/pub/plugins/
 
diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist
index 8fddd4d644cd..afe367876651 100644
--- a/audio/alsa-plugins/pkg-plist
+++ b/audio/alsa-plugins/pkg-plist
@@ -4,7 +4,7 @@
 %%JACK%%etc/alsa/conf.d/50-jack.conf
 %%FFMPEG%%etc/alsa/conf.d/60-a52-encoder.conf
 @comment etc/alsa/conf.d/50-arcam-av-ctl.conf
-@comment etc/alsa/conf.d/50-oss.conf
+etc/alsa/conf.d/50-oss.conf
 %%PULSEAUDIO%%etc/alsa/conf.d/50-pulseaudio.conf
 %%SPEEX%%etc/alsa/conf.d/60-speex.conf
 @comment etc/alsa/conf.d/60-upmix.conf
@@ -56,7 +56,7 @@ lib/alsa-lib/libasound_module_pcm_vdownmix.so
 %%SPEEX%%share/alsa/alsa.conf.d/10-speexrate.conf
 @comment share/alsa/alsa.conf.d/50-arcam-av-ctl.conf
 %%JACK%%share/alsa/alsa.conf.d/50-jack.conf
-@comment share/alsa/alsa.conf.d/50-oss.conf
+share/alsa/alsa.conf.d/50-oss.conf
 %%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf
 %%FFMPEG%%share/alsa/alsa.conf.d/60-a52-encoder.conf
 %%SPEEX%%share/alsa/alsa.conf.d/60-speex.conf