Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-03-27 11:19:54 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-03-27 11:19:54 +0400
commit31eee77a4503ac38c3d9d96a5f77df86648c700c (patch)
tree6b7454f75cf78ff485e9b28f5f768daad9cd69b1 /build_files/buildbot/config/user-config-player-glibc211-x86_64.py
parent91b2b970ade21a70c3c7289cefff6c2cbb2059cd (diff)
Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
Added new build option WITH_JACK_DYNLOAD for CMake and WITH_BF_JACK_DYNLOAD for SCons, which means there'll be no build-time linking against libjack and getting symbols from libjack will happen runtime using dlopen and dlsym tricks. Alternative would be to use weak linking, but it'll require having wrapper for preloading libjack. This new options are disabled by default and they only intended to be used on linux. Other platforms shall not be using this and there shall be no functional changes on non-linux platforms at all.
Diffstat (limited to 'build_files/buildbot/config/user-config-player-glibc211-x86_64.py')
-rw-r--r--build_files/buildbot/config/user-config-player-glibc211-x86_64.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
index c17cff2893d..c58da9dcffb 100644
--- a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
+++ b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
@@ -103,9 +103,8 @@ BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBP
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
# JACK
-WITH_BF_JACK = False
-WITH_BF_STATICJACK = True
-BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
+WITH_BF_JACK = True
+WITH_BF_JACK_DYNLOAD = True
# Motion Tracking
WITH_BF_LIBMV = False