[vlc-commits] contrib: update x264 to 153-version and change to master

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Mar 25 15:06:24 2018 +0300| [d16a85586a9c2925899ec691d91b89ca419d666f] | committer: Ilkka Ollakka

contrib: update x264 to 153-version and change to master

Remove separated 26410b hacks and patch that is already in version 153.
Use master as stable doesn't yet have the patch or the 10bit/8bit
unification.

ref #19581

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d16a85586a9c2925899ec691d91b89ca419d666f
---

 contrib/src/x264/arm-asm-win.patch | 34 ----------------------------------
 contrib/src/x264/rules.mak         | 16 ++++------------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/contrib/src/x264/arm-asm-win.patch b/contrib/src/x264/arm-asm-win.patch
deleted file mode 100644
index 32d2f1410b..0000000000
--- a/contrib/src/x264/arm-asm-win.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 064d3bbd30e3dc8d7096ee267de66b6d0a56cd02 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Mon, 16 Oct 2017 22:50:26 +0300
-Subject: [PATCH] arm: Check for __ELF__ instead of !__APPLE__, for using
- .arch/.fpu
-
-For windows, when building with armasm, we already filtered these out
-with gas-preprocessor.
-
-By filtering them out already in the source, we can also build directly
-with clang for windows (which also require wrapping the assembler in
-gas-preprocessor for converting instructions to thumb form, but
-gas-preprocessor doesn't and shouldn't filter out them in the clang
-configuration).
----
- common/arm/asm.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/arm/asm.S b/common/arm/asm.S
-index 619a509..37a4229 100644
---- a/common/arm/asm.S
-+++ b/common/arm/asm.S
-@@ -28,7 +28,7 @@
- 
- .syntax unified
- 
--#ifndef __APPLE__
-+#ifdef __ELF__
- .arch armv7-a
- .fpu neon
- #endif
--- 
-2.7.4
-
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index a1ff5c1b29..fa5b76838c 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -1,7 +1,7 @@
 # x264
 
 X264_GITURL := git://git.videolan.org/x264.git
-X264_SNAPURL := http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20171224-2245-stable.tar.bz2
+X264_SNAPURL := http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180324-2245.tar.bz2
 X262_GITURL := git://git.videolan.org/x262.git
 
 ifdef BUILD_ENCODERS
@@ -10,11 +10,11 @@ PKGS += x264
 endif
 endif
 
-ifeq ($(call need_pkg,"x264 >= 0.86"),)
+ifeq ($(call need_pkg,"x264 >= 0.148"),)
 PKGS_FOUND += x264
 endif
 
-ifeq ($(call need_pkg,"x26410b"),)
+ifeq ($(call need_pkg,"x264 >= 0.153"),)
 PKGS_FOUND += x26410b
 endif
 
@@ -80,7 +80,6 @@ x264 x26410b: %: x264-git.tar.bz2 .sum-%
 	mkdir -p $*-git
 	tar xvjf "$<" --strip-components=1 -C $*-git
 	$(UPDATE_AUTOCONFIG)
-	$(APPLY) $(SRC)/x264/arm-asm-win.patch
 	mv $*-git $*
 
 x262: x262-git.tar.gz .sum-x262
@@ -97,14 +96,7 @@ x262: x262-git.tar.gz .sum-x262
 	cd $< && $(MAKE) install
 	touch $@
 
-.x26410b: x26410b
-	$(REQUIRE_GPL)
-	cd $< && $(HOSTVARS) ./configure $(X264CONF) --bit-depth=10
-	cd $< && sed -i -e 's/libx264/libx26410b/g' Makefile config.mak
-	cd $< && sed -i -e 's/x264/x26410b/g' x264.pc
-	cd $< && mv x264.pc x26410b.pc
-	cd $< && sed -i -e 's/x264.pc/x26410b.pc/g' Makefile
-	cd $< && $(MAKE) install
+.x26410b: .x264
 	touch $@
 
 .x262: x262