magnum: Fix build with modern Clang and enable aarch64 builds

mingw-w64-magnum/0002-missing-includes.patch

@@ -0,0 +1,33 @@
+diff -bur magnum-2020.06-o/src/Magnum/Math/Vector.h magnum-2020.06/src/Magnum/Math/Vector.h
+--- magnum-2020.06-o/src/Magnum/Math/Vector.h	2025-04-17 13:26:28.969883900 -0600
++++ magnum-2020.06/src/Magnum/Math/Vector.h	2025-04-17 13:29:21.358623800 -0600
+@@ -30,6 +30,7 @@
+  */
+ 
+ #include <utility>
++#include <vector>
+ #include <Corrade/Utility/Assert.h>
+ #ifndef CORRADE_NO_DEBUG
+ #include <Corrade/Utility/Debug.h>
+diff -bur magnum-2020.06-o/src/Magnum/MeshTools/CompressIndices.h magnum-2020.06/src/Magnum/MeshTools/CompressIndices.h
+--- magnum-2020.06-o/src/Magnum/MeshTools/CompressIndices.h	2025-04-17 13:26:28.975882900 -0600
++++ magnum-2020.06/src/Magnum/MeshTools/CompressIndices.h	2025-04-17 13:28:39.729414800 -0600
+@@ -30,6 +30,7 @@
+  */
+ 
+ #include <utility>
++#include <vector>
+ #include <Corrade/Containers/Containers.h>
+ 
+ #include "Magnum/Mesh.h"
+diff -bur magnum-2020.06-o/src/Magnum/MeshTools/GenerateNormals.h magnum-2020.06/src/Magnum/MeshTools/GenerateNormals.h
+--- magnum-2020.06-o/src/Magnum/MeshTools/GenerateNormals.h	2025-04-17 13:26:28.978882000 -0600
++++ magnum-2020.06/src/Magnum/MeshTools/GenerateNormals.h	2025-04-17 13:30:17.859605600 -0600
+@@ -29,6 +29,7 @@
+  * @brief Function @ref Magnum::MeshTools::generateFlatNormals(), @ref Magnum::MeshTools::generateFlatNormalsInto(), @ref Magnum::MeshTools::generateSmoothNormals(), @ref Magnum::MeshTools::generateSmoothNormalsInto()
+  */
+ 
++#include <vector>
+ #include "Magnum/Magnum.h"
+ #include "Magnum/MeshTools/visibility.h"
+ 

mingw-w64-magnum/0003-constexpr-enums.patch

@@ -0,0 +1,70 @@
+diff --git a/src/Magnum/Vk/Enums.cpp b/src/Magnum/Vk/Enums.cpp
+index ad8b6d063..b7dffb74f 100644
+--- a/src/Magnum/Vk/Enums.cpp
++++ b/src/Magnum/Vk/Enums.cpp
+@@ -36,17 +36,17 @@ namespace Magnum { namespace Vk {
+ 
+ namespace {
+ 
+-constexpr VkPrimitiveTopology PrimitiveTopologyMapping[]{
++constexpr UnsignedInt PrimitiveTopologyMapping[]{
+     VK_PRIMITIVE_TOPOLOGY_POINT_LIST,
+     VK_PRIMITIVE_TOPOLOGY_LINE_LIST,
+-    VkPrimitiveTopology(~UnsignedInt{}),
++    ~UnsignedInt{},
+     VK_PRIMITIVE_TOPOLOGY_LINE_STRIP,
+     VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,
+     VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP,
+     VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN,
+-    VkPrimitiveTopology(~UnsignedInt{}), /* Instances */
+-    VkPrimitiveTopology(~UnsignedInt{}), /* Faces */
+-    VkPrimitiveTopology(~UnsignedInt{})  /* Edges */
++    ~UnsignedInt{}, /* Instances */
++    ~UnsignedInt{}, /* Faces */
++    ~UnsignedInt{}  /* Edges */
+ };
+ 
+ constexpr VkIndexType IndexTypeMapping[]{
+@@ -94,12 +94,12 @@ constexpr VkSamplerMipmapMode SamplerMipmapModeMapping[]{
+     VK_SAMPLER_MIPMAP_MODE_LINEAR
+ };
+ 
+-constexpr VkSamplerAddressMode SamplerAddressModeMapping[]{
++constexpr UnsignedInt SamplerAddressModeMapping[]{
+     VK_SAMPLER_ADDRESS_MODE_REPEAT,
+     VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT,
+     VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+     VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
+-    VkSamplerAddressMode(~UnsignedInt{}),
++    ~UnsignedInt{},
+ };
+ 
+ }
+@@ -119,10 +119,10 @@ VkPrimitiveTopology vkPrimitiveTopology(const Magnum::MeshPrimitive primitive) {
+ 
+     CORRADE_ASSERT(UnsignedInt(primitive) - 1 < Containers::arraySize(PrimitiveTopologyMapping),
+         "Vk::vkPrimitiveTopology(): invalid primitive" << primitive, {});
+-    const VkPrimitiveTopology out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1];
+-    CORRADE_ASSERT(out != VkPrimitiveTopology(~UnsignedInt{}),
++    const UnsignedInt out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1];
++    CORRADE_ASSERT(out != ~UnsignedInt{},
+         "Vk::vkPrimitiveTopology(): unsupported primitive" << primitive, {});
+-    return out;
++    return VkPrimitiveTopology(out);
+ }
+ 
+ bool hasVkIndexType(const Magnum::MeshIndexType type) {
+@@ -224,10 +224,10 @@ bool hasVkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) {
+ VkSamplerAddressMode vkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) {
+     CORRADE_ASSERT(UnsignedInt(wrapping) < Containers::arraySize(SamplerAddressModeMapping),
+         "Vk::vkSamplerAddressMode(): invalid wrapping" << wrapping, {});
+-    const VkSamplerAddressMode out = SamplerAddressModeMapping[UnsignedInt(wrapping)];
+-    CORRADE_ASSERT(out != VkSamplerAddressMode(~UnsignedInt{}),
++    const UnsignedInt out = SamplerAddressModeMapping[UnsignedInt(wrapping)];
++    CORRADE_ASSERT(out != ~UnsignedInt{},
+         "Vk::vkSamplerAddressMode(): unsupported wrapping" << wrapping, {});
+-    return out;
++    return VkSamplerAddressMode(out);
+ }
+ 
+ }}

mingw-w64-magnum/PKGBUILD

@@ -6,10 +6,10 @@ _realname=magnum
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2020.06
-pkgrel=3
+pkgrel=4
 pkgdesc='C++11/C++14 graphics middleware for games and data visualization (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://magnum.graphics/'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-corrade>=$pkgver"
@@ -24,10 +24,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
 optdepends=("${MINGW_PACKAGE_PREFIX}-magnum-plugins: import and export features"
             "${MINGW_PACKAGE_PREFIX}-magnum-integration: integrations with third-party math and physics libraries")
 source=("${_realname}-${pkgver}.zip::https://github.com/mosra/magnum/archive/v${pkgver}.zip"
-        0001-cmake-fix-FindOpenAL.patch)
+        0001-cmake-fix-FindOpenAL.patch
+        0002-missing-includes.patch
+        0003-constexpr-enums.patch)
 noextract=("${_realname}-${pkgver}.zip")
 sha256sums=('78c52bc403cec27b98d8d87186622ca57f8d70ffd64342fe4094c720b7d3b0e3'
-            'c97070eaac01169f8f18c1cecc40d87c6613a3a5061f22b0dc4502df0d3da095')
+            'c97070eaac01169f8f18c1cecc40d87c6613a3a5061f22b0dc4502df0d3da095'
+            '62f09c0b6f420df638014cd4ade28b5a52f3db7590cb2d666f4a785be745af44'
+            '4418adc5b11148b3af138b3aa86b44a096539940c24b466b3817a8e87b67ee7d')
+
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -p1 -i "${srcdir}/${_patch}"
+  done
+}
 
 prepare() {
   rm -rf ${_realname}-${pkgver}
@@ -36,7 +48,15 @@ prepare() {
   cd ${_realname}-${pkgver}
 
   # https://github.com/mosra/magnum/commit/742b1bb8b2e0cce9ac278d95b69c403729f69210.patch
-  patch -p1 -i "${srcdir}/0001-cmake-fix-FindOpenAL.patch"
+  apply_patch_with_msg \
+    0001-cmake-fix-FindOpenAL.patch
+  
+  apply_patch_with_msg \
+    0002-missing-includes.patch
+
+  # https://github.com/mosra/magnum/issues/642
+  apply_patch_with_msg \
+    0003-constexpr-enums.patch
 }
 
 build() {
@@ -58,6 +78,7 @@ build() {
         ${MINGW_PREFIX}/bin/cmake \
             -G'Ninja' \
             -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
             -DWITH_AL_INFO=ON \
             -DWITH_ANYAUDIOIMPORTER=ON \
             -DWITH_ANYIMAGECONVERTER=ON \