audio/linux-f10-alsa-lib: Use OSS plugin by default
This patch makes alsa work by default with OSS plugin, similar to
audio/alsa-lib. Uses system asound.conf now (f10 and c6), v1.1
- fixes aplay(1) from non-existent audio/linux-f10-alsa-utils
- fixes HTML5 audio for www/linux-firefox (when USE_LINUX=f10)
untested:
- if non-existent "Open Sound System" plugin graciously falls back to
default plugin if present in application configuration
- if audio capture works the same in net-im/skype
- if audio capture works the same in www/linux-*-flashplugin11
- webcam
PR: 169896
Submitted by: Jan Beich
Approved by: maintainer timeout (16 months?)
This commit is contained in:
John Marino
parent
cb494355fb
commit
1aaf3941aa
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=373425
@ -12,6 +12,8 @@ COMMENT= Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_
|
||||
|
||||
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
|
||||
|
||||
@ -26,10 +26,8 @@ RPMVERSION= 3.el6
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONF_FILE= etc/alsa/pcm/pcm-oss.conf
|
||||
|
||||
post-patch:
|
||||
@${RM} ${WRKSRC}/${CONF_FILE}.orig
|
||||
@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}.sample
|
||||
# We will use native configuration file, so delete a linux one
|
||||
post-extract:
|
||||
@${RM} -r ${WRKSRC}/etc
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -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"
|
||||
+ }
|
||||
+}
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -10,6 +10,8 @@ MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
|
||||
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>
|
||||
|
||||
@ -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
|
||||
|
||||
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
|
||||
# We will use native configuration file, so delete a linux one
|
||||
post-extract:
|
||||
@${RM} -r ${WRKSRC}/etc
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -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"
|
||||
+ }
|
||||
+}
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user