Attachment 149456 Details for Bug 169896 – use system asound.conf (f10 and c6), v1.1

[patch] use system asound.conf (f10 and c6), v1.1

system-conf.diff (text/plain), 9.11 KB, created by Jan Beich on 2014-11-15 22:12:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-11-15 22:12:01 UTC

Size: 9.11 KB

patch

obsolete

>Index: audio/linux-c6-alsa-lib/Makefile
>===================================================================
>--- audio/linux-c6-alsa-lib/Makefile	(revision 372612)
>+++ audio/linux-c6-alsa-lib/Makefile	(working copy)
>@@ -12,6 +12,8 @@ COMMENT=	Advanced Linux Sound Architecture librari
> 
> LICENSE=	GPLv3
> 
>+RUN_DEPENDS=	${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
>+
> CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
> 
> BRANDELF_FILES=	usr/bin/aserver
>@@ -22,7 +24,13 @@ USE_LINUX_RPM=	yes
> RPMVERSION=	3.el6
> USE_LDCONFIG=	yes
> 
>+# We will use native configuration file, so delete a linux one
>+post-extract:
>+	@${RM} -r ${WRKSRC}/etc
>+
> post-install:
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
>+	${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
> 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
> 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
> 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
>Index: audio/linux-c6-alsa-plugins-oss/Makefile
>===================================================================
>--- audio/linux-c6-alsa-plugins-oss/Makefile	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-oss/Makefile	(working copy)
>@@ -26,10 +26,8 @@ RPMVERSION=	3.el6
> 
> USE_LDCONFIG=	yes
> 
>-CONF_FILE=	etc/alsa/pcm/pcm-oss.conf
>+# We will use native configuration file, so delete a linux one
>+post-extract:
>+	@${RM} -r ${WRKSRC}/etc
> 
>-post-patch:
>-	@${RM} ${WRKSRC}/${CONF_FILE}.orig
>-	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}.sample
>-
> .include <bsd.port.mk>
>Index: audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf
>===================================================================
>--- audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf	(working copy)
>@@ -1,21 +0,0 @@
>---- ./etc/alsa/pcm/pcm-oss.conf.orig	2010-11-11 02:07:08.000000000 +0200
>-+++ ./etc/alsa/pcm/pcm-oss.conf	2014-03-16 17:33:37.794567295 +0200
>-@@ -1,9 +1,17 @@
>- # pcm-oss plugin configuration
>- 
>--pcm.oss {
>-+pcm.!default {
>- 	type oss
>- 	device /dev/dsp
>- 	hint {
>- 		description "Open Sound System"
>- 	}
>- }
>-+
>-+ctl.!default {
>-+	type oss
>-+	device /dev/mixer
>-+	hint {
>-+		description "Open Sound System"
>-+	}
>-+}
>Index: audio/linux-c6-alsa-plugins-oss/pkg-deinstall
>===================================================================
>--- audio/linux-c6-alsa-plugins-oss/pkg-deinstall	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-oss/pkg-deinstall	(working copy)
>@@ -1,16 +0,0 @@
>-#!/bin/sh
>-
>-case "$2" in
>-	POST-DEINSTALL)
>-		conf=${PKG_PREFIX}/etc/asound.conf
>-		if [ ! -f "$conf" ]; then
>-			exit 1
>-		fi
>-		grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
>-		;;
>-	*)
>-		exit 0
>-		;;
>-esac
>-
>-exit 0
>Index: audio/linux-c6-alsa-plugins-oss/pkg-install
>===================================================================
>--- audio/linux-c6-alsa-plugins-oss/pkg-install	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-oss/pkg-install	(working copy)
>@@ -1,18 +0,0 @@
>-#!/bin/sh
>-
>-case "$2" in
>-	POST-INSTALL)
>-		conf=${PKG_PREFIX}/etc/asound.conf
>-		if [ ! -f "$conf" ]; then
>-			exit 1
>-		fi
>-		awk '{print $0}; /files/ { print "\t\t\t\"/etc/alsa/pcm/pcm-oss.conf\""}' <$conf >/tmp/asound.conf.new
>-		mv /tmp/asound.conf.new $conf
>-		exit 0
>-		;;
>-	*)
>-		exit 0
>-		;;
>-esac
>-
>-exit 0
>Index: audio/linux-c6-alsa-plugins-oss/pkg-plist
>===================================================================
>--- audio/linux-c6-alsa-plugins-oss/pkg-plist	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-oss/pkg-plist	(working copy)
>@@ -1,7 +1,5 @@
>-@sample etc/alsa/pcm/pcm-oss.conf.sample
> usr/lib/alsa-lib/libasound_module_ctl_oss.so
> usr/lib/alsa-lib/libasound_module_pcm_oss.so
> usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
> usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
> usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
>-@unexec if [ -f %D/etc/asound.conf ]; then fgrep -v '/etc/alsa/pcm/pcm-oss.conf' <%D/etc/asound.conf >/tmp/asound.conf.new; mv /tmp/asound.conf.new %D/etc/asound.conf; fi
>Index: audio/linux-f10-alsa-lib/Makefile
>===================================================================
>--- audio/linux-f10-alsa-lib/Makefile	(revision 372612)
>+++ audio/linux-f10-alsa-lib/Makefile	(working copy)
>@@ -10,6 +10,8 @@ MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedor
> MAINTAINER=	emulation@FreeBSD.org
> COMMENT=	Advanced Linux Sound Architecture libraries (Linux Fedora 10)
> 
>+RUN_DEPENDS=	${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
>+
> CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
>@@ -20,10 +22,15 @@ RPMVERSION=	2.fc10
> BRANDELF_FILES=	usr/bin/aserver
> USE_LDCONFIG=	yes
> 
>+# We will use native configuration file, so delete a linux one
>+post-extract:
>+	@${RM} -r ${WRKSRC}/etc
>+
> post-install:
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
>+	${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
> 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
> 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
> 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
> 
>-
> .include <bsd.port.mk>
>Index: audio/linux-f10-alsa-plugins-oss/Makefile
>===================================================================
>--- audio/linux-f10-alsa-plugins-oss/Makefile	(revision 372612)
>+++ audio/linux-f10-alsa-plugins-oss/Makefile	(working copy)
>@@ -18,13 +18,8 @@ RPMVERSION=	3.fc10
> SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
> USE_LDCONFIG=	yes
> 
>-CONF_FILE=	etc/alsa/pcm/pcm-oss.conf
>+# We will use native configuration file, so delete a linux one
>+post-extract:
>+	@${RM} -r ${WRKSRC}/etc
> 
>-post-patch:
>-	@${RM} ${WRKSRC}/${CONF_FILE}.orig
>-	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
>-
>-post-install:
>-	${MV} ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE}.sample
>-
> .include <bsd.port.mk>
>Index: audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf
>===================================================================
>--- audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf	(revision 372612)
>+++ audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf	(working copy)
>@@ -1,14 +0,0 @@
>---- etc/alsa/pcm/pcm-oss.conf.orig	2010-03-23 10:56:41.000000000 +0900
>-+++ etc/alsa/pcm/pcm-oss.conf	2010-03-23 10:57:30.000000000 +0900
>-@@ -7,3 +7,11 @@
>- 		description "Open Sound System"
>- 	}
>- }
>-+
>-+ctl.oss {
>-+	type oss
>-+	device /dev/mixer
>-+	hint {
>-+		description "Open Sound System"
>-+	}
>-+}
>Index: audio/linux-f10-alsa-plugins-oss/pkg-deinstall
>===================================================================
>--- audio/linux-f10-alsa-plugins-oss/pkg-deinstall	(revision 372612)
>+++ audio/linux-f10-alsa-plugins-oss/pkg-deinstall	(working copy)
>@@ -1,16 +0,0 @@
>-#!/bin/sh
>-
>-case "$2" in
>-	POST-DEINSTALL)
>-		conf=${PKG_PREFIX}/etc/asound.conf
>-		if [ ! -f "$conf" ]; then
>-			exit 1
>-		fi
>-		grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
>-		;;
>-	*)
>-		exit 0
>-		;;
>-esac
>-
>-exit 0
>Index: audio/linux-f10-alsa-plugins-oss/pkg-install
>===================================================================
>--- audio/linux-f10-alsa-plugins-oss/pkg-install	(revision 372612)
>+++ audio/linux-f10-alsa-plugins-oss/pkg-install	(working copy)
>@@ -1,18 +0,0 @@
>-#!/bin/sh
>-
>-case "$2" in
>-	POST-INSTALL)
>-		conf=${PKG_PREFIX}/etc/asound.conf
>-		if [ ! -f "$conf" ]; then
>-			exit 1
>-		fi
>-		awk '{print $0}; /files/ { print "\t\t\t\"/etc/alsa/pcm/pcm-oss.conf\""}' <$conf >/tmp/asound.conf.new
>-		mv /tmp/asound.conf.new $conf
>-		exit 0
>-		;;
>-	*)
>-		exit 0
>-		;;
>-esac
>-
>-exit 0
>Index: audio/linux-f10-alsa-plugins-oss/pkg-plist
>===================================================================
>--- audio/linux-f10-alsa-plugins-oss/pkg-plist	(revision 372612)
>+++ audio/linux-f10-alsa-plugins-oss/pkg-plist	(working copy)
>@@ -1,7 +1,5 @@
>-@sample etc/alsa/pcm/pcm-oss.conf.sample
> usr/lib/alsa-lib/libasound_module_ctl_oss.so
> usr/lib/alsa-lib/libasound_module_pcm_oss.so
> usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
> usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
> usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
>-@unexec if [ -f %D/etc/asound.conf ]; then fgrep -v '/etc/alsa/pcm/pcm-oss.conf' <%D/etc/asound.conf >/tmp/asound.conf.new; mv /tmp/asound.conf.new %D/etc/asound.conf; fi
>Index: audio/linux-c6-alsa-plugins-pulseaudio/Makefile
>===================================================================
>--- audio/linux-c6-alsa-plugins-pulseaudio/Makefile	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-pulseaudio/Makefile	(working copy)
>@@ -26,4 +26,8 @@ RPMVERSION=	3.el6
> 
> USE_LDCONFIG=	yes
> 
>+# We will use native configuration file, so delete a linux one
>+post-extract:
>+	@${RM} -r ${WRKSRC}/etc
>+
> .include <bsd.port.mk>
>Index: audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist
>===================================================================
>--- audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist	(revision 372612)
>+++ audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-etc/alsa/pulse-default.conf
> usr/lib/alsa-lib/libasound_module_conf_pulse.so
> usr/lib/alsa-lib/libasound_module_ctl_pulse.so
> usr/lib/alsa-lib/libasound_module_pcm_pulse.so

Actions: View | Diff

Attachments on bug 169896: 126176 | 126177 | 126178 | 144609 | 147595 | 149455 | 149456