Skip to content
Snippets Groups Projects
Commit bcee34e9 authored by Adrien Béraud's avatar Adrien Béraud Committed by Philippe Gorley
Browse files

contrib/ffmpeg: update to 5ee20307


* fix build on Android armv7
* allow to remove custom patches

Change-Id: Id3e97bc8ae15bf9ba7d4d9df5c3a42ee2ce44be2
Reviewed-by: default avatarPhilippe Gorley <philippe.gorley@savoirfairelinux.com>
parent a19425df
No related branches found
No related tags found
No related merge requests found
aefd6e8ba9d3499fbb6f840c96dd08f5e9d305e6cb937e51108173355b8726444438b93a364835280dd26e2fa390fb53e1e194acc5b06f7e85a8bda23b7b5b0c ffmpeg-18516d3e695980525bd9758dc7b8a8e36cd3f09e.tar.gz
dae90e0ea346ea109006669e850a3136b6bc1e461d0407de8193a860d3c9fd3e36ad9f788b4b255b9884d25a97aae40b124c6118ef34c5f4185ff14156f9f33c ffmpeg-n3.3.3.tar.gz
4c72e18a5e8fb01de07fef661834bb12ed9b0abb3da3230eefd18fafe41c87acfc2516d6841c41ecc6ab053ddf1035cfef5516e1c47b5524ef0290b671076d60 ffmpeg-5ee203076fa1b1b5da32f525f2b6df3bd5e93b09.tar.gz
--- a/configure 2017-10-03 15:05:34.368369231 -0400
+++ b/configure 2017-10-03 15:06:06.320341666 -0400
@@ -4688,9 +4688,9 @@
check_cflags -std=c99
fi
-check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
-#include <stdlib.h>
-EOF
+#check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
+##include <stdlib.h>
+#EOF
check_cc -D_LARGEFILE_SOURCE <<EOF && add_cppflags -D_LARGEFILE_SOURCE
#include <stdlib.h>
EOF
FFMPEG_HASH := 18516d3e695980525bd9758dc7b8a8e36cd3f09e
FFMPEG_HASH := 5ee203076fa1b1b5da32f525f2b6df3bd5e93b09
FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).tar.gz
PKGS+=ffmpeg
......@@ -203,14 +203,6 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.gz
mkdir -p $@-$(FFMPEG_HASH)
(cd $@-$(FFMPEG_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<)
$(UPDATE_AUTOCONFIG)
ifdef HAVE_ANDROID
ifeq ($(ARCH),arm)
$(APPLY) $(SRC)/ffmpeg/android_file_offset.patch
endif
ifeq ($(ARCH),i386)
$(APPLY) $(SRC)/ffmpeg/android_file_offset.patch
endif
endif
$(MOVE)
.ffmpeg: ffmpeg .sum-ffmpeg
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment