summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-28 19:01:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-28 19:01:05 +0000
commitd374b66bd16f4ab6611d541d19b070e361a1f55b (patch)
treeaba68af65590534c3e334d6b93e71e5c97bb870f /media-sound/awesfx
parentVersion bump. (diff)
downloadgentoo-2-d374b66bd16f4ab6611d541d19b070e361a1f55b.tar.gz
gentoo-2-d374b66bd16f4ab6611d541d19b070e361a1f55b.tar.bz2
gentoo-2-d374b66bd16f4ab6611d541d19b070e361a1f55b.zip
Use asfxload instead of sfxload by default in init files wrt #290458 by Lukasz Pawelczyk.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/awesfx')
-rw-r--r--media-sound/awesfx/ChangeLog9
-rw-r--r--media-sound/awesfx/files/sfxload.confd3
-rw-r--r--media-sound/awesfx/files/sfxload.initd8
3 files changed, 14 insertions, 6 deletions
diff --git a/media-sound/awesfx/ChangeLog b/media-sound/awesfx/ChangeLog
index ae862cffda2f..dd7566b300a6 100644
--- a/media-sound/awesfx/ChangeLog
+++ b/media-sound/awesfx/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/awesfx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.30 2009/06/10 14:48:32 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.31 2010/04/28 19:01:05 ssuominen Exp $
+
+ 28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> files/sfxload.confd,
+ files/sfxload.initd:
+ Use asfxload instead of sfxload by default in init files wrt #290458 by
+ Lukasz Pawelczyk.
10 Jun 2009; Raúl Porcel <armin76@gentoo.org> awesfx-0.5.1c.ebuild:
sparc stable wrt #270569
diff --git a/media-sound/awesfx/files/sfxload.confd b/media-sound/awesfx/files/sfxload.confd
index 2ab604f80ac7..e44815a7c71b 100644
--- a/media-sound/awesfx/files/sfxload.confd
+++ b/media-sound/awesfx/files/sfxload.confd
@@ -1,4 +1,7 @@
# /etc/conf.d/sfxload
+# sfxload or asfxload
+sfxload="asfxload"
+
# Example location of sound bank for sfxload init script
sfxbank="/usr/share/sounds/sf2/foobar.bin"
diff --git a/media-sound/awesfx/files/sfxload.initd b/media-sound/awesfx/files/sfxload.initd
index 6c71ce40807a..39f6b8facf36 100644
--- a/media-sound/awesfx/files/sfxload.initd
+++ b/media-sound/awesfx/files/sfxload.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/files/sfxload.initd,v 1.1 2009/05/30 19:22:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/files/sfxload.initd,v 1.2 2010/04/28 19:01:05 ssuominen Exp $
depend() {
need alsasound
@@ -9,12 +9,12 @@ depend() {
start() {
ebegin "Loading sound font bank"
- /usr/bin/sfxload -q ${sfxbank}
+ ${sfxload} -q "${sfxbank}"
eend $? "Error at loading sound font bank ${sfxbank}"
}
stop() {
ebegin "Unloading sound font bank"
- /usr/bin/sfxload -i -q
+ ${sfxload} -i -q
eend $? "Error at unloading sound font bank"
}