r2182 - in trunk
dslinux_sonny_jim at dslinux.in-berlin.de
dslinux_sonny_jim at dslinux.in-berlin.de
Mon Mar 31 18:27:07 CEST 2008
Author: sonny_jim
Date: 2008-03-31 18:27:07 +0200 (Mon, 31 Mar 2008)
New Revision: 2182
Log:
Integrating audiofile-0.2.6
Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help 2008-03-31 16:13:10 UTC (rev 2181)
+++ trunk/config/Configure.help 2008-03-31 16:27:07 UTC (rev 2182)
@@ -491,6 +491,10 @@
server. (old version - mk68k targets only)
Approx. binary size: 14k
+CONFIG_LIB_AUDIOFILE_FORCE
+ The Audio File Library provides a uniform and elegant API for
+ accessing a variety of audio file formats
+
CONFIG_LIB_GPM_FORCE
The General Purpose Mouse daemon and library.
With the daemon you can use the mouse on the DSLinux console.
Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in 2008-03-31 16:13:10 UTC (rev 2181)
+++ trunk/config/config.in 2008-03-31 16:27:07 UTC (rev 2182)
@@ -81,6 +81,7 @@
comment 'Library Configuration'
comment 'Force build (Normally built when required)'
+bool 'Build audiofile' CONFIG_LIB_AUDIOFILE_FORCE
bool 'Build flex' CONFIG_LIB_FLEX_FORCE
bool 'Build gpm' CONFIG_LIB_GPM_FORCE
bool 'Build libAES' CONFIG_LIB_LIBAES_FORCE
@@ -915,6 +916,9 @@
bool ' swap -d and -w options' CONFIG_USER_MP3PLAY_SWAP_WD
fi
bool 'esd' CONFIG_USER_ESD
+if [ "$CONFIG_USER_ESD" = "y" ]; then
+ define_bool CONFIG_LIB_AUDIOFILE y
+fi
bool 'ogg123' CONFIG_USER_OGGPLAY_OGG123
bool 'ivorbisfile_example' CONFIG_USER_OGGPLAY_EXAMPLE
bool 'musicbox' CONFIG_USER_MUSICBOX_MUSICBOX
Modified: trunk/include/Makefile
===================================================================
--- trunk/include/Makefile 2008-03-31 16:13:10 UTC (rev 2181)
+++ trunk/include/Makefile 2008-03-31 16:27:07 UTC (rev 2182)
@@ -71,7 +71,9 @@
$(ROOTDIR)/lib/glib/src/glib/glib.h,. \
$(ROOTDIR)/lib/glib/src/glibconfig.h,. \
$(ROOTDIR)/lib/glib/src/glib/,. \
- $(ROOTDIR)/lib/sdl/src/include/*.h,.
+ $(ROOTDIR)/lib/sdl/src/include/*.h,. \
+ $(ROOTDIR)/lib/audiofile/src/libaudiofile/audiofile.h,. \
+ $(ROOTDIR)/lib/audiofile/src/libaudiofile/aupvlist.h,.
#
# Both freeswan and openswan can provide des and crypto headers
# and we need to make sure we are using the correct ones.
Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile 2008-03-31 16:13:10 UTC (rev 2181)
+++ trunk/lib/Makefile 2008-03-31 16:27:07 UTC (rev 2182)
@@ -102,8 +102,10 @@
dir_$(CONFIG_LIB_LIBGETTEXT_FORCE) += gettext
dir_$(CONFIG_LIB_LIBGLIB) += glib
dir_$(CONFIG_LIB_LIBGLIB_FORCE) += glib
- dir_$(CONFIG_LIB_SDL) += sdl
- dir_$(CONFIG_LIB_SDL_FORCE) += sdl
+dir_$(CONFIG_LIB_SDL) += sdl
+dir_$(CONFIG_LIB_SDL_FORCE) += sdl
+dir_$(CONFIG_LIB_AUDIOFILE) += audiofile
+dir_$(CONFIG_LIB_AUDIOFILE_FORCE) += audiofile
# And build libraries in the prop directory last
dir_y += $(ROOTDIR)/prop
@@ -197,7 +199,8 @@
$(ROOTDIR)/lib/gettext/src/gettext-runtime/intl/.libs/*.a \
$(ROOTDIR)/lib/glib/src/glib/.libs/*.a \
$(ROOTDIR)/lib/glib/src/gmodule/.libs/*.a \
- $(ROOTDIR)/lib/sdl/src/build/.libs/*.a
+ $(ROOTDIR)/lib/sdl/src/build/.libs/*.a \
+ $(ROOTDIR)/lib/audiofile/src/libaudiofile/.libs/*.a
##############################################################################
Added: trunk/lib/audiofile/Makefile
Copied: trunk/lib/audiofile/src (from rev 2181, tags/audiofile/audiofile-0.2.6)
More information about the dslinux-commit
mailing list