Skip to content
Permalink
Browse files

bump ffmpeg to 3.4

  • Loading branch information...
FernetMenta committed Oct 13, 2017
1 parent 4ca79b9 commit a9f15a02b148e0cac470d9136de39cdc02ceb553
@@ -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

@@ -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

@@ -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
@@ -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
@@ -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
@@ -138,7 +138,6 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
--disable-devices \
--disable-ffplay \
--disable-ffmpeg \
--disable-sdl \
--disable-ffprobe \
--disable-ffserver \
--disable-doc \

0 comments on commit a9f15a0

Please sign in to comment.
You can’t perform that action at this time.