From 94b28aceb9522c4b12b17e19aba38f08c6ee68be Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sun, 25 Aug 2019 20:02:09 +0000 Subject: [PATCH] Fix Linux ALSA OSS plugin by removing a configuration file. The configuration from FreeBSD /usr/local/etc/asound.conf should be used. PR: 240043 Reported by: Hannes Hauswedell --- audio/linux-c7-alsa-plugins-oss/Makefile | 4 ++++ audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 | 2 -- audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile index 03ee546da129..6d5571de0433 100644 --- a/audio/linux-c7-alsa-plugins-oss/Makefile +++ b/audio/linux-c7-alsa-plugins-oss/Makefile @@ -4,6 +4,7 @@ PORTNAME= alsa-plugins PORTVERSION= 1.1.6 DISTVERSIONSUFFIX= -1.el7 +PORTREVISION= 1 CATEGORIES= audio linux PKGNAMESUFFIX= -oss @@ -25,4 +26,7 @@ DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} OPTIONS_DEFINE= DOCS +post-patch: + @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/alsa + .include diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 index f60a86c11843..02cf9a2c25f7 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 @@ -1,9 +1,7 @@ -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 %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL %%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 index 5c27134be7ab..d3c738962118 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 @@ -1,7 +1,5 @@ -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 %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL %%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss