dynarmic/PKGBUILD

@@ -2,13 +2,13 @@
 # Contributor: Alexandre Bouvier <contact@amb.tf>
 
 pkgname=dynarmic
-pkgver=6.3.1
+pkgver=6.2.3
 pkgrel=1
 pkgdesc='An ARM dynamic recompiler'
 arch=('x86_64')
 url='https://github.com/merryhime/dynarmic'
 license=('BSD')
-depends=('gcc-libs' 'fmt' 'zydis')
+depends=('gcc-libs' 'fmt') # 'zydis')
 makedepends=(
   'git'
   'boost'
@@ -18,7 +18,7 @@ makedepends=(
   'neovim'
 )
 checkdepends=('catch2')
-_commit='df72827b091760eebfd200e9fcdf0a5915f0fc3c'
+_commit='2d4602a6516c67d547000d4c80bcc5f74976abdd'
 source=("$pkgname::git+$url#commit=$_commit")
 b2sums=('SKIP')
 
@@ -28,22 +28,32 @@ pkgver() {
   git describe --tags | sed 's/^v//'
 }
 
+prepare() {
+  cd "$pkgname"
+
+  # fix FTBFS for zydis >4
+  #sed \
+  #  -e 's/ZYDIS_ADDRESS_WIDTH_64/ZYDIS_STACK_WIDTH_64/g' \
+  #  -e 's/ZydisDecoderDecodeBuffer/ZydisDecoderDecodeFull/g' \
+  #  -i src/dynarmic/common/x64_disassemble.cpp
+}
+
 build() {
   cmake \
     -B build \
     -S "$pkgname" \
-    -D BUILD_SHARED_LIBS=ON \
+    -DBUILD_SHARED_LIBS=ON \
-    -D CMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=Release \
-    -D CMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-    -D CMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX=/usr \
-    -D DYNARMIC_IGNORE_ASSERTS=ON \
+    -DDYNARMIC_IGNORE_ASSERTS=ON \
-    -D DYNARMIC_NO_BUNDLED_CATCH=ON \
+    -DDYNARMIC_NO_BUNDLED_CATCH=ON \
-    -D DYNARMIC_NO_BUNDLED_FMT=ON \
+    -DDYNARMIC_NO_BUNDLED_FMT=ON \
-    -D DYNARMIC_NO_BUNDLED_ROBIN_MAP=ON \
+    -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON \
-    -D DYNARMIC_NO_BUNDLED_XBYAK=ON \
+    -DDYNARMIC_NO_BUNDLED_XBYAK=ON \
-    -D DYNARMIC_NO_BUNDLED_ZYDIS=ON \
+    -DDYNARMIC_NO_BUNDLED_ZYDIS=OFF \
-    -D DYNARMIC_TESTS="$CHECKFUNC" \
+    -DDYNARMIC_TESTS="$CHECKFUNC" \
-    -W no-dev
+    -Wno-dev
 
   cmake --build build
 }

jujutsu

@@ -1 +1 @@
-Subproject commit 976d4b413147635a61cae7f1b80754bfe61344a7
+Subproject commit eec8a3e4f7d1d8884d8d8bf0950799d183e6531d