diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2019-10-04 15:24:55 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2019-10-04 17:30:01 +0300 |
| commit | 6d8c053187cbaf5773509ac8beab4f7e3525ad0d (patch) | |
| tree | e704ae0ba9b71daf624349ddc5b01d7637255592 /build_files | |
| parent | 663d23dd9dc4801a679b00e5d8ac80483d9b36a8 (diff) | |
Fix T70514: VP9 not working
This issue was two-fold:
- In the VPX library build script: missing `--enable-vp8` and
`--enable-vp9` meant that the choice to enable these codecs or not was
left to the library's `configure` script, rather than an explicit choice.
On the build-bot it chose to not enable them.
- Missing pkgconfig paths passed to the FFmpeg build script
Thanks @brecht for helping out.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/ffmpeg.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/vpx.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake index 27d817e8948..fc0116e9ee9 100644 --- a/build_files/build_environment/cmake/ffmpeg.cmake +++ b/build_files/build_environment/cmake/ffmpeg.cmake @@ -19,7 +19,7 @@ set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include") set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib") set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS}) -set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}) +set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig) if(WIN32) set(FFMPEG_ENV set ${FFMPEG_ENV} &&) diff --git a/build_files/build_environment/cmake/vpx.cmake b/build_files/build_environment/cmake/vpx.cmake index 1c3a7081b59..741493859e2 100644 --- a/build_files/build_environment/cmake/vpx.cmake +++ b/build_files/build_environment/cmake/vpx.cmake @@ -49,6 +49,8 @@ ExternalProject_Add(external_vpx --disable-avx2 --disable-unit-tests --disable-examples + --enable-vp8 + --enable-vp9 ${VPX_EXTRA_FLAGS} BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS} INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install |