diff options
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} |