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:
authorRay Molenkamp <github@lazydodo.com>2018-08-13 16:57:09 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-13 16:57:29 +0300
commit4fc2a43e52f121e771ce57d7437ee2bcd9309248 (patch)
tree53dd698084a429def481cf170073028feb6b2faa /build_files/build_environment/cmake/x264.cmake
parent349d67be288c18bfd45d8232e60a303e19cf11fb (diff)
build_environment: ffmpeg 4.0.2
with lame 3.100 ogg 1.3.3 vorbis 1.3.6 flac 1.3.2 vpx 1.7.0 x264 20180811 xvidcore 1.3.5 faad 2.8.8
Diffstat (limited to 'build_files/build_environment/cmake/x264.cmake')
-rw-r--r--build_files/build_environment/cmake/x264.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake
index f42015e4395..7d7b0758aaf 100644
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -18,13 +18,18 @@
if(WIN32)
set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
+ set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
+else()
+ set(X264_PATCH_CMD echo .)
endif()
+
ExternalProject_Add(external_x264
URL ${X264_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH SHA256=${X264_HASH}
PREFIX ${BUILD_DIR}/x264
+ PATCH_COMMAND ${X264_PATCH_CMD}
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
--enable-static
--enable-pic