git: a0109b55f2f1 - main - emulators/libretro-mame: Fix fetch of distfiles, fix 32-bit / i386 build

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Li-Wen Hsu <lwhsu_at_FreeBSD.org>
Date: Mon, 27 Jun 2022 07:10:24 UTC
The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a0109b55f2f188328d77c6a375a77c26ee0aa4d2

commit a0109b55f2f188328d77c6a375a77c26ee0aa4d2
Author:     Timothy Beyer <beyert@cs.ucr.edu>
AuthorDate: 2022-06-27 07:06:56 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2022-06-27 07:06:56 +0000

    emulators/libretro-mame: Fix fetch of distfiles, fix 32-bit / i386 build
    
    PR:             264215
---
 emulators/libretro-mame/Makefile                      | 15 +++++++++------
 emulators/libretro-mame/distinfo                      |  6 +++---
 emulators/libretro-mame/files/patch-Makefile.libretro | 11 +++++++++++
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/emulators/libretro-mame/Makefile b/emulators/libretro-mame/Makefile
index 5a94d1157be8..1859c46be88b 100644
--- a/emulators/libretro-mame/Makefile
+++ b/emulators/libretro-mame/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libretro-mame
 PORTVERSION=	20220124
+PORTREVISION=	1
 CATEGORIES=	emulators games
 
 MAINTAINER=	beyert@cs.ucr.edu
@@ -10,10 +11,10 @@ COMMENT=	MAME-current for libretro
 LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-USES=		compiler:c++11-lib gl gmake pkgconfig python:3.7,build
+USES=	compiler:c++11-lib gl gmake pkgconfig python:3.7,build
 USE_LDCONFIG=	yes
 
-USE_GL=		gl
+USE_GL=	gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
@@ -22,13 +23,14 @@ GH_TAGNAME=	ec47e94
 
 MAKEFILE=	${WRKSRC}/Makefile.libretro
 
-MAKE_ENV=	CXX="${CXX}" \
+MAKE_ENV=	ARCH=${ARCH} \
+		CXX="${CXX}" \
 		LD="${CXX}" \
 		OPT_FLAGS="${CXXFLAGS}" \
 		PYTHON="${PYTHON_CMD}" \
 		PYTHON_EXECUTABLE="${PYTHON_CMD}"
 
-GENIE=		${WRKSRC}/3rdparty/genie
+GENIE=	${WRKSRC}/3rdparty/genie
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -67,7 +69,8 @@ post-patch:
 	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/mame_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
+	${INSTALL_LIB} ${WRKSRC}/mame_libretro.so \
+		${STAGEDIR}/${PREFIX}/lib/libretro;
 
 .include <bsd.port.mk>
diff --git a/emulators/libretro-mame/distinfo b/emulators/libretro-mame/distinfo
index c936ab53eea9..d8042a7c4de1 100644
--- a/emulators/libretro-mame/distinfo
+++ b/emulators/libretro-mame/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644819807
-SHA256 (libretro-mame-20220124-ec47e94_GH0.tar.gz) = 36593def33266b9a6171338941743b6ef01865bc3b8f38e7ad0c6b84d971ed1b
-SIZE (libretro-mame-20220124-ec47e94_GH0.tar.gz) = 183780588
+TIMESTAMP = 1653366767
+SHA256 (libretro-mame-20220124-ec47e94_GH0.tar.gz) = 776e7159d35bcef0bd0ae9b71956c85b5e8f5dee1ad207ec09b3d37db9f9a915
+SIZE (libretro-mame-20220124-ec47e94_GH0.tar.gz) = 183781090
diff --git a/emulators/libretro-mame/files/patch-Makefile.libretro b/emulators/libretro-mame/files/patch-Makefile.libretro
new file mode 100644
index 000000000000..0c7da5fc496a
--- /dev/null
+++ b/emulators/libretro-mame/files/patch-Makefile.libretro
@@ -0,0 +1,11 @@
+--- Makefile.libretro.orig	2022-01-24 21:33:37 UTC
++++ Makefile.libretro
+@@ -61,6 +61,8 @@ endif
+ 
+ ifeq ($(ARCH),x86)
+ 	PTR64 := 0
++else ifeq ($(ARCH),i386)
++	PTR64 := 0
+ endif
+ 
+ ###########################################################################