From 132478d4b8bb5dc1554f7ca01ac337fe1978e5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Sat, 22 Oct 2016 14:20:47 +0200 Subject: Fix T49657: Audio backend "Jack" should be named "JACK". --- build_files/cmake/Modules/FindJack.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index 9a847fabf70..59aa7fcf60b 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -1,15 +1,15 @@ -# - Find Jack library -# Find the native Jack includes and library +# - Find JACK library +# Find the native JACK includes and library # This module defines # JACK_INCLUDE_DIRS, where to find jack.h, Set when # JACK_INCLUDE_DIR is found. -# JACK_LIBRARIES, libraries to link against to use Jack. -# JACK_ROOT_DIR, The base directory to search for Jack. +# JACK_LIBRARIES, libraries to link against to use JACK. +# JACK_ROOT_DIR, The base directory to search for JACK. # This can also be an environment variable. -# JACK_FOUND, If false, do not try to use Jack. +# JACK_FOUND, If false, do not try to use JACK. # # also defined, but not for general use are -# JACK_LIBRARY, where to find the Jack library. +# JACK_LIBRARY, where to find the JACK library. #============================================================================= # Copyright 2011 Blender Foundation. @@ -56,7 +56,7 @@ FIND_LIBRARY(JACK_LIBRARY # handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(JACK DEFAULT_MSG JACK_LIBRARY JACK_INCLUDE_DIR) IF(JACK_FOUND) -- cgit v1.2.3 From b5d527ff6c7e01b73c14d8e01b7e33a697d30b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Sat, 22 Oct 2016 15:00:32 +0200 Subject: Fix T49656: Crash when starting playback while using JACK audio with A/V sync When ED_screen_animation_play is called from wm_event_do_handlers,ScrArea *sa = CTX_wm_area(C); is NULL in ED_screen_animation_timer. Informing the audio system in CTX_data_main_set, that a new Main has been set. --- build_files/cmake/Modules/FindJack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index 59aa7fcf60b..caafa3c34a1 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -56,7 +56,7 @@ FIND_LIBRARY(JACK_LIBRARY # handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JACK DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG JACK_LIBRARY JACK_INCLUDE_DIR) IF(JACK_FOUND) -- cgit v1.2.3 From d2fe875f8c9d7cbe8edd0bd71dac1a7b16945613 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 25 Oct 2016 09:28:25 +0200 Subject: Fix possible compilation error with OIIO enabled OIIO library has plugin API which uses dlopen()/dlclose() so need to link OIO libraries against dl library. --- build_files/cmake/platform/platform_unix.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index e33141f8012..62f44cf1739 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -298,6 +298,7 @@ if(WITH_OPENIMAGEIO) ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES} + ${CMAKE_DL_LIBS} ) set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere set(OPENIMAGEIO_DEFINITIONS "") -- cgit v1.2.3 From 3e7100644861368b5ec951cf36c631e0828012f8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 25 Oct 2016 10:22:03 +0200 Subject: CMake: Followup to previous commit, try to ensure -ldl is always last Seems CMake will rearrange and copy libraries which are passed to the linker when some of the libraries is listed twice (for example, -lz from png libraries and -l for blender itself). This was causing libopenimageio to be added somewhere at the end of linking flags without -ldl followed after which was causing linking issues. --- build_files/cmake/macros.cmake | 3 ++- build_files/cmake/platform/platform_unix.cmake | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 5a67ac981a3..2e3a1907063 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -518,7 +518,8 @@ function(setup_liblinks target_link_libraries(${target} ${BLENDER_GL_LIBRARIES}) - target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS}) + #target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS}) + target_link_libraries(${target} ${PLATFORM_LINKLIBS}) endfunction() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 62f44cf1739..e33141f8012 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -298,7 +298,6 @@ if(WITH_OPENIMAGEIO) ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES} - ${CMAKE_DL_LIBS} ) set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere set(OPENIMAGEIO_DEFINITIONS "") -- cgit v1.2.3