diff options
| author | Jakob Linskeseder <jakob.linskeseder@gmail.com> | 2019-11-18 20:46:00 +0100 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-03-03 17:03:19 -0800 |
| commit | 2998537d5f048245c5bf5089d241edbb259c6d2f (patch) | |
| tree | 73980a28048661929f9f7c5b0f11c5feddcbc8d4 /tools/depends/target/ffmpeg | |
| parent | 7bb56196e41327a46f7b5781b4b9d59fb71d7100 (diff) | |
[cmake] ffmpeg: add support for libdav1d
Diffstat (limited to 'tools/depends/target/ffmpeg')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 1 | ||||
| -rwxr-xr-x | tools/depends/target/ffmpeg/autobuild.sh | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index f3959f9bb7..cc3086e15a 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -86,12 +86,19 @@ if(GNUTLS_FOUND) list(APPEND ffmpeg_conf --enable-gnutls) endif() +if(ENABLE_DAV1D) + list(APPEND ffmpeg_conf --enable-libdav1d) + set(pkgconf_path "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}") +else() + list(APPEND ffmpeg_conf --disable-libdav1d) +endif() + message(STATUS "FFMPEG_CONF: ${ffmpeg_conf}") include(ExternalProject) externalproject_add(ffmpeg SOURCE_DIR ${CMAKE_SOURCE_DIR} - CONFIGURE_COMMAND ${pkgconf} <SOURCE_DIR>/configure + CONFIGURE_COMMAND ${pkgconf} ${pkgconf_path} <SOURCE_DIR>/configure --prefix=${CMAKE_INSTALL_PREFIX} --extra-version="kodi-${FFMPEG_VER}" --disable-devices diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index d3ce41fe36..848db2cdb1 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -21,6 +21,7 @@ ffmpg_config += --enable-encoder=ac3 --enable-encoder=aac ffmpg_config += --enable-encoder=wmav2 --enable-protocol=http ffmpg_config += --enable-gnutls ffmpg_config += --enable-encoder=png --enable-encoder=mjpeg +ffmpg_config += --enable-libdav1d ffmpg_config += $(FFMPEG_CONFIGURE_OPTIONS) ifeq ($(CROSS_COMPILING), yes) diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh index dc990b8ab0..fcbc8fa452 100755 --- a/tools/depends/target/ffmpeg/autobuild.sh +++ b/tools/depends/target/ffmpeg/autobuild.sh @@ -161,6 +161,7 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ --enable-pthreads \ --enable-pic \ --enable-zlib \ + --enable-libdav1d \ --disable-mipsdsp \ --disable-mipsdspr2 \ ${FLAGS} |