Bump Capstone v6 to Alpha3 (rizinorg#4867)

kazarmy · Jan 29, 2025 · 8d391b7 · 8d391b7
1 parent 290c907
commit 8d391b7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,6 +64,7 @@ jobs:
             linux-gcc-tests-codecov,
             capstone-v4,
             capstone-v5,
+            capstone-v6,
           ]
         include:
           - name: linux-meson-clang-tests
@@ -155,6 +156,15 @@ jobs:
             enabled: ${{ (github.event_name != 'pull_request' || contains(github.head_ref, 'capstone')) && needs.changes.outputs.edited == 'true' }}
             timeout: 45
             allow_failure: true
+          - name: capstone-v6
+            os: ubuntu-22.04
+            build_system: meson
+            compiler: gcc
+            meson_options: -Dbuildtype=release -Duse_capstone_version=v6 --werror
+            run_tests: false
+            enabled: ${{ (github.event_name != 'pull_request' || contains(github.head_ref, 'capstone')) && needs.changes.outputs.edited == 'true' }}
+            timeout: 45
+            allow_failure: true
           - name: no-gpl-code
             os: ubuntu-22.04
             build_system: meson

diff --git a/subprojects/capstone-v6.wrap b/subprojects/capstone-v6.wrap
@@ -1,6 +1,6 @@
-[wrap-git]
-url = https://github.com/capstone-engine/capstone.git
-revision = v6
-patch_directory = capstone-6.0.0-alpha1
-directory = capstone-6.0.0
-depth = 1
+[wrap-file]
+source_url = https://github.com/capstone-engine/capstone/releases/download/6.0.0-Alpha3/capstone-6.0.0-Alpha3.tar.xz
+source_filename = capstone-6.0.0-Alpha3.tar.xz
+source_hash = 2c6a91f4debc4c13ba9e83b3e841cd500beba84af3a596e06afd7d4c665da88e
+directory = capstone-6.0.0-Alpha3
+patch_directory = capstone-6.0.0-alpha3
diff --git a/...gefiles/capstone-6.0.0-alpha1/meson.build → ...gefiles/capstone-6.0.0-alpha3/meson.build b/...gefiles/capstone-6.0.0-alpha1/meson.build → ...gefiles/capstone-6.0.0-alpha3/meson.build
@@ -16,6 +16,10 @@ cs_files = [
   'arch/Alpha/AlphaInstPrinter.c',
   'arch/Alpha/AlphaMapping.c',
   'arch/Alpha/AlphaModule.c',
+  'arch/ARC/ARCDisassembler.c',
+  'arch/ARC/ARCInstPrinter.c',
+  'arch/ARC/ARCMapping.c',
+  'arch/ARC/ARCModule.c',
   'arch/AArch64/AArch64BaseInfo.c',
   'arch/AArch64/AArch64Disassembler.c',
   'arch/AArch64/AArch64DisassemblerExtension.c',
@@ -92,6 +96,7 @@ libcapstone_c_args = [
   '-DCAPSTONE_X86_REDUCE_NO',
   '-DCAPSTONE_USE_SYS_DYN_MEM',
   '-DCAPSTONE_DIET_NO',
+  '-DCAPSTONE_HAS_ARC',
   '-DCAPSTONE_HAS_ALPHA',
   '-DCAPSTONE_HAS_ARM',
   '-DCAPSTONE_HAS_AARCH64',