From d157abc49d266d55d9b97cfe9c19dc9588f252f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <mose@gnu.org>
Date: Sat, 29 May 2021 18:12:43 +0100
Subject: [PATCH] [x264] Upgrade to latest revision and build for experimental
 platforms

---
 X/x264/build_tarballs.jl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/X/x264/build_tarballs.jl b/X/x264/build_tarballs.jl
index 1a7031125cf..6ad4e25db83 100644
--- a/X/x264/build_tarballs.jl
+++ b/X/x264/build_tarballs.jl
@@ -3,23 +3,24 @@
 using BinaryBuilder
 
 name = "x264"
-version = v"2020.07.14"
+version = v"2021.05.05"
 
 # Collection of sources required to build x264
 sources = [
-    ArchiveSource("https://code.videolan.org/videolan/x264/-/archive/db0d417728460c647ed4a847222a535b00d3dbcb/x264-db0d417728460c647ed4a847222a535b00d3dbcb.tar.gz",
-                  "b79b7038ce083f152fdd35da2f0d770ac9189fa2319fd09012567bc3a33737af"),          
+    ArchiveSource("https://code.videolan.org/videolan/x264/-/archive/b684ebe04a6f80f8207a57940a1fa00e25274f81/x264-b684ebe04a6f80f8207a57940a1fa00e25274f81.tar.gz",
+                  "7e37c8be8c12b1c6a9822ca4c888543042aca8bfe40715a69881f4756bdfa8f3"),
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir/x264-*
 if [[ "${target}" == x86_64* ]] || [[ "${target}" == i686* ]]; then
-    apk add nasm
     export AS=nasm
 else
     export AS="${CC}"
 fi
+# Remove `-march` flag from `configure` script
+sed -i 's/ -march=i686//g' configure
 ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --enable-shared --enable-pic --disable-static
 # Remove unsafe compilation flag
 sed -i 's/ -ffast-math//g' config.mak
@@ -29,7 +30,7 @@ make install
 
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
-platforms = supported_platforms()
+platforms = supported_platforms(; experimental=true)
 
 # The products that we will ensure are always built
 products = [
@@ -38,8 +39,9 @@ products = [
 ]
 
 # Dependencies that must be installed before this package can be built
-dependencies = Dependency[
+dependencies = [
+    HostBuildDependency("NASM_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")