Merge pull request #3826 from joolswills/mame_armv7_crc_fix

joolswills · web-flow · commit 888cabbabe32 · 2024-01-01T03:42:16.000Z
mame - fix building 7zip/lzma on armv7 due to missing hardware crc
diff --git a/scriptmodules/emulators/mame.sh b/scriptmodules/emulators/mame.sh
@@ -34,6 +34,8 @@ function depends_mame() {
 
 function sources_mame() {
     gitPullOrClone
+    # lzma assumes hardware crc support on arm which breaks when building on armv7
+    isPlatform "armv7" && applyPatch "$md_data/lzma_armv7_crc.diff"
 }
 
 function build_mame() {
diff --git a/scriptmodules/emulators/mame/lzma_armv7_crc.diff b/scriptmodules/emulators/mame/lzma_armv7_crc.diff
@@ -0,0 +1,12 @@
+diff --git a/3rdparty/lzma/C/7zCrc.c b/3rdparty/lzma/C/7zCrc.c
+index f186324d..f39fe1c9 100644
+--- a/3rdparty/lzma/C/7zCrc.c
++++ b/3rdparty/lzma/C/7zCrc.c
+@@ -71,7 +71,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const U
+ 
+ #ifdef MY_CPU_LE
+ 
+-#if defined(MY_CPU_ARM_OR_ARM64)
++#if defined(MY_CPU_ARM_OR_ARM64) && 0
+ 
+ // #pragma message("ARM*")

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ function depends_mame() {`
`34`	`34`
`35`	`35`	`function sources_mame() {`
`36`	`36`	`gitPullOrClone`
	`37`	`+ # lzma assumes hardware crc support on arm which breaks when building on armv7`
	`38`	`+ isPlatform "armv7" && applyPatch "$md_data/lzma_armv7_crc.diff"`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`function build_mame() {`