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

[Ilkka Ollakka]

vlc/vlc-3.0 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Mar 25 15:06:24 2018 +0300| [0f3c90e4138cadaaf58d448e326e63fe197f6b73] | committer: Konstantin Pavlov

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

(cherry picked from commit d16a85586a9c2925899ec691d91b89ca419d666f)
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

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

 contrib/src/x264/rules.mak | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 9d7e7a657f..318144f21e 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
 
@@ -93,14 +93,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