[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40746] trunk/blender: * Removing libsamplerate from build systems

Joerg Mueller nexyon at gmail.com
Sun Oct 2 19:09:39 CEST 2011


Revision: 40746
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40746
Author:   nexyon
Date:     2011-10-02 17:09:39 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
* Removing libsamplerate from build systems
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/buildbot/config/user-config-i686.py
    trunk/blender/build_files/buildbot/config/user-config-player-i686.py
    trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
    trunk/blender/build_files/buildbot/config/user-config-x86_64.py
    trunk/blender/build_files/cmake/config/blender_headless.cmake
    trunk/blender/build_files/cmake/config/blender_lite.cmake
    trunk/blender/build_files/cmake/config/bpy_module.cmake
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/build_files/package_spec/debian/control
    trunk/blender/build_files/package_spec/pacman/PKGBUILD
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/build_files/scons/config/freebsd7-config.py
    trunk/blender/build_files/scons/config/freebsd8-config.py
    trunk/blender/build_files/scons/config/freebsd9-config.py
    trunk/blender/build_files/scons/config/linux-config.py
    trunk/blender/build_files/scons/config/linuxcross-config.py
    trunk/blender/build_files/scons/config/openbsd3-config.py
    trunk/blender/build_files/scons/config/sunos5-config.py
    trunk/blender/build_files/scons/config/win32-mingw-config.py
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/intern/audaspace/CMakeLists.txt
    trunk/blender/intern/audaspace/SConscript

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/CMakeLists.txt	2011-10-02 17:09:39 UTC (rev 40746)
@@ -189,7 +189,6 @@
 option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
 option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
 option(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
-option(WITH_SAMPLERATE    "Enable samplerate conversion" ON)
 
 # Compression
 option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
@@ -447,13 +446,6 @@
 		endif()
 	endif()
 
-	if(WITH_SAMPLERATE)
-		find_package(Samplerate)
-		if(NOT SAMPLERATE_FOUND)
-			set(WITH_SAMPLERATE OFF)
-		endif()
-	endif()
-
 	if(WITH_OPENCOLLADA)
 		find_package(OpenCOLLADA)
 		if(OPENCOLLADA_FOUND)
@@ -565,13 +557,6 @@
 		set(ICONV_LIBPATH ${ICONV}/lib)
 	endif()
 
-	if(WITH_SAMPLERATE)
-		set(SAMPLERATE ${LIBDIR}/samplerate)
-		set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
-		set(SAMPLERATE_LIBRARIES libsamplerate)
-		set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
-	endif()
-
 	set(PNG "${LIBDIR}/png")
 	set(PNG_INCLUDE_DIR "${PNG}/include")
 	set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
@@ -995,13 +980,6 @@
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	endif()
 
-	if(WITH_SAMPLERATE)
-		set(SAMPLERATE ${LIBDIR}/samplerate)
-		set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
-		set(SAMPLERATE_LIBRARIES samplerate)
-		set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
-	endif()
-
 	find_library(SYSTEMSTUBS_LIBRARY
 		NAMES
 		SystemStubs
@@ -1436,7 +1414,6 @@
 	info_cfg_option(WITH_JACK)
 	info_cfg_option(WITH_CODEC_FFMPEG)
 	info_cfg_option(WITH_CODEC_SNDFILE)
-	info_cfg_option(WITH_SAMPLERATE)
 
 	info_cfg_text("Compression:")
 	info_cfg_option(WITH_LZMA)

Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-10-02 17:09:39 UTC (rev 40746)
@@ -58,8 +58,6 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
-WITH_BF_STATICLIBSAMPLERATE = True
-
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'

Modified: trunk/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-player-i686.py	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/buildbot/config/user-config-player-i686.py	2011-10-02 17:09:39 UTC (rev 40746)
@@ -52,8 +52,6 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
-WITH_BF_STATICLIBSAMPLERATE = True
-
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'

Modified: trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-10-02 17:09:39 UTC (rev 40746)
@@ -52,8 +52,6 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
 
-WITH_BF_STATICLIBSAMPLERATE = True
-
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'

Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-10-02 17:09:39 UTC (rev 40746)
@@ -58,8 +58,6 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
 
-WITH_BF_STATICLIBSAMPLERATE = True
-
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'

Modified: trunk/blender/build_files/cmake/config/blender_headless.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_headless.cmake	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/cmake/config/blender_headless.cmake	2011-10-02 17:09:39 UTC (rev 40746)
@@ -11,7 +11,6 @@
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_SAMPLERATE          OFF CACHE FORCE BOOL)
 set(WITH_FFTW3               OFF CACHE FORCE BOOL)
 set(WITH_JACK                OFF CACHE FORCE BOOL)
 set(WITH_SDL                 OFF CACHE FORCE BOOL)

Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake	2011-10-02 17:09:39 UTC (rev 40746)
@@ -38,6 +38,5 @@
 set(WITH_OPENMP              OFF CACHE FORCE BOOL)
 set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
 set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
-set(WITH_SAMPLERATE          OFF CACHE FORCE BOOL)
 set(WITH_SDL                 OFF CACHE FORCE BOOL)
 set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)

Modified: trunk/blender/build_files/cmake/config/bpy_module.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/bpy_module.cmake	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/cmake/config/bpy_module.cmake	2011-10-02 17:09:39 UTC (rev 40746)
@@ -18,7 +18,6 @@
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_SAMPLERATE          OFF CACHE FORCE BOOL)
 set(WITH_FFTW3               OFF CACHE FORCE BOOL)
 set(WITH_JACK                OFF CACHE FORCE BOOL)
 set(WITH_SDL                 OFF CACHE FORCE BOOL)

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-10-02 17:09:39 UTC (rev 40746)
@@ -181,9 +181,6 @@
 	if(WITH_CODEC_SNDFILE)
 		link_directories(${SNDFILE_LIBPATH})
 	endif()
-	if(WITH_SAMPLERATE)
-		link_directories(${SAMPLERATE_LIBPATH})
-	endif()
 	if(WITH_FFTW3)
 		link_directories(${FFTW3_LIBPATH})
 	endif()
@@ -254,9 +251,6 @@
 	if(WITH_CODEC_SNDFILE)
 		target_link_libraries(${target} ${SNDFILE_LIBRARIES})
 	endif()
-	if(WITH_SAMPLERATE)
-		target_link_libraries(${target} ${SAMPLERATE_LIBRARIES})
-	endif()
 	if(WITH_SDL)
 		target_link_libraries(${target} ${SDL_LIBRARY})
 	endif()

Modified: trunk/blender/build_files/package_spec/debian/control
===================================================================
--- trunk/blender/build_files/package_spec/debian/control	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/package_spec/debian/control	2011-10-02 17:09:39 UTC (rev 40746)
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: extra
 Maintainer: Dan Eicher <dan at trollwerks.org>
-Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.2-dev, libopenjpeg-dev
+Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.2-dev, libopenjpeg-dev
 Standards-Version: 3.9.1
 Homepage: http://blender.org/
 X-Python3-Version: >= 3.2, << 3.3

Modified: trunk/blender/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/package_spec/pacman/PKGBUILD	2011-10-02 17:09:39 UTC (rev 40746)
@@ -25,7 +25,7 @@
 url="www.blender.org"
 license=('GPL')
 groups=()
-depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.2' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg')
+depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.2' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'ffmpeg')
 makedepends=('cmake' 'svn')
 optdepends=()
 provides=()

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2011-10-02 17:09:39 UTC (rev 40746)
@@ -148,11 +148,6 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
-BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
-BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
-BF_LIBSAMPLERATE_LIB = 'samplerate'
-BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
-
 # TODO - set proper paths here (add precompiled to lib/ ? )
 WITH_BF_JACK = False
 BF_JACK = '/usr'

Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py	2011-10-02 16:43:39 UTC (rev 40745)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py	2011-10-02 17:09:39 UTC (rev 40746)
@@ -25,11 +25,6 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
-BF_LIBSAMPLERATE = '/usr/local'
-BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
-BF_LIBSAMPLERATE_LIB = 'samplerate'
-BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
-
 WITH_BF_JACK = True
 BF_JACK = '/usr/local'

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list