Attachment #149455 for bug #169896

Lines 12-17 COMMENT= Advanced Linux Sound Architecture librari Link Here

(-)audio/linux-c6-alsa-lib/Makefile (+8 lines)
12		12
13	LICENSE= GPLv3	13	LICENSE= GPLv3
14		14
		15	RUN_DEPENDS= ${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
		16
15	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*	17	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
16		18
17	BRANDELF_FILES= usr/bin/aserver	19	BRANDELF_FILES= usr/bin/aserver
Lines 22-28 USE_LINUX_RPM= yes Link Here
22	RPMVERSION= 3.el6	24	RPMVERSION= 3.el6
23	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
24		26
		27	# We will use native configuration file, so delete a linux one
		28	post-extract:
		29	@${RM} -r ${WRKSRC}/etc
		30
25	post-install:	31	post-install:
		32	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
		33	${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
26	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la	34	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
27	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la	35	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
28	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la	36	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la

Lines 26-35 RPMVERSION= 3.el6 Link Here

(-)audio/linux-c6-alsa-plugins-oss/Makefile (-5 / +3 lines)
26		26
27	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
28		28
29	CONF_FILE= etc/alsa/pcm/pcm-oss.conf	29	# We will use native configuration file, so delete a linux one
		30	post-extract:
		31	@${RM} -r ${WRKSRC}/etc
30		32
31	post-patch:
32	@${RM} ${WRKSRC}/${CONF_FILE}.orig
33	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}.sample
34
35	.include <bsd.port.mk>	33	.include <bsd.port.mk>




--- ./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"
+	}
+}




#!/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




#!/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

Lines 1-7 Link Here

(-)audio/linux-c6-alsa-plugins-oss/pkg-plist (-2 lines)
1	@sample etc/alsa/pcm/pcm-oss.conf.sample
2	usr/lib/alsa-lib/libasound_module_ctl_oss.so	1	usr/lib/alsa-lib/libasound_module_ctl_oss.so
3	usr/lib/alsa-lib/libasound_module_pcm_oss.so	2	usr/lib/alsa-lib/libasound_module_pcm_oss.so
4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING	3	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
5	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL	4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
6	usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss	5	usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
7	@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

Lines 10-15 MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedor Link Here

(-)audio/linux-f10-alsa-lib/Makefile (-1 / +8 lines)
10	MAINTAINER= emulation@FreeBSD.org	10	MAINTAINER= emulation@FreeBSD.org
11	COMMENT= Advanced Linux Sound Architecture libraries (Linux Fedora 10)	11	COMMENT= Advanced Linux Sound Architecture libraries (Linux Fedora 10)
12		12
		13	RUN_DEPENDS= ${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
		14
13	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*	15	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
14		16
15	ONLY_FOR_ARCHS= i386 amd64	17	ONLY_FOR_ARCHS= i386 amd64
Lines 20-29 RPMVERSION= 2.fc10 Link Here
20	BRANDELF_FILES= usr/bin/aserver	22	BRANDELF_FILES= usr/bin/aserver
21	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
22		24
		25	# We will use native configuration file, so delete a linux one
		26	post-extract:
		27	@${RM} -r ${WRKSRC}/etc
		28
23	post-install:	29	post-install:
		30	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
		31	${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
24	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la	32	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
25	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la	33	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
26	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la	34	${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
27		35
28
29	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 18-30 RPMVERSION= 3.fc10 Link Here

(-)audio/linux-f10-alsa-plugins-oss/Makefile (-8 / +3 lines)
18	SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}	18	SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20		20
21	CONF_FILE= etc/alsa/pcm/pcm-oss.conf	21	# We will use native configuration file, so delete a linux one
		22	post-extract:
		23	@${RM} -r ${WRKSRC}/etc
22		24
23	post-patch:
24	@${RM} ${WRKSRC}/${CONF_FILE}.orig
25	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
26
27	post-install:
28	${MV} ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE}.sample
29
30	.include <bsd.port.mk>	25	.include <bsd.port.mk>




--- 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"
+	}
+}




#!/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




#!/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

Lines 1-7 Link Here

(-)audio/linux-f10-alsa-plugins-oss/pkg-plist (-2 lines)
1	@sample etc/alsa/pcm/pcm-oss.conf.sample
2	usr/lib/alsa-lib/libasound_module_ctl_oss.so	1	usr/lib/alsa-lib/libasound_module_ctl_oss.so
3	usr/lib/alsa-lib/libasound_module_pcm_oss.so	2	usr/lib/alsa-lib/libasound_module_pcm_oss.so
4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING	3	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
5	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL	4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
6	usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss	5	usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
7	@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

Return to bug 169896

Lines 1-21 Link Here

(-)audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf (-21 lines)
1	--- ./etc/alsa/pcm/pcm-oss.conf.orig 2010-11-11 02:07:08.000000000 +0200
2	+++ ./etc/alsa/pcm/pcm-oss.conf 2014-03-16 17:33:37.794567295 +0200
3	@@ -1,9 +1,17 @@
4	# pcm-oss plugin configuration
5
6	-pcm.oss {
7	+pcm.!default {
8	type oss
9	device /dev/dsp
10	hint {
11	description "Open Sound System"
12	}
13	}
14	+
15	+ctl.!default {
16	+ type oss
17	+ device /dev/mixer
18	+ hint {
19	+ description "Open Sound System"
20	+ }
21	+}

Lines 1-16 Link Here

(-)audio/linux-c6-alsa-plugins-oss/pkg-deinstall (-16 lines)
1	#!/bin/sh
2
3	case "$2" in
4	POST-DEINSTALL)
5	conf=${PKG_PREFIX}/etc/asound.conf
6	if [ ! -f "$conf" ]; then
7	exit 1
8	fi
9	grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
10	;;
11	*)
12	exit 0
13	;;
14	esac
15
16	exit 0

Lines 1-18 Link Here

(-)audio/linux-c6-alsa-plugins-oss/pkg-install (-18 lines)
1	#!/bin/sh
2
3	case "$2" in
4	POST-INSTALL)
5	conf=${PKG_PREFIX}/etc/asound.conf
6	if [ ! -f "$conf" ]; then
7	exit 1
8	fi
9	awk '{print $0}; /files/ { print "\t\t\t\"/etc/alsa/pcm/pcm-oss.conf\""}' <$conf >/tmp/asound.conf.new
10	mv /tmp/asound.conf.new $conf
11	exit 0
12	;;
13	*)
14	exit 0
15	;;
16	esac
17
18	exit 0

Lines 1-14 Link Here

(-)audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf (-14 lines)
1	--- etc/alsa/pcm/pcm-oss.conf.orig 2010-03-23 10:56:41.000000000 +0900
2	+++ etc/alsa/pcm/pcm-oss.conf 2010-03-23 10:57:30.000000000 +0900
3	@@ -7,3 +7,11 @@
4	description "Open Sound System"
5	}
6	}
7	+
8	+ctl.oss {
9	+ type oss
10	+ device /dev/mixer
11	+ hint {
12	+ description "Open Sound System"
13	+ }
14	+}