Attachment 224632 Details for Bug 252362 – mame 0.231 patch

[patch] mame 0.231 patch

mame.patch (text/plain), 13.41 KB, created by Stéphane D'Alu on 2021-05-03 15:07:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stéphane D'Alu

Created: 2021-05-03 15:07:32 UTC

Size: 13.41 KB

patch

obsolete

>diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
>index cce76aa8a7..4f19ab08c8 100644
>--- a/emulators/mame/Makefile
>+++ b/emulators/mame/Makefile
>@@ -1,7 +1,7 @@
> # Created by: alepulver
> 
> PORTNAME?=	mame
>-PORTVERSION=	0.226
>+PORTVERSION=	0.231
> CATEGORIES=	emulators
> 
> MAINTAINER=	manu@FreeBSD.org
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
> RUN_DEPENDS=	liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
> 
> USES=		compiler:c++14-lang gl gmake jpeg localbase pkgconfig \
>-		python:3.7,build qt:5 sdl shebangfix xorg
>+		python:build qt:5 sdl shebangfix xorg
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	mamedev
>@@ -62,10 +62,8 @@ MTARGET?=	mame
> 
> .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
> MAKE_ARGS+=	PTR64=1
>-EMULATOR=	${MSUBTARGET}64
>-.else
>-EMULATOR=	${MSUBTARGET}
> .endif
>+EMULATOR=	${MSUBTARGET}
> PLIST_SUB+=	EMULATOR=${EMULATOR}
> 
> post-patch:
>diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
>index 24c58db836..cf6cc1905c 100644
>--- a/emulators/mame/distinfo
>+++ b/emulators/mame/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1608936229
>-SHA256 (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 7c4c9ec232ba988e65fd29665c9b8e40b5ac3aa9f561eeb107cebbf08ba94baf
>-SIZE (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 196379874
>+TIMESTAMP = 1620030186
>+SHA256 (mamedev-mame-0.231-mame0231_GH0.tar.gz) = 36b7ff5865dfa4765dc5dff70484d3f9fcacf8e8771e14c692ec76b845f7da53
>+SIZE (mamedev-mame-0.231-mame0231_GH0.tar.gz) = 196006489
>diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile
>index 14f781dc53..29a472e621 100644
>--- a/emulators/mame/files/patch-makefile
>+++ b/emulators/mame/files/patch-makefile
>@@ -1,42 +1,7 @@
>---- makefile.orig	2020-10-27 01:00:36 UTC
>-+++ makefile
>-@@ -319,6 +319,9 @@ endif
>- ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
>- ARCHITECTURE := _x64
>+--- makefile.orig	2021-03-30 13:19:45.000000000 +0200
>++++ makefile	2021-04-09 23:23:37.240952000 +0200
>+@@ -437,15 +437,15 @@
>  endif
>-+ifeq ($(firstword $(filter powerpc64,$(UNAME))),powerpc64)
>-+ARCHITECTURE := _x64
>-+endif
>- ifeq ($(firstword $(filter ppc64le,$(UNAME))),ppc64le)
>- ARCHITECTURE := _x64
>- endif
>-@@ -399,6 +402,13 @@ ifndef FORCE_DRC_C_BACKEND
>- endif
>- endif
>- 
>-+# powerpc has inline assembly support but no DRC
>-+ifeq ($(findstring powerpc,$(UNAME)),powerpc)
>-+ifndef FORCE_DRC_C_BACKEND
>-+	FORCE_DRC_C_BACKEND := 1
>-+endif
>-+endif
>-+
>- # Autodetect BIGENDIAN
>- # MacOSX
>- ifndef BIGENDIAN
>-@@ -416,18 +426,26 @@ endif
>- ifneq (,$(findstring s390x,$(UNAME)))
>- BIGENDIAN := 1
>- endif
>-+# FreeBSD
>-+ifneq (,$(findstring powerpc,$(UNAME)))
>-+ifneq (,$(findstring powerpc64le,$(UNAME)))
>-+BIGENDIAN := 0
>-+else
>-+BIGENDIAN := 1
>-+endif
>-+endif
>- endif # BIGENDIAN
>  
>  ifndef PYTHON_EXECUTABLE
> -PYTHON := python
>@@ -56,7 +21,7 @@
>  endif
>  
>  #-------------------------------------------------
>-@@ -558,19 +576,19 @@ endif
>+@@ -576,19 +576,19 @@
>  ifdef OVERRIDE_CC
>  PARAMS += --CC='$(OVERRIDE_CC)'
>  ifndef CROSS_BUILD
>diff --git a/emulators/mame/files/patch-src_osd_eigccx86.h b/emulators/mame/files/patch-src_osd_eigccx86.h
>index cd230176a5..93ae0f1e8b 100644
>--- a/emulators/mame/files/patch-src_osd_eigccx86.h
>+++ b/emulators/mame/files/patch-src_osd_eigccx86.h
>@@ -1,24 +1,6 @@
>---- src/osd/eigccx86.h.orig	2019-04-24 05:00:38 UTC
>-+++ src/osd/eigccx86.h
>-@@ -31,7 +31,7 @@
>-     multiply and return the full 64 bit result
>- -------------------------------------------------*/
>- 
>--#ifndef __x86_64__
>-+#if !defined(__amd64__) && !defined(__x86_64__)
>- #define mul_32x32 _mul_32x32
>- inline int64_t ATTR_CONST ATTR_FORCE_INLINE
>- _mul_32x32(int32_t a, int32_t b)
>-@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
>-     result
>- -------------------------------------------------*/
>- 
>--#ifndef __x86_64__
>-+#if !defined(__amd64__) && !defined(__x86_64__)
>- #define mulu_32x32 _mulu_32x32
>- inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
>- _mulu_32x32(uint32_t a, uint32_t b)
>-@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
>+--- src/osd/eigccx86.h.orig	2021-02-23 16:02:38.000000000 +0100
>++++ src/osd/eigccx86.h	2021-03-12 23:48:14.194160000 +0100
>+@@ -68,7 +68,7 @@
>      result to 32 bits
>  -------------------------------------------------*/
>  
>@@ -27,7 +9,7 @@
>  #define mul_32x32_shift _mul_32x32_shift
>  inline int32_t ATTR_CONST ATTR_FORCE_INLINE
>  _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
>-@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
>+@@ -98,7 +98,7 @@
>      result to 32 bits
>  -------------------------------------------------*/
>  
>@@ -36,7 +18,7 @@
>  #define mulu_32x32_shift _mulu_32x32_shift
>  inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
>  _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
>-@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shif
>+@@ -126,7 +126,7 @@
>      divide and return the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -45,7 +27,7 @@
>  #define div_64x32 _div_64x32
>  inline int32_t ATTR_CONST ATTR_FORCE_INLINE
>  _div_64x32(int64_t a, int32_t b)
>-@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b)
>+@@ -153,7 +153,7 @@
>      divide and return the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -54,25 +36,25 @@
>  #define divu_64x32 _divu_64x32
>  inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
>  _divu_64x32(uint64_t a, uint32_t b)
>-@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE
>- _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder)
>+@@ -186,7 +186,7 @@
>+ _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t &remainder)
>  {
>  	int32_t quotient;
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>- 
>  	// Throws arithmetic exception if result doesn't fit in 32 bits
>  	__asm__ (
>-@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE
>- _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder)
>+ 		" idivl  %[divisor] ;"
>+@@ -226,7 +226,7 @@
>+ _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t &remainder)
>  {
>  	uint32_t quotient;
> -#ifndef __x86_64__
> +#if !defined(__amd64__) && !defined(__x86_64__)
>- 
>  	// Throws arithmetic exception if result doesn't fit in 32 bits
>  	__asm__ (
>-@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint32_t divisor, u
>+ 		" divl  %[divisor] ;"
>+@@ -262,7 +262,7 @@
>      division, and returning the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -81,7 +63,7 @@
>  #define div_32x32_shift _div_32x32_shift
>  inline int32_t ATTR_CONST ATTR_FORCE_INLINE
>  _div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
>-@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
>+@@ -294,7 +294,7 @@
>      division, and returning the 32 bit quotient
>  -------------------------------------------------*/
>  
>@@ -90,7 +72,7 @@
>  #define divu_32x32_shift _divu_32x32_shift
>  inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
>  _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
>-@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shif
>+@@ -325,7 +325,7 @@
>      divide and return the 32 bit remainder
>  -------------------------------------------------*/
>  
>@@ -99,7 +81,7 @@
>  #define mod_64x32 _mod_64x32
>  inline int32_t ATTR_CONST ATTR_FORCE_INLINE
>  _mod_64x32(int64_t a, int32_t b)
>-@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b)
>+@@ -352,7 +352,7 @@
>      divide and return the 32 bit remainder
>  -------------------------------------------------*/
>  
>diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
>index f20f1a2148..b926a61462 100644
>--- a/emulators/mame/pkg-plist
>+++ b/emulators/mame/pkg-plist
>@@ -13,6 +13,7 @@ libexec/mame/unidasm
> %%DATADIR%%/artwork/aperture2x4rb.png
> %%DATADIR%%/artwork/aperture4x6.png
> %%DATADIR%%/artwork/bgfx/border_blur/default.lay
>+%%DATADIR%%/artwork/bgfx/chains/crt-geom/add_alpha.py
> %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
> %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
> %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
>@@ -29,19 +30,19 @@ libexec/mame/unidasm
> %%DATADIR%%/artwork/bgfx/chains/hq2x.png
> %%DATADIR%%/artwork/bgfx/chains/hq3x.png
> %%DATADIR%%/artwork/bgfx/chains/hq4x.png
>-%%DATADIR%%/artwork/chess/bb.png
>-%%DATADIR%%/artwork/chess/bk.png
>-%%DATADIR%%/artwork/chess/bn.png
>-%%DATADIR%%/artwork/chess/bp.png
>-%%DATADIR%%/artwork/chess/bq.png
>-%%DATADIR%%/artwork/chess/br.png
>+%%DATADIR%%/artwork/chess/bb.svg
>+%%DATADIR%%/artwork/chess/bk.svg
>+%%DATADIR%%/artwork/chess/bn.svg
>+%%DATADIR%%/artwork/chess/bp.svg
>+%%DATADIR%%/artwork/chess/bq.svg
>+%%DATADIR%%/artwork/chess/br.svg
> %%DATADIR%%/artwork/chess/README.md
>-%%DATADIR%%/artwork/chess/wb.png
>-%%DATADIR%%/artwork/chess/wk.png
>-%%DATADIR%%/artwork/chess/wn.png
>-%%DATADIR%%/artwork/chess/wp.png
>-%%DATADIR%%/artwork/chess/wq.png
>-%%DATADIR%%/artwork/chess/wr.png
>+%%DATADIR%%/artwork/chess/wb.svg
>+%%DATADIR%%/artwork/chess/wk.svg
>+%%DATADIR%%/artwork/chess/wn.svg
>+%%DATADIR%%/artwork/chess/wp.svg
>+%%DATADIR%%/artwork/chess/wq.svg
>+%%DATADIR%%/artwork/chess/wr.svg
> %%DATADIR%%/artwork/dir.txt
> %%DATADIR%%/artwork/LICENSE
> %%DATADIR%%/artwork/monochrome-chessboard.png
>@@ -62,7 +63,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/a800_cass.xml
> %%DATADIR%%/hash/a800_flop.xml
> %%DATADIR%%/hash/a800.xml
>-%%DATADIR%%/hash/abc1600.xml
>+%%DATADIR%%/hash/abc1600_flop.xml
> %%DATADIR%%/hash/abc80_cass.xml
> %%DATADIR%%/hash/abc80_flop.xml
> %%DATADIR%%/hash/abc800_hdd.xml
>@@ -79,6 +80,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/aleste.xml
> %%DATADIR%%/hash/alice32.xml
> %%DATADIR%%/hash/alice90.xml
>+%%DATADIR%%/hash/alphasmart_kapps.xml
> %%DATADIR%%/hash/alphatro_cart.xml
> %%DATADIR%%/hash/alphatro_flop.xml
> %%DATADIR%%/hash/altos5.xml
>@@ -119,6 +121,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/attache.xml
> %%DATADIR%%/hash/aussiebyte.xml
> %%DATADIR%%/hash/b2m.xml
>+%%DATADIR%%/hash/basf7100.xml
> %%DATADIR%%/hash/bbc_cass.xml
> %%DATADIR%%/hash/bbc_flop_32016.xml
> %%DATADIR%%/hash/bbc_flop_6502.xml
>@@ -173,6 +176,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/cgenie_flop_rom.xml
> %%DATADIR%%/hash/channelf.xml
> %%DATADIR%%/hash/chessmstdm.xml
>+%%DATADIR%%/hash/chip8_quik.xml
> %%DATADIR%%/hash/clickstart_cart.xml
> %%DATADIR%%/hash/clipper_flop.xml
> %%DATADIR%%/hash/coco_cart.xml
>@@ -202,6 +206,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/dragon_flop.xml
> %%DATADIR%%/hash/dragon_os9.xml
> %%DATADIR%%/hash/e01_flop.xml
>+%%DATADIR%%/hash/easy_karaoke_cart.xml
> %%DATADIR%%/hash/ec1841.xml
> %%DATADIR%%/hash/einstein.xml
> %%DATADIR%%/hash/ekara_japan_a.xml
>@@ -242,7 +247,9 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/fm7_disk.xml
> %%DATADIR%%/hash/fm77av.xml
> %%DATADIR%%/hash/fmtowns_cd.xml
>-%%DATADIR%%/hash/fmtowns_flop.xml
>+%%DATADIR%%/hash/fmtowns_flop_cracked.xml
>+%%DATADIR%%/hash/fmtowns_flop_misc.xml
>+%%DATADIR%%/hash/fmtowns_flop_orig.xml
> %%DATADIR%%/hash/galaxy.xml
> %%DATADIR%%/hash/gamate.xml
> %%DATADIR%%/hash/gameboy.xml
>@@ -273,6 +280,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/gx4000.xml
> %%DATADIR%%/hash/h21.xml
> %%DATADIR%%/hash/horizon.xml
>+%%DATADIR%%/hash/hp_ipc_rom.xml
> %%DATADIR%%/hash/hp_ipc.xml
> %%DATADIR%%/hash/hp85_rom.xml
> %%DATADIR%%/hash/hp86_rom.xml
>@@ -337,9 +345,13 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/laser2001_cart.xml
> %%DATADIR%%/hash/laser2001_flop.xml
> %%DATADIR%%/hash/leapfrog_didj_cart.xml
>+%%DATADIR%%/hash/leapfrog_iquest_cart.xml
> %%DATADIR%%/hash/leapfrog_leappad_cart.xml
> %%DATADIR%%/hash/leapfrog_ltleappad_cart.xml
> %%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
>+%%DATADIR%%/hash/leapfrog_turboextreme_cart.xml
>+%%DATADIR%%/hash/leapfrog_turbotwistbrainquest_cart.xml
>+%%DATADIR%%/hash/leapfrog_zippity_cart.xml
> %%DATADIR%%/hash/leapster.xml
> %%DATADIR%%/hash/lisa.xml
> %%DATADIR%%/hash/lisa2.xml
>@@ -425,6 +437,8 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/nes_ntbrom.xml
> %%DATADIR%%/hash/nes.hsi
> %%DATADIR%%/hash/nes.xml
>+%%DATADIR%%/hash/next_cdrom.xml
>+%%DATADIR%%/hash/next_hdd.xml
> %%DATADIR%%/hash/next.xml
> %%DATADIR%%/hash/ngp.xml
> %%DATADIR%%/hash/ngpc.xml
>@@ -519,7 +533,8 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/rainbow.xml
> %%DATADIR%%/hash/README.md
> %%DATADIR%%/hash/rwtrntcs.xml
>-%%DATADIR%%/hash/rx78.xml
>+%%DATADIR%%/hash/rx78_cart.xml
>+%%DATADIR%%/hash/rx78_cass.xml
> %%DATADIR%%/hash/sage2.xml
> %%DATADIR%%/hash/saitek_egr.xml
> %%DATADIR%%/hash/saitek_kso.xml
>@@ -542,6 +557,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/sgi_mips_hdd.xml
> %%DATADIR%%/hash/sgi_mips.xml
> %%DATADIR%%/hash/sgx.xml
>+%%DATADIR%%/hash/singingstarkaraoke_cart.xml
> %%DATADIR%%/hash/sitcom.xml
> %%DATADIR%%/hash/smarttv_cart.xml
> %%DATADIR%%/hash/smc777.xml
>@@ -614,6 +630,9 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/to770a_cart.xml
> %%DATADIR%%/hash/to8_cass.xml
> %%DATADIR%%/hash/to8_qd.xml
>+%%DATADIR%%/hash/trs80_cass.xml
>+%%DATADIR%%/hash/trs80_flop.xml
>+%%DATADIR%%/hash/trs80_quik.xml
> %%DATADIR%%/hash/trs80m2.xml
> %%DATADIR%%/hash/trsm100.xml
> %%DATADIR%%/hash/tutor.xml
>@@ -621,6 +640,7 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/tvc_cass.xml
> %%DATADIR%%/hash/tvc_flop.xml
> %%DATADIR%%/hash/tvgogo.xml
>+%%DATADIR%%/hash/u110_card.xml
> %%DATADIR%%/hash/unichamp.xml
> %%DATADIR%%/hash/ut88.xml
> %%DATADIR%%/hash/uzebox.xml
>@@ -649,12 +669,15 @@ libexec/mame/unidasm
> %%DATADIR%%/hash/vsmile_cd.xml
> %%DATADIR%%/hash/vsmileb_cart.xml
> %%DATADIR%%/hash/vsmilem_cart.xml
>+%%DATADIR%%/hash/vtech_innotab_cart.xml
>+%%DATADIR%%/hash/vtech_innotv_innotabmax_cart.xml
> %%DATADIR%%/hash/vtech_storio_cart.xml
> %%DATADIR%%/hash/vz_cass.xml
> %%DATADIR%%/hash/vz_snap.xml
> %%DATADIR%%/hash/wangpc.xml
> %%DATADIR%%/hash/waveterm.xml
> %%DATADIR%%/hash/wicat.xml
>+%%DATADIR%%/hash/wizard_cart.xml
> %%DATADIR%%/hash/wmbullet.xml
> %%DATADIR%%/hash/wscolor.xml
> %%DATADIR%%/hash/wswan.xml

Actions: View | Diff

Attachments on bug 252362: 221216 | 221217 | 223956 | 223957 | 223958 | 223959 | 224632 | 224633 | 233653 | 233733 | 233766 | 233767 | 233768 | 233830 | 234114 | 234115 | 234119 | 234120 | 234130 | 234289 | 234290 | 235445 | 235455 | 235456 | 235499 | 235504 | 235523 | 235526 | 235644 | 235645 | 235646 | 236147 | 237653 | 237654 | 237699 | 237700 | 237720 | 237734 | 237739