[Bf-blender-cvs] [0bfb215bbcb] master: Build: fix ffmpeg using system crystalhd library.

Brecht Van Lommel noreply at git.blender.org
Wed Aug 8 20:30:58 CEST 2018


Commit: 0bfb215bbcb5eb69123c1de896329d94f70aa4ea
Author: Brecht Van Lommel
Date:   Wed Aug 8 20:26:14 2018 +0200
Branches: master
https://developer.blender.org/rB0bfb215bbcb5eb69123c1de896329d94f70aa4ea

Build: fix ffmpeg using system crystalhd library.

===================================================================

M	build_files/build_environment/cmake/ffmpeg.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake
index bd49621bf26..3ea1b282d9a 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -103,6 +103,7 @@ ExternalProject_Add(external_ffmpeg
 		--disable-indev=jack
 		--disable-indev=alsa
 		--disable-outdev=alsa
+		--disable-crystalhd
 	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
 	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



More information about the Bf-blender-cvs mailing list