[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15808] branches/sound-branch: add patch 11

Robert Holcomb bob_holcomb at hotmail.com
Sun Jul 27 18:03:37 CEST 2008


Revision: 15808
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15808
Author:   scourage
Date:     2008-07-27 18:02:40 +0200 (Sun, 27 Jul 2008)

Log Message:
-----------
add patch 11

Modified Paths:
--------------
    branches/sound-branch/SConstruct
    branches/sound-branch/config/darwin-config.py
    branches/sound-branch/config/linux2-config.py
    branches/sound-branch/config/linuxcross-config.py
    branches/sound-branch/config/openbsd3-config.py
    branches/sound-branch/config/sunos5-config.py
    branches/sound-branch/config/win32-mingw-config.py
    branches/sound-branch/config/win32-vc-config.py
    branches/sound-branch/extern/Makefile
    branches/sound-branch/extern/SConscript
    branches/sound-branch/intern/CMakeLists.txt
    branches/sound-branch/intern/Makefile
    branches/sound-branch/intern/SConscript
    branches/sound-branch/intern/SoundSystem/Makefile
    branches/sound-branch/intern/SoundSystem/SConscript
    branches/sound-branch/intern/SoundSystem/SND_C-api.h
    branches/sound-branch/source/Makefile
    branches/sound-branch/source/blender/blenkernel/intern/anim.c
    branches/sound-branch/source/blender/blenkernel/intern/writeffmpeg.c
    branches/sound-branch/source/blender/include/BIF_editsound.h
    branches/sound-branch/source/blender/include/BSE_seqaudio.h
    branches/sound-branch/source/blender/include/butspace.h
    branches/sound-branch/source/blender/python/api2_2x/Sound.c
    branches/sound-branch/source/blender/python/api2_2x/bpy_data.c
    branches/sound-branch/source/blender/src/CMakeLists.txt
    branches/sound-branch/source/blender/src/Makefile
    branches/sound-branch/source/blender/src/SConscript
    branches/sound-branch/source/blender/src/buttons_logic.c
    branches/sound-branch/source/blender/src/buttons_scene.c
    branches/sound-branch/source/blender/src/drawseq.c
    branches/sound-branch/source/blender/src/drawsound.c
    branches/sound-branch/source/blender/src/drawview.c
    branches/sound-branch/source/blender/src/editipo.c
    branches/sound-branch/source/blender/src/editmesh_mods.c
    branches/sound-branch/source/blender/src/editscreen.c
    branches/sound-branch/source/blender/src/editseq.c
    branches/sound-branch/source/blender/src/editsound.c
    branches/sound-branch/source/blender/src/hddaudio.c
    branches/sound-branch/source/blender/src/header_sound.c
    branches/sound-branch/source/blender/src/header_time.c
    branches/sound-branch/source/blender/src/headerbuttons.c
    branches/sound-branch/source/blender/src/seqaudio.c
    branches/sound-branch/source/blender/src/sequence.c
    branches/sound-branch/source/blender/src/space.c
    branches/sound-branch/source/blender/src/toets.c
    branches/sound-branch/source/blender/src/usiblender.c
    branches/sound-branch/source/creator/creator.c
    branches/sound-branch/source/nan_definitions.mk
    branches/sound-branch/tools/Blender.py
    branches/sound-branch/tools/btools.py

Added Paths:
-----------
    branches/sound-branch/extern/libsamplerate/
    branches/sound-branch/extern/libsamplerate/AUTHORS
    branches/sound-branch/extern/libsamplerate/COPYING
    branches/sound-branch/extern/libsamplerate/ChangeLog
    branches/sound-branch/extern/libsamplerate/INSTALL
    branches/sound-branch/extern/libsamplerate/Make.bat
    branches/sound-branch/extern/libsamplerate/Makefile.am
    branches/sound-branch/extern/libsamplerate/Makefile.in
    branches/sound-branch/extern/libsamplerate/NEWS
    branches/sound-branch/extern/libsamplerate/README
    branches/sound-branch/extern/libsamplerate/SConscript
    branches/sound-branch/extern/libsamplerate/Win32/
    branches/sound-branch/extern/libsamplerate/Win32/Makefile.am
    branches/sound-branch/extern/libsamplerate/Win32/Makefile.in
    branches/sound-branch/extern/libsamplerate/Win32/Makefile.mingw.in
    branches/sound-branch/extern/libsamplerate/Win32/Makefile.msvc
    branches/sound-branch/extern/libsamplerate/Win32/config.h
    branches/sound-branch/extern/libsamplerate/Win32/libsamplerate.def
    branches/sound-branch/extern/libsamplerate/Win32/unistd.h
    branches/sound-branch/extern/libsamplerate/acinclude.m4
    branches/sound-branch/extern/libsamplerate/aclocal.m4
    branches/sound-branch/extern/libsamplerate/compile
    branches/sound-branch/extern/libsamplerate/config.guess
    branches/sound-branch/extern/libsamplerate/config.sub
    branches/sound-branch/extern/libsamplerate/configure
    branches/sound-branch/extern/libsamplerate/configure.ac
    branches/sound-branch/extern/libsamplerate/depcomp
    branches/sound-branch/extern/libsamplerate/doc/
    branches/sound-branch/extern/libsamplerate/doc/ChangeLog
    branches/sound-branch/extern/libsamplerate/doc/Makefile.am
    branches/sound-branch/extern/libsamplerate/doc/Makefile.in
    branches/sound-branch/extern/libsamplerate/doc/NEWS
    branches/sound-branch/extern/libsamplerate/doc/SRC.css
    branches/sound-branch/extern/libsamplerate/doc/api.html
    branches/sound-branch/extern/libsamplerate/doc/download.html
    branches/sound-branch/extern/libsamplerate/doc/faq.html
    branches/sound-branch/extern/libsamplerate/doc/history.html
    branches/sound-branch/extern/libsamplerate/doc/index.html
    branches/sound-branch/extern/libsamplerate/doc/license.html
    branches/sound-branch/extern/libsamplerate/doc/lists.html
    branches/sound-branch/extern/libsamplerate/doc/quality.html
    branches/sound-branch/extern/libsamplerate/doc/win32.html
    branches/sound-branch/extern/libsamplerate/examples/
    branches/sound-branch/extern/libsamplerate/examples/Makefile.am
    branches/sound-branch/extern/libsamplerate/examples/Makefile.in
    branches/sound-branch/extern/libsamplerate/examples/audio_out.c
    branches/sound-branch/extern/libsamplerate/examples/audio_out.h
    branches/sound-branch/extern/libsamplerate/examples/sndfile-resample.c
    branches/sound-branch/extern/libsamplerate/examples/varispeed-play.c
    branches/sound-branch/extern/libsamplerate/install-sh
    branches/sound-branch/extern/libsamplerate/libsamplerate.spec.in
    branches/sound-branch/extern/libsamplerate/ltmain.sh
    branches/sound-branch/extern/libsamplerate/missing
    branches/sound-branch/extern/libsamplerate/mkinstalldirs
    branches/sound-branch/extern/libsamplerate/reconfigure.mk
    branches/sound-branch/extern/libsamplerate/samplerate.pc.in
    branches/sound-branch/extern/libsamplerate/src/
    branches/sound-branch/extern/libsamplerate/src/Makefile.am
    branches/sound-branch/extern/libsamplerate/src/Makefile.in
    branches/sound-branch/extern/libsamplerate/src/Version_script.in
    branches/sound-branch/extern/libsamplerate/src/check_asm.sh
    branches/sound-branch/extern/libsamplerate/src/common.h
    branches/sound-branch/extern/libsamplerate/src/config.h.in
    branches/sound-branch/extern/libsamplerate/src/fastest_coeffs.h
    branches/sound-branch/extern/libsamplerate/src/float_cast.h
    branches/sound-branch/extern/libsamplerate/src/high_qual_coeffs.h
    branches/sound-branch/extern/libsamplerate/src/mid_qual_coeffs.h
    branches/sound-branch/extern/libsamplerate/src/samplerate.c
    branches/sound-branch/extern/libsamplerate/src/samplerate.h
    branches/sound-branch/extern/libsamplerate/src/src_linear.c
    branches/sound-branch/extern/libsamplerate/src/src_sinc.c
    branches/sound-branch/extern/libsamplerate/src/src_zoh.c
    branches/sound-branch/extern/libsamplerate/tests/
    branches/sound-branch/extern/libsamplerate/tests/Makefile.am
    branches/sound-branch/extern/libsamplerate/tests/Makefile.in
    branches/sound-branch/extern/libsamplerate/tests/benchmark.c
    branches/sound-branch/extern/libsamplerate/tests/calc_snr.c
    branches/sound-branch/extern/libsamplerate/tests/calc_snr.h
    branches/sound-branch/extern/libsamplerate/tests/callback_test.c
    branches/sound-branch/extern/libsamplerate/tests/float_short_test.c
    branches/sound-branch/extern/libsamplerate/tests/misc_test.c
    branches/sound-branch/extern/libsamplerate/tests/multi_channel_test.c
    branches/sound-branch/extern/libsamplerate/tests/reset_test.c
    branches/sound-branch/extern/libsamplerate/tests/simple_test.c
    branches/sound-branch/extern/libsamplerate/tests/snr_bw_test.c
    branches/sound-branch/extern/libsamplerate/tests/src-evaluate.c
    branches/sound-branch/extern/libsamplerate/tests/termination_test.c
    branches/sound-branch/extern/libsamplerate/tests/util.c
    branches/sound-branch/extern/libsamplerate/tests/util.h
    branches/sound-branch/extern/tinySND/
    branches/sound-branch/extern/tinySND/Makefile
    branches/sound-branch/extern/tinySND/SConscript
    branches/sound-branch/extern/tinySND/core/
    branches/sound-branch/extern/tinySND/core/SND_AiffReader.cpp
    branches/sound-branch/extern/tinySND/core/SND_AiffReader.h
    branches/sound-branch/extern/tinySND/core/SND_DataCache.cpp
    branches/sound-branch/extern/tinySND/core/SND_DataCache.h
    branches/sound-branch/extern/tinySND/core/SND_DataConsumer.cpp
    branches/sound-branch/extern/tinySND/core/SND_DataConsumer.h
    branches/sound-branch/extern/tinySND/core/SND_DataMultiplexer.cpp
    branches/sound-branch/extern/tinySND/core/SND_DataMultiplexer.h
    branches/sound-branch/extern/tinySND/core/SND_DataProvider.h
    branches/sound-branch/extern/tinySND/core/SND_Defines.h
    branches/sound-branch/extern/tinySND/core/SND_Device.h
    branches/sound-branch/extern/tinySND/core/SND_FXDuplicator.cpp
    branches/sound-branch/extern/tinySND/core/SND_FXDuplicator.h
    branches/sound-branch/extern/tinySND/core/SND_FXMixer.cpp
    branches/sound-branch/extern/tinySND/core/SND_FXMixer.h
    branches/sound-branch/extern/tinySND/core/SND_FXSample.cpp
    branches/sound-branch/extern/tinySND/core/SND_FXSample.h
    branches/sound-branch/extern/tinySND/core/SND_NullDevice.cpp
    branches/sound-branch/extern/tinySND/core/SND_NullDevice.h
    branches/sound-branch/extern/tinySND/core/SND_SoundInterface.cpp
    branches/sound-branch/extern/tinySND/core/SND_SoundInterface.h
    branches/sound-branch/extern/tinySND/core/SND_WavReader.cpp
    branches/sound-branch/extern/tinySND/core/SND_WavReader.h
    branches/sound-branch/extern/tinySND/ffmpeg/
    branches/sound-branch/extern/tinySND/ffmpeg/ffmpegReader.cpp
    branches/sound-branch/extern/tinySND/ffmpeg/ffmpegReader.h
    branches/sound-branch/extern/tinySND/ffmpeg/ffmpegWriter.cpp
    branches/sound-branch/extern/tinySND/ffmpeg/ffmpegWriter.h
    branches/sound-branch/extern/tinySND/jack/
    branches/sound-branch/extern/tinySND/jack/jackDevice.cpp
    branches/sound-branch/extern/tinySND/jack/jackDevice.h
    branches/sound-branch/extern/tinySND/mad/
    branches/sound-branch/extern/tinySND/mad/madReader.cpp
    branches/sound-branch/extern/tinySND/mad/madReader.h
    branches/sound-branch/extern/tinySND/portaudio/
    branches/sound-branch/extern/tinySND/portaudio/portaudioDevice.cpp
    branches/sound-branch/extern/tinySND/portaudio/portaudioDevice.h
    branches/sound-branch/extern/tinySND/samplerate/
    branches/sound-branch/extern/tinySND/samplerate/SND_FXSRC.cpp
    branches/sound-branch/extern/tinySND/samplerate/SND_FXSRC.h
    branches/sound-branch/extern/tinySND/sdl/
    branches/sound-branch/extern/tinySND/sdl/sdlDevice.cpp
    branches/sound-branch/extern/tinySND/sdl/sdlDevice.h
    branches/sound-branch/extern/tinySND/sndfile/
    branches/sound-branch/extern/tinySND/sndfile/sndfileReader.cpp
    branches/sound-branch/extern/tinySND/sndfile/sndfileReader.h
    branches/sound-branch/extern/tinySND/sndfile/sndfileWriter.cpp
    branches/sound-branch/extern/tinySND/sndfile/sndfileWriter.h
    branches/sound-branch/extern/tinySND/vorbis/
    branches/sound-branch/extern/tinySND/vorbis/vorbisReader.cpp
    branches/sound-branch/extern/tinySND/vorbis/vorbisReader.h
    branches/sound-branch/extern/tinySND/wavpack/
    branches/sound-branch/extern/tinySND/wavpack/wavpackReader.cpp
    branches/sound-branch/extern/tinySND/wavpack/wavpackReader.h
    branches/sound-branch/intern/SoundSystem/SND_device.cpp
    branches/sound-branch/intern/SoundSystem/SND_factory.cpp
    branches/sound-branch/intern/SoundSystem/SND_file.cpp
    branches/sound-branch/intern/SoundSystem/SND_general.cpp
    branches/sound-branch/intern/SoundSystem/SND_internal.h
    branches/sound-branch/intern/SoundSystem/SND_mixbuffer.cpp
    branches/sound-branch/intern/SoundSystem/SND_sound.cpp
    branches/sound-branch/intern/SoundSystem/SND_soundattrs.cpp
    branches/sound-branch/intern/SoundSystem/SND_soundvisual.cpp
    branches/sound-branch/intern/SoundSystem/readme
    branches/sound-branch/source/blender/src/seqaudio2.c
    branches/sound-branch/source/blender/src/soundsystem.c

Modified: branches/sound-branch/SConstruct
===================================================================
--- branches/sound-branch/SConstruct	2008-07-27 15:27:42 UTC (rev 15807)
+++ branches/sound-branch/SConstruct	2008-07-27 16:02:40 UTC (rev 15808)
@@ -201,40 +201,6 @@
 
 printdebug = B.arguments.get('BF_LISTDEBUG', 0)
 
-# see if this linux distro has libalut
-
-if env['OURPLATFORM'] == 'linux2' :
-    if env['WITH_BF_OPENAL']:
-        mylib_test_source_file = """
-        #include "AL/alut.h"
-        int main(int argc, char **argv)
-        {
-            alutGetMajorVersion();
-            return 0;
-        }
-        """
-
-        def CheckFreeAlut(context,env):
-            context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )
-            env['LIBS'] = 'alut'
-            result = context.TryLink(mylib_test_source_file, '.c')
-            context.Result(result)
-            return result
-
-        env2 = env.Copy( LIBPATH = env['BF_OPENAL'] ) 
-        sconf_temp = mkdtemp()
-        conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
-        if conf.CheckFreeAlut( env2 ):
-            env['BF_OPENAL_LIB'] += ' alut'
-        del env2
-        root = ''
-        for root, dirs, files in os.walk(sconf_temp, topdown=False):
-            for name in files:
-                os.remove(os.path.join(root, name))
-            for name in dirs:
-                os.rmdir(os.path.join(root, name))
-        if root: os.rmdir(root)
-
 if len(B.quickdebug) > 0 and printdebug != 0:
     print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
     for l in B.quickdebug:

Modified: branches/sound-branch/config/darwin-config.py
===================================================================
--- branches/sound-branch/config/darwin-config.py	2008-07-27 15:27:42 UTC (rev 15807)
+++ branches/sound-branch/config/darwin-config.py	2008-07-27 16:02:40 UTC (rev 15808)
@@ -74,33 +74,55 @@
 BF_QUIET = '1'
 WITH_BF_OPENMP = '0'
 
-# Note : should be true, but openal simply dont work on intel
-if MAC_PROC == 'i386':
-	WITH_BF_OPENAL = 'false'
-else:
-	WITH_BF_OPENAL = 'true'
-#different lib must be used  following version of gcc
-# for gcc 3.3
-#BF_OPENAL = LIBDIR + '/openal'
-# for gcc 3.4 and ulterior
-if MAC_PROC == 'powerpc':
-	BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
-else :
-	BF_OPENAL = LIBDIR + '/openal'
-	
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
 WITH_BF_SDL = 'true'
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/libsamplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
 
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'false'
+BF_PORTAUDIO = '/usr'
+BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
+BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
+
+#tinySND: jackDevice backend
+WITH_BF_JACK = 'false'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'false'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'false'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'false'
+BF_VORBIS = '/usr'
+BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
+BF_VORBIS_LIB = 'vorbis vorbisfile'
+
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '${LCGDIR}/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'

Modified: branches/sound-branch/config/linux2-config.py
===================================================================
--- branches/sound-branch/config/linux2-config.py	2008-07-27 15:27:42 UTC (rev 15807)
+++ branches/sound-branch/config/linux2-config.py	2008-07-27 16:02:40 UTC (rev 15808)
@@ -11,22 +11,54 @@
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
 BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
 
-WITH_BF_OPENAL = 'true'
-BF_OPENAL = '/usr'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# BF_OPENAL_LIB = 'openal alut'  
-
 WITH_BF_SDL = 'true'
 BF_SDL = '/usr' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/libsamplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
 
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'false'
+BF_PORTAUDIO = '/usr'
+BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
+BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
+
+#tinySND: jackDevice backend
+WITH_BF_JACK = 'false'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'false'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'false'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'false'
+BF_VORBIS = '/usr'
+BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
+BF_VORBIS_LIB = 'vorbis vorbisfile'
+
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr'
 # when compiling with your own openexr lib you might need to set...

Modified: branches/sound-branch/config/linuxcross-config.py
===================================================================
--- branches/sound-branch/config/linuxcross-config.py	2008-07-27 15:27:42 UTC (rev 15807)
+++ branches/sound-branch/config/linuxcross-config.py	2008-07-27 16:02:40 UTC (rev 15808)
@@ -13,12 +13,6 @@
 BF_PYTHON_LIB = 'python25'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
-WITH_BF_OPENAL = 'true'
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal_static'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
 WITH_BF_SDL = 'true'
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
@@ -30,9 +24,49 @@
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/libsamplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
 
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'false'
+BF_PORTAUDIO = '/usr'
+BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
+BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
+
+#tinySND: jackDevice backend
+WITH_BF_JACK = 'false'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'false'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'false'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'false'
+BF_VORBIS = '/usr'
+BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
+BF_VORBIS_LIB = 'vorbis vorbisfile'
+
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = LIBDIR + '/gcc/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'

Modified: branches/sound-branch/config/openbsd3-config.py
===================================================================
--- branches/sound-branch/config/openbsd3-config.py	2008-07-27 15:27:42 UTC (rev 15807)
+++ branches/sound-branch/config/openbsd3-config.py	2008-07-27 16:02:40 UTC (rev 15808)
@@ -8,21 +8,55 @@
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
 
-WITH_BF_OPENAL = 'false'
-#BF_OPENAL = LIBDIR + '/openal'
-#BF_OPENAL_INC = '${BF_OPENAL}/include'
-#BF_OPENAL_LIB = 'openal'
-#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
 WITH_BF_SDL = 'true'
 BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/libsamplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
 
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'false'
+BF_PORTAUDIO = '/usr'
+BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list