Author: jbeich Date: Sun Dec 1 01:00:10 2013 New Revision: 1417 Log: use freebsd alsa config by default
With linux built-in config alsa apps try to open hw:0,0 device which doesn't exist on freebsd due to lack of alsa-driver. PR: ports/169896 (based on), ports/174055 Deleted: trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall trunk/audio/linux-f10-alsa-plugins-oss/pkg-install Modified: trunk/audio/linux-f10-alsa-lib/Makefile trunk/audio/linux-f10-alsa-plugins-oss/Makefile trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist Modified: trunk/audio/linux-f10-alsa-lib/Makefile ============================================================================== --- trunk/audio/linux-f10-alsa-lib/Makefile Sun Dec 1 01:00:03 2013 (r1416) +++ trunk/audio/linux-f10-alsa-lib/Makefile Sun Dec 1 01:00:10 2013 (r1417) @@ -12,6 +12,8 @@ MAINTAINER= [email protected] 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 @@ -21,4 +23,12 @@ 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 + .include <bsd.port.mk> Modified: trunk/audio/linux-f10-alsa-plugins-oss/Makefile ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/Makefile Sun Dec 1 01:00:03 2013 (r1416) +++ trunk/audio/linux-f10-alsa-plugins-oss/Makefile Sun Dec 1 01:00:10 2013 (r1417) @@ -19,16 +19,4 @@ 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: - @if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \ - ${CP} -p ${PREFIX}/${CONF_FILE}-dist ${PREFIX}/${CONF_FILE} ; \ - fi - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.mk> Deleted: trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall Sun Dec 1 01:00:10 2013 (r1416) +++ /dev/null 00:00:00 1970 (deleted) @@ -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 Deleted: trunk/audio/linux-f10-alsa-plugins-oss/pkg-install ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/pkg-install Sun Dec 1 01:00:10 2013 (r1416) +++ /dev/null 00:00:00 1970 (deleted) @@ -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 Modified: trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist Sun Dec 1 01:00:03 2013 (r1416) +++ trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist Sun Dec 1 01:00:10 2013 (r1417) @@ -1,13 +1,8 @@ -@unexec if cmp -s %D/etc/alsa/pcm/pcm-oss.conf-dist %D/etc/alsa/pcm/pcm-oss.conf; then rm -f %D/etc/alsa/pcm/pcm-oss.conf; fi -etc/alsa/pcm/pcm-oss.conf-dist -@exec if [ ! -f %D/etc/alsa/pcm/pcm-oss.conf ] ; then cp -p %D/%F %B/pcm-oss.conf; fi +etc/alsa/pcm/pcm-oss.conf 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 @dirrm usr/share/doc/alsa-plugins-oss-1.0.21 -@dirrmtry etc/alsa/pcm -@dirrmtry etc/alsa @dirrmtry usr/lib/alsa-lib -@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 _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
