FreeBSD Bugzilla – Attachment 144609 Details for
Bug 169896
[patch] audio/linux-f10-alsa-lib: use OSS plugin by default
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
use system asound.conf (f10 and c6)
system-conf.diff (text/plain), 8.44 KB, created by
Jan Beich
on 2014-07-12 09:31:29 UTC
(
hide
)
Description:
use system asound.conf (f10 and c6)
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2014-07-12 09:31:29 UTC
Size:
8.44 KB
patch
obsolete
>Index: audio/linux-f10-alsa-lib/Makefile >=================================================================== >--- audio/linux-f10-alsa-lib/Makefile (revision 361601) >+++ audio/linux-f10-alsa-lib/Makefile (working copy) >@@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} > 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 >@@ -21,4 +23,12 @@ 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 >+ > .include <bsd.port.mk> >Index: audio/linux-f10-alsa-plugins-oss/Makefile >=================================================================== >--- audio/linux-f10-alsa-plugins-oss/Makefile (revision 361601) >+++ audio/linux-f10-alsa-plugins-oss/Makefile (working copy) >@@ -13,7 +13,6 @@ COMMENT= OSS plugin for ALSA (Linux Fedora 10) > > ONLY_FOR_ARCHS= i386 amd64 > USE_LINUX_RPM= yes >-NO_STAGE= yes > USE_LINUX_APPS= alsalib > LINUX_DIST_VER= 10 > RPMVERSION= 3.fc10 >@@ -20,16 +19,4 @@ 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: >- @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> >Index: audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf >=================================================================== >--- audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf (revision 361601) >+++ 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 361601) >+++ 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 361601) >+++ 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 361601) >+++ audio/linux-f10-alsa-plugins-oss/pkg-plist (working copy) >@@ -1,6 +1,4 @@ >-@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 >@@ -10,4 +8,3 @@ usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-o > @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 >diff --git audio/linux-c6-alsa-lib/Makefile audio/linux-c6-alsa-lib/Makefile >index 35a9d92..092dc2e 100644 >--- audio/linux-c6-alsa-lib/Makefile >+++ audio/linux-c6-alsa-lib/Makefile >@@ -11,6 +11,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 >@@ -21,4 +23,12 @@ 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 >+ > .include <bsd.port.mk> >diff --git audio/linux-c6-alsa-plugins-oss/Makefile audio/linux-c6-alsa-plugins-oss/Makefile >index fc2ed4c..3b9809f 100644 >--- audio/linux-c6-alsa-plugins-oss/Makefile >+++ audio/linux-c6-alsa-plugins-oss/Makefile >@@ -25,15 +25,4 @@ 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}-dist >- >-post-install: >- @if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \ >- ${CP} -p ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE} ; \ >- fi >- > .include <bsd.port.mk> >diff --git audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf >deleted file mode 100644 >index bfb6e4e..0000000 >--- audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf >+++ /dev/null >@@ -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" >-+ } >-+} >diff --git audio/linux-c6-alsa-plugins-oss/pkg-deinstall audio/linux-c6-alsa-plugins-oss/pkg-deinstall >deleted file mode 100644 >index 22b3172..0000000 >--- audio/linux-c6-alsa-plugins-oss/pkg-deinstall >+++ /dev/null >@@ -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 >diff --git audio/linux-c6-alsa-plugins-oss/pkg-install audio/linux-c6-alsa-plugins-oss/pkg-install >deleted file mode 100644 >index b77ca3d..0000000 >--- audio/linux-c6-alsa-plugins-oss/pkg-install >+++ /dev/null >@@ -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 >diff --git audio/linux-c6-alsa-plugins-oss/pkg-plist audio/linux-c6-alsa-plugins-oss/pkg-plist >index d8cbdfe..48c82e1 100644 >--- audio/linux-c6-alsa-plugins-oss/pkg-plist >+++ audio/linux-c6-alsa-plugins-oss/pkg-plist >@@ -1,6 +1,4 @@ >-@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 >@@ -10,4 +8,3 @@ usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss > @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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 169896
:
126176
|
126177
|
126178
|
144609
|
147595
|
149455
|
149456