[vlc-commits] [Git][videolan/vlc][master] contrib: x264: Update to the latest version from code.videolan.org

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
426ff68e by Martin Storsjö at 2022-09-25T13:15:43+00:00
contrib: x264: Update to the latest version from code.videolan.org

This allows dropping some portability workarounds.

- - - - -


2 changed files:

- contrib/src/x264/SHA512SUMS
- contrib/src/x264/rules.mak


Changes:

=====================================
contrib/src/x264/SHA512SUMS
=====================================
@@ -1 +1 @@
-cc8f47cb553787a294fba11ca5ca05e2448348e3bde1f5d9c9c297901c8b86e11d7a0e18a518f9dc3a47f06fdc557727f9900c209cecd5179596e13e83fef381  x264-snapshot-20180324-2245.tar.bz2
+3d917a11f4e87d039f3c0549c6824ab8317fce2478872e174426c6b70275937e94234a709a7d43ec2cd0d4d4cd388a362890d0b103d091a3750216b8a7763a22  x264-e067ab0b530395f90b578f6d05ab0a225e2efdf9.tar.xz


=====================================
contrib/src/x264/rules.mak
=====================================
@@ -1,8 +1,8 @@
 # x264
 
-X264_GITURL := git://git.videolan.org/x264.git
-X264_SNAPURL := http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180324-2245.tar.bz2
-X264_BASENAME := $(notdir $(X264_SNAPURL))
+X264_HASH := e067ab0b530395f90b578f6d05ab0a225e2efdf9
+X264_VERSION := $(X264_HASH)
+X264_GITURL := https://code.videolan.org/videolan/x264.git
 
 ifdef BUILD_ENCODERS
 ifdef GPL
@@ -34,16 +34,6 @@ X264CONF += --enable-win32thread
 else
 X264CONF += --disable-win32thread
 endif
-ifeq ($(ARCH), arm)
-# This isn't required in newer x264 snapshots, see
-# 3d90057e15abf257320c89bb7146fb0c92687fa6 in x264.
-X264_AS = export AS="../tools/gas-preprocessor.pl -arch arm -as-type clang -force-thumb -- $(CC) -mimplicit-it=always";
-endif
-ifeq ($(ARCH),aarch64)
-# Configure defaults to gas-preprocessor + armasm64 for this target,
-# unless overridden. This isn't required in newer x264 snapshots.
-X264_AS = export AS="$(CC)";
-endif
 endif
 ifdef HAVE_CROSS_COMPILE
 ifndef HAVE_DARWIN_OS
@@ -57,24 +47,16 @@ X264CONF += --disable-asm
 endif
 endif
 endif
-ifdef HAVE_DARWIN_OS
-ifeq ($(ARCH),aarch64)
-X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)"
-endif
-endif
-
-$(TARBALLS)/x264-git.tar.xz:
-	$(call download_git,$(X264_GITURL))
 
-$(TARBALLS)/$(X264_BASENAME):
-	$(call download,$(X264_SNAPURL))
+$(TARBALLS)/x264-$(X264_VERSION).tar.xz:
+	$(call download_git,$(X264_GITURL),,$(X264_HASH))
 
 .sum-x26410b: .sum-x264
 	touch $@
 
-.sum-x264: $(X264_BASENAME)
+.sum-x264: x264-$(X264_VERSION).tar.xz
 
-x264 x26410b: %: $(X264_BASENAME) .sum-%
+x264 x26410b: %: x264-$(X264_VERSION).tar.xz .sum-%
 	$(UNPACK)
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/x264/x264-winstore.patch
@@ -83,7 +65,7 @@ x264 x26410b: %: $(X264_BASENAME) .sum-%
 .x264: x264
 	$(REQUIRE_GPL)
 	$(MAKEBUILDDIR)
-	$(X264_AS) $(MAKECONFIGURE) $(X264CONF)
+	$(MAKECONFIGURE) $(X264CONF)
 	+$(MAKEBUILD) install
 	touch $@
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/426ff68ea89c7a98d90b7b20e359e54955a4959e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/426ff68ea89c7a98d90b7b20e359e54955a4959e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance