r2170 - in trunk
dslinux_sonny_jim at dslinux.in-berlin.de
dslinux_sonny_jim at dslinux.in-berlin.de
Tue Mar 18 20:11:18 CET 2008
Author: sonny_jim
Date: 2008-03-18 20:11:17 +0100 (Tue, 18 Mar 2008)
New Revision: 2170
Log:
Add Makefile, rc.d script for esd. Integrate into build system
Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help 2008-03-18 18:47:29 UTC (rev 2169)
+++ trunk/config/Configure.help 2008-03-18 19:11:17 UTC (rev 2170)
@@ -1268,6 +1268,9 @@
CONFIG_USER_MP3PLAY_SWAP_WD
Swap the meaning of the -w and -d command line options.
+CONFIG_USER_ESD
+ The Enlightenment Sound Daemon
+
CONFIG_USER_MUSICBOX_MUSICBOX
Front-end for mp3play and mixer
Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in 2008-03-18 18:47:29 UTC (rev 2169)
+++ trunk/config/config.in 2008-03-18 19:11:17 UTC (rev 2170)
@@ -913,6 +913,7 @@
if [ "$CONFIG_USER_MP3PLAY_MP3PLAY" = "y" ]; then
bool ' swap -d and -w options' CONFIG_USER_MP3PLAY_SWAP_WD
fi
+bool 'esd' CONFIG_USER_ESD
bool 'ogg123' CONFIG_USER_OGGPLAY_OGG123
bool 'ivorbisfile_example' CONFIG_USER_OGGPLAY_EXAMPLE
bool 'musicbox' CONFIG_USER_MUSICBOX_MUSICBOX
Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile 2008-03-18 18:47:29 UTC (rev 2169)
+++ trunk/user/Makefile 2008-03-18 19:11:17 UTC (rev 2170)
@@ -108,6 +108,7 @@
dir_$(CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND) += e2fsprogs
dir_$(CONFIG_USER_E2FSPROGS_MISC_TUNE2FS) += e2fsprogs
dir_$(CONFIG_USER_E2FSPROGS_MISC_UUIDGEN) += e2fsprogs
+dir_$(CONFIG_USER_ESD) += esd
dir_$(CONFIG_USER_ELVISTINY_VI) += elvis-tiny
dir_$(CONFIG_USER_ETHATTACH_ETHATTACH) += ethattach
dir_$(CONFIG_USER_ETHTOOL_ETHTOOL) += ethtool
Added: trunk/user/esd/Makefile
Added: trunk/user/esd/getip.c
Copied: trunk/user/esd/src (from rev 2169, tags/esound/esound-0.2.38)
Property changes on: trunk/user/esd/src
___________________________________________________________________
Name: svn:ignore
+ esddsp
Modified: trunk/vendors/Nintendo/common/rc.common
===================================================================
--- trunk/vendors/Nintendo/common/rc.common 2008-03-18 18:47:29 UTC (rev 2169)
+++ trunk/vendors/Nintendo/common/rc.common 2008-03-18 19:11:17 UTC (rev 2170)
@@ -100,6 +100,15 @@
fi
fi
+if [ "$start_esd" = "YES" ]
+then
+ if [ "$__network_up" = "YES" ]
+ then
+ /etc/rc.d/esd start
+ else
+ echo "Not starting esd: network is down"
+ fi
+fi
# set hostname
hostname $hostname
Added: trunk/vendors/Nintendo/common/rc.d/esd
Modified: trunk/vendors/Nintendo/common/rc.defaults
===================================================================
--- trunk/vendors/Nintendo/common/rc.defaults 2008-03-18 18:47:29 UTC (rev 2169)
+++ trunk/vendors/Nintendo/common/rc.defaults 2008-03-18 19:11:17 UTC (rev 2170)
@@ -138,6 +138,9 @@
# To start the syslog daemon, set to "YES"
start_syslogd="NO"
+# To start the Enlightenment Sound Daemon, set to "YES"
+start_esd="NO"
+
# If you use a proxy server in your environment, specify it here
# for ViewML.
export VIEWML_PROXY=""
More information about the dslinux-commit
mailing list