Commit: 6e08b01bd9ab87f63d8176bf2ec0b4f073a92ee3
Author: Jorge Bernal
Date: Thu Oct 4 13:31:38 2018 +0200
Branches: master
https://developer.blender.org/rB6e08b01bd9ab87f63d8176bf2ec0b4f073a92ee3
Fix T57059: "make deps" build error when sndio library is present.
===================================================================
M build_files/build_environment/cmake/ffmpeg.cmake
M build_files/build_environment/cmake/sdl.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake
b/build_files/build_environment/cmake/ffmpeg.cmake
index 5c8347cd40e..2a8e3fd5d33 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -112,6 +112,7 @@ ExternalProject_Add(external_ffmpeg
--disable-indev=alsa
--disable-outdev=alsa
--disable-crystalhd
+ --disable-sndio
BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd
${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd
${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg
${DEFAULT_CMAKE_FLAGS}
diff --git a/build_files/build_environment/cmake/sdl.cmake
b/build_files/build_environment/cmake/sdl.cmake
index 8383c5a5a79..ab81ad130e8 100644
--- a/build_files/build_environment/cmake/sdl.cmake
+++ b/build_files/build_environment/cmake/sdl.cmake
@@ -25,6 +25,7 @@ else()
-DSDL_STATIC=ON
-DSDL_SHARED=OFF
-DSDL_VIDEO=OFF
+ -DSNDIO=OFF
)
endif()
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
