Merge pull request #11051 from driver1998/clangarm64-bulk

Enable more clangarm64 packages
2022-03-21 10:15:44 -07:00
parent 1bd4220545 55750d6def
commit d9e9c00a2b
26 changed files with 72 additions and 43 deletions
--- a/mingw-w64-aria2/PKGBUILD
+++ b/mingw-w64-aria2/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.36.0
 pkgrel=2
 pkgdesc="A multi-protocol & multi-source, cross platform download utility (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://aria2.github.io/"
 license=('GPL2')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
--- a/mingw-w64-assimp/PKGBUILD
+++ b/mingw-w64-assimp/PKGBUILD
@@ -4,10 +4,10 @@ _realname=assimp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-minizip"
         "${MINGW_PACKAGE_PREFIX}-zlib")
@@ -52,9 +52,11 @@ build() {
    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
    -DASSIMP_BUILD_ASSIMP_TOOLS=ON \
-    -DASSIMP_BUILD_ASSIMP_VIEW=ON \
+    -DASSIMP_BUILD_ASSIMP_VIEW=$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] && \
+                                  echo "OFF" || echo "ON") \
    -DASSIMP_BUILD_TESTS=OFF \
-    -DDirectX_DXERR_LIBRARY=${MINGW_PREFIX}/lib/libdxerr9.a \
+    $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
+      echo "-DDirectX_DXERR_LIBRARY=${MINGW_PREFIX}/lib/libdxerr9.a") \
    ../${_realname}-${pkgver}

  ${MINGW_PREFIX}/bin/cmake.exe --build ./
--- a/mingw-w64-atkmm/PKGBUILD
+++ b/mingw-w64-atkmm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.28.2
 pkgrel=2
 pkgdesc="C++ bindings for atk (V2.28) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtkmm.org/"
 license=("LGPL")
 depends=("${MINGW_PACKAGE_PREFIX}-atk"
--- a/mingw-w64-cairomm/PKGBUILD
+++ b/mingw-w64-cairomm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.14.3
 pkgrel=1
 pkgdesc="C++ bindings to Cairo vector graphics library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.cairographics.org/"
 license=("LGPL, MPL")
 depends=("${MINGW_PACKAGE_PREFIX}-cairo"
--- a/mingw-w64-cyrus-sasl/PKGBUILD
+++ b/mingw-w64-cyrus-sasl/PKGBUILD
@@ -28,7 +28,7 @@ pkgver=2.1.27
 pkgrel=4
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.cyrusimap.org/sasl/"
 license=('custom')
 depends=("${MINGW_PACKAGE_PREFIX}-gdbm"
--- a/mingw-w64-dbus/PKGBUILD
+++ b/mingw-w64-dbus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.12.20
 pkgrel=5
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Freedesktop.org message bus system (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
         "${MINGW_PACKAGE_PREFIX}-expat")
--- a/mingw-w64-double-conversion/PKGBUILD
+++ b/mingw-w64-double-conversion/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.2.0
 pkgrel=1
 pkgdesc="Binary-decimal and decimal-binary routines for IEEE doubles (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/google/double-conversion"
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
--- a/mingw-w64-gdbm/PKGBUILD
+++ b/mingw-w64-gdbm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.19
 pkgrel=2
 pkgdesc="GNU database library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gnu.org/software/gdbm/gdbm.html"
 license=('GPL3')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
--- a/mingw-w64-ghostscript/PKGBUILD
+++ b/mingw-w64-ghostscript/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=9.53.3
 pkgrel=2
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=('AGPL' 'custom')
 pkgdesc="An interpreter for the PostScript language (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-dbus"
--- a/mingw-w64-glibmm/PKGBUILD
+++ b/mingw-w64-glibmm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.66.2
 pkgrel=1
 pkgdesc="Glib-- (glibmm) is a C++ interface for glib (V2.66) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtkmm.org/"
 license=("LGPL")
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
--- a/mingw-w64-gtk-vnc/PKGBUILD
+++ b/mingw-w64-gtk-vnc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.3.0
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="VNC viewer widget for GTK+ (mingw-w64)"
 options=('strip' 'staticlibs')
 depends=("${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
--- a/mingw-w64-gtkmm/PKGBUILD
+++ b/mingw-w64-gtkmm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.24.5
 pkgrel=4
 pkgdesc="C++ bindings for gtk2 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtkmm.org/"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
--- a/mingw-w64-jbig2dec/PKGBUILD
+++ b/mingw-w64-jbig2dec/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='Decoder implementation of the JBIG2 image compression format (mingw-w64)'
 url='https://jbig2dec.com/'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=('AGPL')
 depends=("${MINGW_PACKAGE_PREFIX}-libpng")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
--- a/mingw-w64-libidn/PKGBUILD
+++ b/mingw-w64-libidn/PKGBUILD
@@ -4,13 +4,13 @@ _realname=libidn
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.38
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gnu.org/software/libidn"
 license=("GPL3, LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools" "gtk-doc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools" "gtk-doc" "texinfo")
 depends=("${MINGW_PACKAGE_PREFIX}-gettext")
 options=('staticlibs' 'strip')
 source=("https://ftp.gnu.org/gnu/libidn/${_realname}-${pkgver}.tar.gz"
--- a/mingw-w64-libmariadbclient/PKGBUILD
+++ b/mingw-w64-libmariadbclient/PKGBUILD
@@ -4,22 +4,23 @@ _realname=libmariadbclient
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.1.12
-pkgrel=1
+pkgrel=2
 pkgdesc="MariaDB client libraries (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://mariadb.org/"
 license=('LGPL')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-tools-git")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-curl"
         #"${MINGW_PACKAGE_PREFIX}-openssl"
         "${MINGW_PACKAGE_PREFIX}-zlib")
 #optdepends=("${MINGW_PACKAGE_PREFIX}-curl")
 options=('!strip' 'staticlibs')
-source=(https://ftp.heanet.ie/mirrors/mariadb/connector-c-${pkgver}/mariadb-connector-c-${pkgver}-src.tar.gz{,.asc}
+source=(https://mirror.rackspace.com/mariadb/connector-c-${pkgver}/mariadb-connector-c-${pkgver}-src.tar.gz{,.asc}
        001-mingw-build.patch
        002-fix-prototype.patch
        003-gcc-fix-use_VA_ARGS.patch
--- a/mingw-w64-libpaper/PKGBUILD
+++ b/mingw-w64-libpaper/PKGBUILD
@@ -8,7 +8,7 @@ _suffix=
 pkgrel=1
 pkgdesc="library for handling paper characteristics (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://packages.debian.org/unstable/source/libpaper'
 license=('GPL-2')
 makedepends=('gettext' "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
--- a/mingw-w64-libview/PKGBUILD
+++ b/mingw-w64-libview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.6.6
 pkgrel=6
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="VMware's Incredibly Exciting Widgets (mingw-w64)"
 options=(strip staticlibs)
 depends=("${MINGW_PACKAGE_PREFIX}-gtk2"
--- a/mingw-w64-md4c/PKGBUILD
+++ b/mingw-w64-md4c/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.4.8
 pkgrel=1
 pkgdesc="C Markdown parser implementation compliant to CommonMark specification"
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/mity/md4c"
 license=("MIT")
 depends=()
--- a/mingw-w64-minizip-git/PKGBUILD
+++ b/mingw-w64-minizip-git/PKGBUILD
@@ -13,7 +13,7 @@ pkgver=1.2.445.e67b996
 pkgrel=2
 pkgdesc="Compression library implementing the deflate compression method found in gzip and PKZIP (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=(ZLIB)
 url="https://www.zlib.net/"
 depends=("${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-zlib")
--- a/mingw-w64-pangomm/PKGBUILD
+++ b/mingw-w64-pangomm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.46.2
 pkgrel=1
 pkgdesc="C++ bindings for pango (V2.46) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtkmm.org/"
 license=("LGPL")
 depends=("${MINGW_PACKAGE_PREFIX}-cairomm"
--- a/mingw-w64-pcre2/PKGBUILD
+++ b/mingw-w64-pcre2/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=10.39
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://pcre.org/"
 license=("BSD")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
--- a/mingw-w64-postgresql/PKGBUILD
+++ b/mingw-w64-postgresql/PKGBUILD
@@ -4,10 +4,10 @@ _realname=postgresql
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.postgresql.org/"
 license=('custom:PostgreSQL')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
@@ -30,7 +30,8 @@ source=("https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.t
        postgresql-9.4.1-pl-tcl.patch
        postgresql-9.4.1-mingw-enable-readline.patch
        postgresql-13.1-disable-wsa-invalid-event-static-assert.patch
-        postgresql-13.1-pgevent-def.patch)
+        postgresql-13.1-pgevent-def.patch
+        postgresql-14.0-use-mingw-setjmp-on-clang-arm64.patch)

 sha256sums=('ee2ad79126a7375e9102c4db77c4acae6ae6ffe3e082403b88826d96d927a122'
            '607217b422349770d25af20f88e4a7925e68bb934232dff368c2ee59f24249a4'
@@ -39,7 +40,8 @@ sha256sums=('ee2ad79126a7375e9102c4db77c4acae6ae6ffe3e082403b88826d96d927a122'
            'ab9c42374b4e8a01b598810b19b583d9ee7bf5c43c39c019f66b62aacac38926'
            '51c72fbd380d23cf944165405221912a277b9be99e285479772b39cacbbf384f'
            '72c14a78eeafdd3c9a13c3e124b1941b5da090488c7bd73f08b3cd78bacd07d5'
-            'ffaecbe5a38877728bddbf307b379b39c645dd1ffe53aa8d84dfa96807494764')
+            'ffaecbe5a38877728bddbf307b379b39c645dd1ffe53aa8d84dfa96807494764'
+            '115f78095f1eee394301d939b1536a906189d212ab17c908042ae3954eda33e3')

 prepare() {
  cd ${srcdir}/postgresql-${pkgver}
@@ -50,6 +52,7 @@ prepare() {
  #patch -p1 -i ${srcdir}/postgresql-9.4.1-mingw-enable-readline.patch
  patch -p1 -i ${srcdir}/postgresql-13.1-disable-wsa-invalid-event-static-assert.patch
  patch -p1 -i ${srcdir}/postgresql-13.1-pgevent-def.patch
+  patch -p1 -i ${srcdir}/postgresql-14.0-use-mingw-setjmp-on-clang-arm64.patch

  sed -s "s|2\\.69|2\\.71|g" -i configure.ac
  autoreconf -fiv
--- a/mingw-w64-postgresql/postgresql-14.0-use-mingw-setjmp-on-clang-arm64.patch
+++ b/mingw-w64-postgresql/postgresql-14.0-use-mingw-setjmp-on-clang-arm64.patch
@@ -0,0 +1,26 @@
+diff --git a/src/include/c.h b/src/include/c.h
+index c8ede08..e445524 100644
+--- a/src/include/c.h
+++ b/src/include/c.h
+@@ -1340,17 +1340,18 @@ extern unsigned long long strtoull(const char *str, char **endptr, int base);
+  * so on that toolchain we cheat and use gcc's builtins.
+  */
+ #ifdef WIN32
+-#ifdef __MINGW64__
+#if defined(__MINGW64__) && (defined(__i386__) || defined(__x86_64__))
+ typedef intptr_t sigjmp_buf[5];
+ #define sigsetjmp(x,y) __builtin_setjmp(x)
+ #define siglongjmp __builtin_longjmp
+-#else							/* !__MINGW64__ */
+#else							/* !(defined(__MINGW64__) && (defined(__i386__) || defined(__x86_64__))) */
+ #define sigjmp_buf jmp_buf
+ #define sigsetjmp(x,y) setjmp(x)
+ #define siglongjmp longjmp
+-#endif							/* __MINGW64__ */
+#endif							/* defined(__MINGW64__) && (defined(__i386__) || defined(__x86_64__)) */
+ #endif							/* WIN32 */
+ 
+
+ /* EXEC_BACKEND defines */
+ #ifdef EXEC_BACKEND
+ #define NON_EXEC_STATIC
--- a/mingw-w64-putty-ssh/PKGBUILD
+++ b/mingw-w64-putty-ssh/PKGBUILD
@@ -6,10 +6,10 @@ _realname=putty-ssh
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A wrapper around plink with some nice features (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="http://www.wischik.com/lu/programmer/unison-ssh.html"
 license=('unknown')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
@@ -26,7 +26,7 @@ prepare() {
 build() {
  cd "${srcdir}"

-  g++ -O2 -o plink-ssh.exe ssh.cpp
+  ${CXX} -O2 -o plink-ssh.exe ssh.cpp
 }

 package() {
--- a/mingw-w64-putty/PKGBUILD
+++ b/mingw-w64-putty/PKGBUILD
@@ -7,10 +7,10 @@ _realname=putty
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.76
-pkgrel=1
+pkgrel=2
 pkgdesc="A free telnet/SSH client (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
@@ -36,10 +36,7 @@ build() {

  ./mkfiles.pl
  cd windows
-  if [ "${CARCH}" = "x86_64" ]; then
-    sed -i 's/x86/amd64/' *.mft
-  fi
-  make -f Makefile.mgw
+  make -f Makefile.mgw CC="${CC}"
 }

 package() {
--- a/mingw-w64-rtmidi/PKGBUILD
+++ b/mingw-w64-rtmidi/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.0.0
 pkgrel=2
 pkgdesc="A set of C++ classes that provides a common API for realtime MIDI input/output (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.music.mcgill.ca/~gary/rtmidi/"
 license=('custom:RtMidi')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")