From bcee34e988edadc3c87ba08c704802888861585c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 2 Jun 2018 19:33:36 -0400
Subject: [PATCH] contrib/ffmpeg: update to 5ee20307
* fix build on Android armv7
* allow to remove custom patches
Change-Id: Id3e97bc8ae15bf9ba7d4d9df5c3a42ee2ce44be2
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
contrib/src/ffmpeg/SHA512SUMS | 3 +--
contrib/src/ffmpeg/android_file_offset.patch | 15 ---------------
contrib/src/ffmpeg/rules.mak | 10 +---------
3 files changed, 2 insertions(+), 26 deletions(-)
delete mode 100644 contrib/src/ffmpeg/android_file_offset.patch
diff --git a/contrib/src/ffmpeg/SHA512SUMS b/contrib/src/ffmpeg/SHA512SUMS
index 1b68e46424..ab5ab11de0 100644
--- a/contrib/src/ffmpeg/SHA512SUMS
+++ b/contrib/src/ffmpeg/SHA512SUMS
@@ -1,2 +1 @@
-aefd6e8ba9d3499fbb6f840c96dd08f5e9d305e6cb937e51108173355b8726444438b93a364835280dd26e2fa390fb53e1e194acc5b06f7e85a8bda23b7b5b0c ffmpeg-18516d3e695980525bd9758dc7b8a8e36cd3f09e.tar.gz
-dae90e0ea346ea109006669e850a3136b6bc1e461d0407de8193a860d3c9fd3e36ad9f788b4b255b9884d25a97aae40b124c6118ef34c5f4185ff14156f9f33c ffmpeg-n3.3.3.tar.gz
+4c72e18a5e8fb01de07fef661834bb12ed9b0abb3da3230eefd18fafe41c87acfc2516d6841c41ecc6ab053ddf1035cfef5516e1c47b5524ef0290b671076d60 ffmpeg-5ee203076fa1b1b5da32f525f2b6df3bd5e93b09.tar.gz
diff --git a/contrib/src/ffmpeg/android_file_offset.patch b/contrib/src/ffmpeg/android_file_offset.patch
deleted file mode 100644
index f691f15dd4..0000000000
--- a/contrib/src/ffmpeg/android_file_offset.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b39c9937dd..5cbe50aa0f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,4 +1,4 @@
-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
--
GitLab