From 9a0d08d3fba508ed3de1327fa480bcbeb3d1179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 15 Mar 2019 14:57:39 -0400
Subject: [PATCH] contrib: update x264
Change-Id: Ieb79dbf8c6194178809066a8cde2cd32fac4aea9
---
contrib/src/x264/rules.mak | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 8c17a2f523..0fa949f21a 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -1,10 +1,10 @@
# x264
ifndef HAVE_IOS
-X264_HASH := 8c2974255b01728d4eda2434cc1997c4a3ca5eff
+X264_HASH := 5493be84cdccecee613236c31b1e3227681ce428
else
X264_HASH := fa3cac516cb71b8ece09cedbfd0ce631ca8a2a4c
endif
-X264_GITURL := git://git.videolan.org/x264.git
+X264_GITURL := https://code.videolan.org/videolan/x264.git
ifeq ($(call need_pkg,"x264 >= 0.86"),)
PKGS_FOUND += x264
@@ -51,14 +51,6 @@ x264: x264-$(X264_HASH).tar.xz .sum-x264
(cd $@-$(X264_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<)
ifdef HAVE_IOS
$(APPLY) $(SRC)/x264/remove-align.patch
-endif
-ifdef HAVE_ANDROID
-ifeq ($(ARCH),arm)
- $(APPLY) $(SRC)/x264/0001-use-internal-log2f.patch
-endif
-ifeq ($(ARCH),i386)
- $(APPLY) $(SRC)/x264/0001-use-internal-log2f.patch
-endif
endif
$(UPDATE_AUTOCONFIG)
$(MOVE)
--
GitLab