Merge tag 'v0.20.21'

release v0.20.21

3 files changed, 22 insertions, 2 deletions

diff --git a/python/build/ffmpeg.py b/python/build/ffmpeg.py
index d75e98044..6c0753618 100644
--- a/python/build/ffmpeg.py
+++ b/python/build/ffmpeg.py
@@ -21,6 +21,8 @@ class FfmpegProject(Project):
 
         if toolchain.is_arm:
             arch = 'arm'
+        elif toolchain.is_aarch64:
+            arch = 'aarch64'
         else:
             arch = 'x86'
 
diff --git a/python/build/libs.py b/python/build/libs.py
index f94d9eb71..e4f621daf 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -364,6 +364,16 @@ curl = AutotoolsProject(
     patches='src/lib/curl/patches',
 )
 
+libexpat = AutotoolsProject(
+    'https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2',
+    '17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2',
+    'lib/libexpat.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--without-docbook',
+    ],
+)
+
 libnfs = AutotoolsProject(
     'https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0.tar.gz',
     '445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5',
@@ -374,13 +384,15 @@ libnfs = AutotoolsProject(
 
         # work around -Wtautological-compare
         '--disable-werror',
+
+        '--disable-utils', '--disable-examples',
     ],
     base='libnfs-libnfs-3.0.0',
     autoreconf=True,
 )
 
 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2',
-    '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9',
+    'http://downloads.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.tar.bz2',
+    '7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7',
     'include/boost/version.hpp',
 )
diff --git a/python/build/meson.py b/python/build/meson.py
index 4cda8ec2a..427d51f0f 100644
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -20,6 +20,9 @@ class MesonProject(Project):
                 cpu = 'armv7'
             else:
                 cpu = 'armv6'
+        elif toolchain.is_aarch64:
+            cpu_family = 'aarch64'
+            cpu = 'arm64-v8a'
         else:
             cpu_family = 'x86'
             if 'x86_64' in toolchain.arch:
@@ -51,6 +54,9 @@ c_link_args = %s
 cpp_args = %s
 cpp_link_args = %s
 
+# Keep Meson from executing Android-x86 test binariees
+needs_exe_wrapper = true
+
 [host_machine]
 system = '%s'
 cpu_family = '%s'