svn commit: r373425 - in head/audio: linux-c6-alsa-lib linux-c6-alsa-plugins-oss linux-c6-alsa-plugins-oss/files linux-c6-alsa-plugins-pulseaudio linux-f10-alsa-lib linux-f10-alsa-plugins-oss linux...
John Marino
marino at FreeBSD.org
Tue Nov 25 18:20:31 UTC 2014
Author: marino
Date: Tue Nov 25 18:20:28 2014
New Revision: 373425
URL: https://svnweb.freebsd.org/changeset/ports/373425
QAT: https://qat.redports.org/buildarchive/r373425/
Log:
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?)
Deleted:
head/audio/linux-c6-alsa-plugins-oss/files/
head/audio/linux-c6-alsa-plugins-oss/pkg-deinstall
head/audio/linux-c6-alsa-plugins-oss/pkg-install
head/audio/linux-f10-alsa-plugins-oss/files/
head/audio/linux-f10-alsa-plugins-oss/pkg-deinstall
head/audio/linux-f10-alsa-plugins-oss/pkg-install
Modified:
head/audio/linux-c6-alsa-lib/Makefile
head/audio/linux-c6-alsa-plugins-oss/Makefile
head/audio/linux-c6-alsa-plugins-oss/pkg-plist
head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
head/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist
head/audio/linux-f10-alsa-lib/Makefile
head/audio/linux-f10-alsa-plugins-oss/Makefile
head/audio/linux-f10-alsa-plugins-oss/pkg-plist
Modified: head/audio/linux-c6-alsa-lib/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-lib/Makefile Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-c6-alsa-lib/Makefile Tue Nov 25 18:20:28 2014 (r373425)
@@ -12,6 +12,8 @@ COMMENT= Advanced Linux Sound Architectu
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
Modified: head/audio/linux-c6-alsa-plugins-oss/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-plugins-oss/Makefile Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-c6-alsa-plugins-oss/Makefile Tue Nov 25 18:20:28 2014 (r373425)
@@ -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>
Modified: head/audio/linux-c6-alsa-plugins-oss/pkg-plist
==============================================================================
--- head/audio/linux-c6-alsa-plugins-oss/pkg-plist Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-c6-alsa-plugins-oss/pkg-plist Tue Nov 25 18:20:28 2014 (r373425)
@@ -1,7 +1,5 @@
- at 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
- at 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
Modified: head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile Tue Nov 25 18:20:28 2014 (r373425)
@@ -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>
Modified: head/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist
==============================================================================
--- head/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist Tue Nov 25 18:20:28 2014 (r373425)
@@ -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
Modified: head/audio/linux-f10-alsa-lib/Makefile
==============================================================================
--- head/audio/linux-f10-alsa-lib/Makefile Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-f10-alsa-lib/Makefile Tue Nov 25 18:20:28 2014 (r373425)
@@ -10,6 +10,8 @@ MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_A
MAINTAINER= emulation at 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>
Modified: head/audio/linux-f10-alsa-plugins-oss/Makefile
==============================================================================
--- head/audio/linux-f10-alsa-plugins-oss/Makefile Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-f10-alsa-plugins-oss/Makefile Tue Nov 25 18:20:28 2014 (r373425)
@@ -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>
Modified: head/audio/linux-f10-alsa-plugins-oss/pkg-plist
==============================================================================
--- head/audio/linux-f10-alsa-plugins-oss/pkg-plist Tue Nov 25 18:12:17 2014 (r373424)
+++ head/audio/linux-f10-alsa-plugins-oss/pkg-plist Tue Nov 25 18:20:28 2014 (r373425)
@@ -1,7 +1,5 @@
- at 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
- at 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
More information about the svn-ports-all
mailing list