[commit] r2394 - in trunk: config lib lib/libsndfile lib/libsndfile/src

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: dslinux_sonny_jim
Date: Thu Dec 18 18:56:14 2008
New Revision: 2394

Log:
libsndfile for DSLinux

Added:
   trunk/lib/libsndfile/
   trunk/lib/libsndfile/Makefile
   trunk/lib/libsndfile/src/
      - copied from r2393, /tags/libsndfile/libsndfile-1.0.17/
Modified:
   trunk/config/Configure.help
   trunk/config/config.in
   trunk/lib/Makefile
   trunk/lib/libsndfile/src/Makefile.in

Modified: trunk/config/Configure.help
==============================================================================
--- trunk/config/Configure.help	(original)
+++ trunk/config/Configure.help	Thu Dec 18 18:56:14 2008
@@ -4021,8 +4021,11 @@
 CONFIG_USER_SOX
   SoX, the Swiss Army knife of sound processing programs
 
-CONFIG_LIB_LIBSAMPLERATE
+CONFIG_LIB_LIBSAMPLERATE_FORCE
   Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio.
+
+CONFIG_LIB_LIBSNDFILE_FORCE
+  Library for reading and writing files containing sampled sound.
 #
 #
 # END of proprietary config help

Modified: trunk/config/config.in
==============================================================================
--- trunk/config/config.in	(original)
+++ trunk/config/config.in	Thu Dec 18 18:56:14 2008
@@ -102,7 +102,7 @@
 bool 'Build libupnp'    CONFIG_LIB_LIBUPNP_FORCE
 bool 'Build ncurses'		CONFIG_LIB_NCURSES_FORCE
 bool 'Build STLport'		CONFIG_LIB_STLPORT
-bool 'Build libsamplerate'	CONFIG_LIB_LIBSAMPLERATE
+bool 'Build libsamplerate'	CONFIG_LIB_LIBSAMPLERATE_FORCE
 dep_bool '  Build STLport as shared'	CONFIG_LIB_STLPORT_SHARED $CONFIG_LIB_STLPORT
 bool 'Build expat'		CONFIG_LIB_EXPAT_FORCE
 bool 'Build adns'		CONFIG_LIB_ADNS_FORCE
@@ -126,6 +126,7 @@
 bool 'Build libtremor'          CONFIG_LIB_TREMOR_FORCE
 bool 'Build libSDL'             CONFIG_LIB_SDL_FORCE
 bool 'Build libSDL_Mixer'       CONFIG_LIB_SDL_MIXER_FORCE
+bool 'Build libsndfile'         CONFIG_LIB_LIBSNDFILE_FORCE
 
 comment 'Library Configuration'
 bool 'Support time zones'	CONFIG_LIB_UC_LIBC_TIMEZONE
@@ -966,6 +967,7 @@
 bool 'sox'			CONFIG_USER_SOX
 if [ "$CONFIG_USER_SOX" = "y" ]; then
 	define_bool CONFIG_LIB_LIBSAMPLERATE=y
+	define_bool CONFIG_LIB_LIBSNDFILE=y
 fi
 bool 'xmp'			CONFIG_USER_XMP_XMP
 

Modified: trunk/lib/Makefile
==============================================================================
--- trunk/lib/Makefile	(original)
+++ trunk/lib/Makefile	Thu Dec 18 18:56:14 2008
@@ -111,6 +111,7 @@
 dir_$(CONFIG_LIB_SDL_MIXER_FORCE) += sdl_mixer
 dir_$(CONFIG_LIB_AUDIOFILE) += audiofile
 dir_$(CONFIG_LIB_AUDIOFILE_FORCE) += audiofile
+dir_$(CONFIG_LIB_LIBSNDFILE_FORCE) += libsndfile
 
 # And build libraries in the prop directory last
 dir_y += $(ROOTDIR)/prop
@@ -209,6 +210,7 @@
 	$(ROOTDIR)/lib/libtremor/src/.libs/*.a \
 	$(ROOTDIR)/lib/sdl_mixer/src/build/.libs/*.a \
 	$(ROOTDIR)/lib/libsamplerate/src/src/.libs/*.a 
+	$(ROOTDIR)/lib/libsndfile/src/src/.libs/*.a 
 
 ##############################################################################
 

Modified: trunk/lib/libsndfile/src/Makefile.in
==============================================================================
--- /tags/libsndfile/libsndfile-1.0.17/Makefile.in	(original)
+++ trunk/lib/libsndfile/src/Makefile.in	Thu Dec 18 18:56:14 2008
@@ -209,7 +209,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = man doc Win32 Octave src examples regtest tests
+SUBDIRS = man doc Win32 Octave src examples regtest
 DIST_SUBDIRS = $(SUBDIRS)
 EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
 			sndfile.pc.in Mingw-make-dist.sh