Merge pull request #12926 from FernetMenta/ffmpeg

bump ffmpeg to 3.4
xbmc · Oct 16, 2017 · 4f3875f · 4f3875f
2 parents 4ca79b9 + cd67024
commit 4f3875f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/tools/buildsteps/windows/buildhelpers.sh b/tools/buildsteps/windows/buildhelpers.sh
@@ -129,7 +129,7 @@ do_download() {
   for patch in ${patches[@]}; do
     echo "Applying patch ${patch}"
     if [[ -f $patch ]]; then
-      patch -d $LOCALSRCDIR -i $patch -N -r -
+      patch -d $LOCALSRCDIR -i $patch -N -r - || exit $?
     fi
   done
 }

diff --git a/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch b/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch
@@ -12,14 +12,14 @@ diff --git a/configure b/configure
 index a1818dc..1cf2a7c 100755
 --- a/configure
 +++ b/configure
-@@ -5836,6 +5836,7 @@ enabled openssl           && { use_pkg_config openssl openssl/ssl.h OPENSSL_init
-                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
-                                check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
-                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
-+                               check_lib openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
+@@ -6075,6 +6075,7 @@
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
                                 die "ERROR: openssl not found"; }
- enabled qtkit_indev      && { check_header_objcc QTKit/QTKit.h || disable qtkit_indev; }
-
+ enabled rkmpp             && { { require_pkg_config rockchip_mpp rockchip_mpp rockchip/rk_mpi.h mpp_create ||
+                                  die "ERROR : Rockchip MPP was not found."; } &&
 -- 
 2.10.1.windows.1
 
diff --git a/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch
@@ -1,12 +1,12 @@
 --- a/configure
 +++ b/configure
-@@ -6835,6 +6836,9 @@
+@@ -7038,6 +7038,9 @@
                                       $CONFIG_EXTRA      \
                                       $ALL_COMPONENTS    \
 
 +echo "#if defined(HAVE_UNISTD_H) && HAVE_UNISTD_H == 0" >> $TMPH
 +echo "#undef HAVE_UNISTD_H" >> $TMPH
 +echo "#endif" >> $TMPH
  echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
- echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
+ echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
 
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
@@ -48,7 +48,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
   else()
     list(APPEND ffmpeg_conf --cpu=i686 --disable-mmx)
   endif()
-  list(APPEND ffmpeg_conf --target-os=linux --extra-libs=-liconv)
+  list(APPEND ffmpeg_conf --target-os=linux --extra-libs=-liconv --disable-linux-perf)
 elseif(CORE_SYSTEM_NAME STREQUAL ios)
   if(NOT CPU MATCHES arm64)
     list(APPEND ffmpeg_conf --cpu=cortex-a8)
@@ -58,8 +58,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios)
   list(APPEND ffmpeg_conf --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox
                           --target-os=darwin)
 elseif(CORE_SYSTEM_NAME STREQUAL osx)
-  list(APPEND ffmpeg_conf --disable-outdev=sdl
-                          --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox
+  list(APPEND ffmpeg_conf --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox
                           --target-os=darwin
                           --disable-securetransport)
 endif()
@@ -89,7 +88,6 @@ externalproject_add(ffmpeg
                       --disable-ffmpeg
                       --disable-ffprobe
                       --disable-ffserver
-                      --disable-sdl
                       --enable-gpl
                       --enable-runtime-cpudetect
                       --enable-postproc

diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
@@ -1,5 +1,5 @@
 LIBNAME=ffmpeg
 BASE_URL=https://github.com/xbmc/FFmpeg
-VERSION=3.3.4-Leia-Alpha-1
+VERSION=3.4-Leia-Alpha-1
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
 GNUTLS_VER=3.4.14
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
@@ -10,7 +10,7 @@ APPLY_PATCHES=no
 ffmpg_config = --prefix=$(PREFIX) --extra-version="kodi-$(VERSION)"
 ffmpg_config += --cc="$(CC)" --cxx="$(CXX)" --ar=$(AR) --ranlib=$(RANLIB)
 ffmpg_config += --disable-devices --disable-doc
-ffmpg_config += --disable-ffplay --disable-ffmpeg --disable-sdl
+ffmpg_config += --disable-ffplay --disable-ffmpeg
 ffmpg_config += --disable-ffprobe --disable-ffserver
 ffmpg_config += --enable-gpl --enable-runtime-cpudetect
 ffmpg_config += --enable-postproc --enable-pthreads
@@ -41,7 +41,7 @@ ifeq ($(OS), android)
       ffmpg_config += --cpu=i686 --disable-mmx
     endif
   endif
-  ffmpg_config += --target-os=linux --extra-libs=-liconv
+  ffmpg_config += --target-os=linux --extra-libs=-liconv --disable-linux-perf
 endif
 ifeq ($(OS), ios)
   ifneq ($(CPU), arm64)
@@ -54,7 +54,6 @@ ifeq ($(OS), ios)
   ffmpg_config += --target-os=darwin
 endif
 ifeq ($(OS), osx)
-  ffmpg_config += --disable-outdev=sdl
   ffmpg_config += --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox
   ffmpg_config += --target-os=darwin
   ffmpg_config += --disable-securetransport

diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh
@@ -138,7 +138,6 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
 	--disable-devices \
 	--disable-ffplay \
 	--disable-ffmpeg \
-	--disable-sdl \
 	--disable-ffprobe \
 	--disable-ffserver \
 	--disable-doc \