intel-xed: update to 2024.11.04

mingw-w64-intel-xed/001-mbuild-shared.patch

@@ -1,7 +1,11 @@
---- mbuild/mbuild/build_env.py.orig	2023-12-19 13:46:51.529981000 +0300
-+++ mbuild/mbuild/build_env.py	2023-12-19 13:53:37.962101800 +0300
-@@ -195,14 +195,14 @@
-     if env.on_mac():
+--- a/mbuild/build_env.py
++++ b/mbuild/build_env.py
+@@ -201,17 +201,17 @@
+     env['LIBOUT'] = ' ' # nothing when using gar/ar
+     env['LINKOUT'] = '-o '
+     env['EXEOUT'] = '-o '
+-    if env.on_mac() or env.on_windows():
++    if env.on_mac():
          env['DLLOPT'] = '-shared' # '-dynamiclib'
      else:
 -        env['DLLOPT'] = '-shared -Wl,-soname,%(SOLIBNAME)s'
@@ -18,9 +22,9 @@
      elif env.on_mac():
          env['EXEEXT'] = ''
          env['DLLEXT'] = '.dylib'
---- mbuild/mbuild/env.py.orig	2023-12-19 13:51:26.706160600 +0300
-+++ mbuild/mbuild/env.py	2023-12-19 13:51:51.489195500 +0300
-@@ -1171,6 +1171,8 @@
+--- a/mbuild/env.py
++++ b/mbuild/env.py
+@@ -1179,6 +1179,8 @@
             @return:  True iff on cygwin"""
          if len(self.env['system']) >= 6 and self.env['system'][0:6] == 'CYGWIN':
              return True
@@ -29,9 +33,9 @@
          return False
  
      def windows_native(self):
---- mbuild/mbuild/base.py.orig	2023-12-19 14:23:22.011100800 +0300
-+++ mbuild/mbuild/base.py	2023-12-19 14:23:39.802749300 +0300
-@@ -187,6 +187,9 @@
+--- a/mbuild/base.py
++++ b/mbuild/base.py
+@@ -182,6 +182,9 @@
  if _operating_system_name.find('CYGWIN') != -1:
     _on_cygwin = True
     _on_windows = True

mingw-w64-intel-xed/002-xed-build.patch

@@ -1,6 +1,6 @@
---- xed-2023.10.11/xed_mbuild.py.orig	2023-12-19 14:06:30.571422100 +0300
-+++ xed-2023.10.11/xed_mbuild.py	2023-12-19 14:07:28.462727800 +0300
-@@ -2210,6 +2210,7 @@
+--- a/xed_mbuild.py
++++ b/xed_mbuild.py
+@@ -2262,6 +2262,7 @@
                            'lib%(base_lib)s.so',
                            '%(base_lib)s.lib',
                            '%(base_lib)s.dll',
@@ -8,7 +8,7 @@
                            'lib%(base_lib)s.dylib' ] 
      libnames = []
      for base_lib in ['xed', 'xed-ild']:
-@@ -2278,9 +2278,6 @@
+@@ -2330,9 +2331,6 @@
      """Build install in the prefix_dir. Use prefix_lib_dir as library name
         since some systems use lib, lib32 or lib64. non-windows only.
      """
@@ -18,7 +18,7 @@
      if not env['prefix_dir']:
          return
  
-@@ -2291,6 +2288,8 @@
+@@ -2343,6 +2341,8 @@
  
      def _set_perm(fn):
          "-rwx-r-xr-x"
@@ -27,9 +27,18 @@
          os.chmod(fn, stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH|
                       stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH|
                       stat.S_IWUSR)
---- xed-2023.10.11/xed_build_common.py.orig	2023-12-19 19:16:58.153704500 +0300
-+++ xed-2023.10.11/xed_build_common.py	2023-12-19 19:17:18.663203700 +0300
-@@ -471,8 +471,8 @@
+--- a/xed_build_common.py
++++ b/xed_build_common.py
+@@ -143,7 +143,7 @@
+                 ### Inexecutable Stack ###
+                 # Specifies that the stack memory should be marked as non-executable
+                 env.add_to_var('LINKFLAGS','-z noexecstack')
+-        else:  # Windows
++        elif env['compiler'] == 'ms':  # MSVC compiler
+             # Enables Data Execution Prevention (DEP) for executables.
+             env.add_to_var('LINKFLAGS','-z /NXCOMPAT')
+             # Enables address space layout randomization (ASLR) for executables.
+@@ -412,8 +412,8 @@
         base we return base.lib and base.dll on windows.  base.so and
         base.so on non-windows.  Users link against the link lib."""
      
@@ -40,7 +49,7 @@
      
      if env['shared']:
          if env.on_windows():
-@@ -488,11 +488,11 @@
+@@ -429,11 +429,11 @@
      return mbuild.join(env['xed_lib_dir'],s)
  
  def get_libxed_names(env):

mingw-w64-intel-xed/PKGBUILD

@@ -3,21 +3,21 @@
 _realname=intel-xed
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2023.12.19
-_mbuild_ver=2022.07.28
-pkgrel=3
+pkgver=2024.11.04
+_mbuild_ver=2024.11.04
+pkgrel=1
 pkgdesc="Intel X86 Encoder Decoder (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
-license=('Apache 2.0')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
+license=('spdx:Apache-2.0')
 url="https://github.com/intelxed/xed/"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-clang"
              "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-yasm"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/intelxed/xed/archive/refs/tags/v${pkgver}.tar.gz"
-        "mbuild-${_mbuild_ver}.tar.gz"::"https://github.com/intelxed/mbuild/archive/refs/tags/v${_mbuild_ver}.tar.gz"
+source=("https://github.com/intelxed/xed/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
+        "https://github.com/intelxed/mbuild/archive/v${_mbuild_ver}/mbuild-${_mbuild_ver}.tar.gz"
         001-mbuild-shared.patch
         002-xed-build.patch
         003-mbuild-remove-m64.patch
@@ -25,52 +25,63 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/intelxed/xed/archiv
         XEDConfigVersion.cmake
         XEDTargets.cmake
         XEDTargets-release.cmake)
-sha256sums=('1ddfc40f1f931980ee31a51121af9f82f0d4f3a7075318c1208c2b7a3a09bf0f'
-            'd3a2a514cec936036fd203a3ecdb8b60e07fc6ee20670edeb0bc14b1f9a9a51d'
-            '11b4bb8e5639cc98c43d008446166e2d117037aa43dfe8559c955281ea0c1637'
-            '5c7ee1376b936d52593321001ef5ccb28bff84f4dcd7f7f57d86d4cd91f59217'
+sha256sums=('046d491a90448005891ad39310956edbe3a10385b0fadc9449f96e5870135671'
+            '866d17a3aa3b3f4d8d7157d747d54b13b4300c9fd5bf15ad9289b1b3309e0b71'
+            'de8a938a30c2e18e922c7deb2349c454470781d1f5a8b01b7fefb4d45504ea32'
+            '2b0f746faa343d078815be96f1dce10f3625946d862a0213792a192a0a4957f0'
             '994db2654d484c7da80075a01743d45c7e79c7800ae4be8bff2e481b0ce6baf7'
             '5ce572ebc6acabe4f18affc9dbdbd045dd81e4af6b99ac9bbdbe4b5bb0113ab0'
             '5b67da254e4a1c7b2a05d0d2eeb60d8f9767f0179326e2c6f6c59f850ab28dc3'
             '9ccd6f8b79e51f9c9318969af3464466fe5060e7ab06cb37993228cb7d69a090'
             '560c662524317214e80575279f09fff05612e389345ee294c21539c3fade4068')
 
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -Nbp1 -i "${srcdir}/${_patch}"
+  done
+}
+
 prepare() {
   cd "${srcdir}"
-  mv mbuild-${_mbuild_ver} mbuild
-  cd mbuild
-  patch -p1 -i ${srcdir}/001-mbuild-shared.patch
-  patch -p1 -i ${srcdir}/003-mbuild-remove-m64.patch
 
   cd "${srcdir}/xed-${pkgver}"
-  patch -p1 -i ${srcdir}/002-xed-build.patch
+  apply_patch_with_msg \
+    002-xed-build.patch
+
+  mv "${srcdir}"/mbuild-${_mbuild_ver} "${srcdir}"/mbuild && cd "${srcdir}"/mbuild
+  apply_patch_with_msg \
+    001-mbuild-shared.patch \
+    003-mbuild-remove-m64.patch
 }
 
 build() {
   cd "${srcdir}/xed-${pkgver}"
-  
-  ${MINGW_PREFIX}/bin/python.exe ./mfile.py --shared --opt=2 --compiler=clang
+
+  ${MINGW_PREFIX}/bin/python.exe ./mfile.py --shared --opt=2 --compiler=clang --jobs=$(nproc)
 }
 
 package() {
   cd "${srcdir}"/xed-${pkgver}
   ${MINGW_PREFIX}/bin/python.exe ./mfile.py --shared --opt=2 --compiler=clang --prefix=${pkgdir}${MINGW_PREFIX} install
-  
+
   mkdir -p ${pkgdir}${MINGW_PREFIX}/bin
   mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/
-  
+
   cp -f ${srcdir}/xed-${pkgver}/*.dll.a ${pkgdir}${MINGW_PREFIX}/lib/
-  
+
   # License
-  install -Dm644 "${srcdir}/xed-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
-  
+  install -Dm644 "${srcdir}/xed-${pkgver}/LICENSE" \
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+
   install -Dm644 "${srcdir}/XEDConfig.cmake" "${pkgdir}${MINGW_PREFIX}/lib/cmake/xed/XEDConfig.cmake"
   install -Dm644 "${srcdir}/XEDConfigVersion.cmake" "${pkgdir}${MINGW_PREFIX}/lib/cmake/xed/XEDConfigVersion.cmake"
   install -Dm644 "${srcdir}/XEDTargets.cmake" "${pkgdir}${MINGW_PREFIX}/lib/cmake/xed/XEDTargets.cmake"
   install -Dm644 "${srcdir}/XEDTargets-release.cmake" "${pkgdir}${MINGW_PREFIX}/lib/cmake/xed/XEDTargets-release.cmake"
-  
+
   sed -i "s#@XED_VERSION@#${pkgver}#g" "${pkgdir}${MINGW_PREFIX}"/lib/cmake/xed/XEDConfig.cmake
-  
+
   case "${CARCH}" in
     x86_64|aarch64)
       sed -i "s#@@VOID_SIZE@@#8#g" "${pkgdir}${MINGW_PREFIX}"/lib/cmake/xed/XEDConfigVersion.cmake