Attachment #242434 for bug #271374

Lines 1-6 Link Here

(-)b/emulators/mame/Makefile (-78 / +86 lines)
1	PORTNAME= mame	1	PORTNAME= mame
2	PORTVERSION= 0.254	2	PORTVERSION= 0.254
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= emulators games	4	CATEGORIES= emulators games
5		5
6	MAINTAINER= agh@riseup.net	6	MAINTAINER= agh@riseup.net
Lines 21-106 LICENSE_FILE= ${WRKSRC}/docs/LICENSE Link Here
21	ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le	21	ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le
22	ONLY_FOR_ARCHS_REASON= not yet ported to any architecture other than armv7, arm64, x86, and powerpc*	22	ONLY_FOR_ARCHS_REASON= not yet ported to any architecture other than armv7, arm64, x86, and powerpc*
23		23
24	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-svg2pdfconverter>0:textproc/py-sphinxcontrib-svg2pdfconverter@${PY_FLAVOR}	24	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-svg2pdfconverter>0:textproc/py-sphinxcontrib-svg2pdfconverter@${PY_FLAVOR} \
		25	glm>0:math/glm \
		26	rapidjson>0:devel/rapidjson
25	LIB_DEPENDS= libexpat.so:textproc/expat2 \	27	LIB_DEPENDS= libexpat.so:textproc/expat2 \
26	libFLAC.so:audio/flac \	28	libFLAC.so:audio/flac \
27	libfontconfig.so:x11-fonts/fontconfig \	29	libfontconfig.so:x11-fonts/fontconfig \
28	libfreetype.so:print/freetype2 \	30	libfreetype.so:print/freetype2 \
29	libpugixml.so:textproc/pugixml	31	libportmidi.so:audio/portmidi \
		32	libpugixml.so:textproc/pugixml \
		33	libutf8proc.so:textproc/utf8proc \
		34	libuv.so:devel/libuv
30	RUN_DEPENDS= liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf	35	RUN_DEPENDS= liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
31		36
32	USES= compiler:c++14-lang gl gmake jpeg localbase lua:54 pkgconfig \	37	USES= compiler:c++17-lang gl gmake jpeg localbase lua:54 pkgconfig \
33	python:3.9,build qt:5 sdl shebangfix sqlite:3 xorg	38	python:3.9,build sdl shebangfix sqlite:3 xorg
34		39
35	USE_GITHUB= yes	40	USE_GITHUB= yes
36	GH_ACCOUNT= mamedev	41	GH_ACCOUNT= mamedev
37	GH_PROJECT= mame # explicit (master port)	42	GH_PROJECT= mame # explicit (master port)
38	GH_TAGNAME= mame${PORTVERSION:S/.//}	43	GH_TAGNAME= mame${PORTVERSION:S/.//}
39	USE_GL= gl	44	USE_GL= gl
40	USE_QT= buildtools core gui qmake widgets
41	USE_SDL= sdl2 ttf2	45	USE_SDL= sdl2 ttf2
42	USE_XORG= x11 xext xi xinerama xrender	46	USE_XORG= x11 xext xi xinerama xrender
43		47
44	MAKEFILE= makefile	48	MAKEFILE= makefile
45	MAKE_ARGS= TARGETOS=freebsd \	49	MAKE_ARGS= TARGETOS=freebsd \
46	TOOLS=1 \	50	VERBOSE="1"
47	USE_SYSTEM_LIB_PUGIXML=1 \	51	MAKE_ENV= LDOPTS="${LDFLAGS}" \
48	USE_SYSTEM_LIB_SQLITE3=1 \	52	NO_USE_PORTAUDIO=1 \
49	VERBOSE=1	53	NO_USE_PULSEAUDIO=1 \
50	MAKE_ENV= FULLNAME="mame" \
51	GCC_LDFLAGS="${LDFLAGS}" \
52	LD="${CXX}" \
53	NOWERROR=1 \	54	NOWERROR=1 \
54	OPT_FLAGS="${CXXFLAGS}" \	55	OPT_FLAGS="${CXXFLAGS}" \
55	PYTHON="${PYTHON_CMD}" \	56	OPTIMIZE=2 \
56	SDL_NETWORK="pcap" \	57	PRECOMPILE=0 \
57	SUBTARGET="${MSUBTARGET}" \	58	PYTHON_EXECUTABLE="${PYTHON_CMD}" \
58	TARGET="${MTARGET}" \	59	TOOLS=1 \
59	USE_NETWORK=1	60	USE_PCAP=1 \
		61	USE_SYSTEM_LIB_EXPAT=1 \
		62	USE_SYSTEM_LIB_FLAC=1 \
		63	USE_SYSTEM_LIB_GLM=1 \
		64	USE_SYSTEM_LIB_JPEG=1 \
		65	USE_SYSTEM_LIB_PORTMIDI=1 \
		66	USE_SYSTEM_LIB_RAPIDJSON=1 \
		67	USE_SYSTEM_LIB_SQLITE3=1 \
		68	USE_SYSTEM_LIB_UTF8PROC=1 \
		69	USE_SYSTEM_LIB_UV=1 \
		70	USE_SYSTEM_LIB_ZLIB=1 \
		71	USE_TAPTUN=1
60		72
61	BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD}
62	SUB_FILES= pkg-message target.ini	73	SUB_FILES= pkg-message target.ini
63	SUB_LIST= MSUBTARGET=${MSUBTARGET} \
64	MTARGET=${MTARGET}
65		74
66	PORTDOCS= LICENSE html/* legal/*	75	PORTDOCS= html/*
67	PORTEXAMPLES= ${MSUBTARGET}.ini	76	PORTEXAMPLES= mame.ini
68		77
69	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES	78	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES QTDEBUGGER
70	DEBUG_DESC= Build with debug profiling and symbols
71	DOCS_DESC= Install additional MAME documentation
72	EXAMPLES_DESC= Install example ${EMULATOR}.ini configuration
73		79
74	DEBUG_MAKE_ENV= DEBUG=1	80	DEBUG_DESC= Build with debug profiling and symbols
		81	DOCS_DESC= Install extensive online MAME documentation
		82	EXAMPLES_DESC= Install example mame.ini configuration
		83	QTDEBUGGER_DESC= Build Qt interactive low-level machine debugger
75		84
76	GENIE= ${WRKSRC}/3rdparty/genie	85	_GENIE= ${WRKSRC}/3rdparty/genie
77	MSUBTARGET= mame
78	MTARGET= mame
79		86
80	.include <bsd.port.options.mk>	87	.include <bsd.port.options.mk>
81		88
		89	.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000
		90	#LLVM_USES= llvm:15,build # This convention does not work?
		91	USES+= llvm:15,build # MAME always selects /usr/bin/c++
		92	MAKE_ENV+= OVERRIDE_AR="llvm-ar${LLVM_VERSION}" \
		93	OVERRIDE_CC="${COMPILER_TYPE}${LLVM_VERSION}" \
		94	OVERRIDE_CXX="${COMPILER_TYPE}++${LLVM_VERSION}" \
		95	OVERRIDE_LD="lld${LLVM_VERSION}"
		96	.else
		97	MAKE_ENV+= OVERRIDE_AR="${AR}" \
		98	OVERRIDE_CC="${CC}" \
		99	OVERRIDE_CXX="${CXX}" \
		100	OVERRIDE_LD="${LD}"
		101	.endif
		102
82	.if ${PORT_OPTIONS:MDEBUG}	103	.if ${PORT_OPTIONS:MDEBUG}
83	WITH_DEBUG= "YES"	104	WITH_DEBUG= "YES"
84	MAKE_ENV+= DEBUG="1" \	105	MAKE_ENV+= DEBUG=1 \
85	OPTIMIZE="0" \	106	OPTIMIZE=0 \
86	PROFILER="1" \	107	PROFILER=1 \
87	SYMBOLS="1"	108	SYMBOLS=1
88	.else	109	.else
89	# avoid address space exhaustion in linker on armv7	110	# Attempt to avoid address space exhaustion during linking.
90	LDFLAGS+= -s	111	LDFLAGS+= -s
		112	MAKE_ENV+= STRIP_SYMBOLS=1
91	.endif	113	.endif
92		114
93	.if ${ARCH} == aarch64 \|\| ${ARCH} == amd64 \|\| ${ARCH:Mpowerpc64*}	115	#.if ${PORT_OPTIONS:MQTDEBUGGER}
		116	MAKE_ENV+= USE_QTDEBUG=1
		117	USES+= qt:5
		118	USE_QT= core gui widgets buildtools:build qmake:build
		119	#.else
		120	#MAKE_ENV+= USE_QTDEBUG=0
		121	#.endif
		122
		123	.if ${ARCH:Maarch64} \|\| ${ARCH:Mamd64} \|\| ${ARCH:Mpowerpc64*}
94	MAKE_ARGS+= PTR64=1	124	MAKE_ARGS+= PTR64=1
95	.endif	125	.endif
96		126
97	EMULATOR= ${MSUBTARGET}
98	PLIST_SUB+= EMULATOR=${EMULATOR}
99
100	do-build-DOCS-on:	127	do-build-DOCS-on:
101	(cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \	128	(cd ${WRKSRC}/docs && \
102	${MAKE_CMD} ${MAKE_ARGS} html \	129	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} html SPHINXBUILD=sphinx-build-${PYTHON_VER})
103	SPHINXBUILD=sphinx-build-${PYTHON_VER})
104	@${RM} ${WRKSRC}/docs/build/html/.buildinfo	130	@${RM} ${WRKSRC}/docs/build/html/.buildinfo
105		131
106	do-install:	132	do-install:
Lines 110-118 do-install: Link Here
110	${STAGEDIR}${PREFIX}/bin	136	${STAGEDIR}${PREFIX}/bin
111	.endfor	137	.endfor
112		138
113	.for data in artwork bgfx ctrlr ini hash language plugins samples	139	.for DATA in artwork bgfx ctrlr ini hash language plugins samples
114	(cd ${WRKSRC} && \	140	(cd ${WRKSRC} && \
115	${COPYTREE_SHARE} ${data} ${STAGEDIR}${DATADIR})	141	${COPYTREE_SHARE} ${DATA} ${STAGEDIR}${DATADIR})
116	.endfor	142	.endfor
117		143
118	${MKDIR} ${STAGEDIR}${DOCSDIR}	144	${MKDIR} ${STAGEDIR}${DOCSDIR}
Lines 120-144 do-install: Link Here
120	${STAGEDIR}${MANPREFIX}/man/man1	146	${STAGEDIR}${MANPREFIX}/man/man1
121	${INSTALL_MAN} ${WRKSRC}/docs/build/man/*.1 \	147	${INSTALL_MAN} ${WRKSRC}/docs/build/man/*.1 \
122	${STAGEDIR}${MANPREFIX}/man/man1	148	${STAGEDIR}${MANPREFIX}/man/man1
123	${INSTALL_MAN} ${WRKSRC}/docs/man/${EMULATOR}.6 \	149	${INSTALL_MAN} ${WRKSRC}/docs/man/*.6 \
124	${STAGEDIR}${MANPREFIX}/man/man6	150	${STAGEDIR}${MANPREFIX}/man/man6
125	${INSTALL_MAN} ${WRKSRC}/docs/LICENSE \
126	${STAGEDIR}${DOCSDIR}
127	(cd ${WRKSRC}/docs && \
128	${COPYTREE_SHARE} legal ${STAGEDIR}${DOCSDIR})
129
130	do-install-DEBUG-off:
131	${INSTALL_PROGRAM} ${WRKSRC}/${MSUBTARGET} \
132	${STAGEDIR}${PREFIX}/bin/${EMULATOR}
133		151
134	do-install-DEBUG-on:	152	do-install-DEBUG-on:
135	${INSTALL_PROGRAM} ${WRKSRC}/${MSUBTARGET}d \	153	${INSTALL_PROGRAM} ${WRKSRC}/mamed \
136	${STAGEDIR}${PREFIX}/bin/${EMULATOR}	154	${STAGEDIR}${PREFIX}/bin/mame
		155
		156	do-install-DEBUG-off:
		157	${INSTALL_PROGRAM} ${WRKSRC}/mame \
		158	${STAGEDIR}${PREFIX}/bin/
137		159
138	post-build:	160	post-build:
139	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \	161	(cd ${WRKSRC}/docs && \
140	${MAKE_CMD} ${MAKE_ARGS} man \	162	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} man SPHINXBUILD=sphinx-build-${PYTHON_VER})
141	SPHINXBUILD=sphinx-build-${PYTHON_VER}
142		163
143	post-install-DOCS-on:	164	post-install-DOCS-on:
144	${MKDIR} ${STAGEDIR}${DOCSDIR}	165	${MKDIR} ${STAGEDIR}${DOCSDIR}
Lines 148-176 post-install-DOCS-on: Link Here
148	post-install-EXAMPLES-on:	169	post-install-EXAMPLES-on:
149	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	170	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
150	${INSTALL_DATA} ${WRKDIR}/target.ini \	171	${INSTALL_DATA} ${WRKDIR}/target.ini \
151	${STAGEDIR}${EXAMPLESDIR}/${EMULATOR}.ini	172	${STAGEDIR}${EXAMPLESDIR}/mame.ini
152		173
153	post-patch:	174	post-patch:
		175	# Prefer some system headers over bundled.
154	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h	176	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h
155	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h	177	@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h
156	@${MV} ${GENIE}/build/gmake.freebsd \	178	# Accommodate GENie conception of BSD.
157	${GENIE}/build/gmake.bsd	179	@${MV} ${_GENIE}/build/gmake.freebsd \
158	@${REINPLACE_CMD} -e \	180	${_GENIE}/build/gmake.bsd
159	's\|^$AR $\|#\1\| ; \	181	# Patch build to use bundled PNG.
160	s\|^$CC $\|#\1\| ; \
161	s\|^$CXX $\|#\1\| ; \
162	s\|^$CXX:$\|#\1\| ; \
163	s\|^$LD $\|#\1\| ; \
164	s\| .(ARCH)\|\|g' \
165	${WRKSRC}/makefile \
166	${GENIE}/build/gmake.bsd/genie.make
167	@${REINPLACE_CMD} -e 's\|gcc\|${CC}\|; s\|g++\|${CXX}\|' \
168	${GENIE}/src/tools/gcc.lua \
169	${GENIE}/src/tools/snc.lua \
170	${GENIE}/tests/test_gmake_cpp.lua
171	@${REINPLACE_CMD} -e 's\|= \"gcc\|= \"${CC}\|; s\|= \"g++\|= \"${CXX}\|' \
172	-e "s\|'CXX =\|'#CXX =\|; s\|'CC =\|'#CC =\|; s\| .(ARCH)\| \|g" \
173	${GENIE}/src/host/scripts.c
174	@${GREP} -rl '"png.h"' ${WRKSRC}/src \| \	182	@${GREP} -rl '"png.h"' ${WRKSRC}/src \| \
175	${XARGS} ${REINPLACE_CMD} -e 's\|"png.h"\|"localpng.h"\|'	183	${XARGS} ${REINPLACE_CMD} -e 's\|"png.h"\|"localpng.h"\|'
176	@${REINPLACE_CMD} -e 's\|"util/png.h"\|"util/localpng.h"\|' \	184	@${REINPLACE_CMD} -e 's\|"util/png.h"\|"util/localpng.h"\|' \




--- 3rdparty/genie/build/gmake.freebsd/genie.make.orig	2023-05-26 04:14:50 UTC
+++ 3rdparty/genie/build/gmake.freebsd/genie.make
@@ -28,9 +28,9 @@ endif
   RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
 endif
 
-CC  = gcc
-CXX = g++
-AR  = ar
+CC  ?= gcc
+CXX ?= g++
+AR  ?= ar
 
 ifndef RESCOMP
   ifdef WINDRES
@@ -49,17 +49,17 @@ ifeq ($(config),release)
   DEFINES            += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
   INCLUDES           += -I"../../src/host/lua-5.3.0/src"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -Os $(MPARAM)
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -Os $(MPARAM)
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -Os $(MPARAM)
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -Os $(MPARAM)
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -Os $(MPARAM)
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L. -s -rdynamic
   LDDEPS             +=
   LIBS               += $(LDDEPS) -lm
   EXTERNAL_LIBS      +=
-  LINKCMD             = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  LINKCMD             = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES)  $(ALL_LDFLAGS) $(LIBS)
   OBJECTS := \
 	$(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
 	$(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \
@@ -132,17 +132,17 @@ ifeq ($(config),debug)
   DEFINES            += -D_DEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
   INCLUDES           += -I"../../src/host/lua-5.3.0/src"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -g
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -g
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -g
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -g
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)  -Wall -Wextra -g
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L. -rdynamic
   LDDEPS             +=
   LIBS               += $(LDDEPS) -lm
   EXTERNAL_LIBS      +=
-  LINKCMD             = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  LINKCMD             = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES)  $(ALL_LDFLAGS) $(LIBS)
   OBJECTS := \
 	$(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
 	$(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \




--- 3rdparty/genie/src/host/scripts.c.orig	2023-05-22 09:40:13 UTC
+++ 3rdparty/genie/src/host/scripts.c
@@ -237,10 +237,10 @@ const char* builtin_scripts[] = {
 	"exit 0')\n_p('  COPY  = $(SILENT) copy /Y \"$(subst /,\\\\\\\\,$(1))\" \"$(subst /,\\\\\\\\,$(2))\"')\n_p('  RM    = $(SILENT) del /F \"$(subst /,\\\\\\\\,$(1))\" 2> nul || exit 0')\n_p('endif')\n_p('')\n_p('CC  = %s', cc.cc)\n_p('CXX = %s', cc.cxx)\n_p('AR  = %s', cc.ar)\n_p('')\n_p('ifndef RESCOMP')\n_p('  ifdef WINDRES')\n_p('    RESCOMP = $(WINDRES)')\n_p('  else')\n_p('    RESCOMP = %s', cc.rc or 'windres')\n_p('  endif')\n_p('endif')\n_p('')\nif (not premake.make.makefile_ignore) then\n_p('MAKEFILE = %s', _MAKE.getmakefilename(prj, true))\n_p('')\nend\nend\nlocal function is_excluded(prj, cfg, file)\nif table.icontains(prj.excludes, file) then\nreturn true\nend\nif table.icontains(cfg.excludes, file) then\nreturn true\nend\nreturn false\nend\nfunction premake.gmake_cpp_configs(prj, cc, platforms)\nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\npremake.gmake_cpp_config(prj, cfg, cc)\nend\nend\nend\nfunction premake.gmake_cpp_config(prj, cfg, cc)\n_p('ifeq ($(conf"
 	"ig),%s)', _MAKE.esc(cfg.shortname))\ncpp.platformtools(cfg, cc)\nlocal targetDir = _MAKE.esc(cfg.buildtarget.directory)\n_p('  ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") ..    'OBJDIR              = %s', _MAKE.esc(cfg.objectsdir))\n_p('  ' .. (table.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR           = %s', iif(targetDir == \"\", \".\", targetDir))\n_p('  ' .. (table.contains(premake.make.override,\"TARGET\") and \"override \" or \"\") ..    'TARGET              = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p('  DEFINES            +=%s', make.list(_MAKE.escquote(cc.getdefines(cfg.defines))))\nlocal id  = make.list(cc.getincludedirs(cfg.includedirs));\nlocal uid = make.list(cc.getquoteincludedirs(cfg.userincludedirs))\nlocal sid = make.list(cc.getsystemincludedirs(cfg.systemincludedirs))\nif id ~= \"\" then\n_p('  INCLUDES           +=%s', id)\nend\nif uid ~= \"\" then\n_p('  INCLUDES           +=%s', uid)\nend\nif sid "
 	"~= \"\" then\n_p('  INCLUDES           +=%s', sid)\nend\ncpp.pchconfig(cfg)\ncpp.flags(cfg, cc)\ncpp.linker(prj, cfg, cc)\ntable.sort(cfg.files)\nif cfg.flags.UseObjectResponseFile then\n_p('  OBJRESP             = $(OBJDIR)/%s_objects', prj.name)\nelse\n_p('  OBJRESP             =')\nend\n_p('  OBJECTS := \\\\')\nfor _, file in ipairs(cfg.files) do\nif path.issourcefile(file) then\nif not is_excluded(prj, cfg, file) then\n_p('\\t$(OBJDIR)/%s.o \\\\'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend\n_p('')\n_p('  define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands')\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('  define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('  define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-bui"
-	"ld commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p('  CC         = %s', platform.cc)\nend\nif platform.cxx then\n_p('  CXX        = %s', platform.cxx)\nend\nif platform.ar then\n_p('  AR         = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p('  FORCE_INCLUDE      += -include $(OBJDIR)/$(notdir $(PCH))')\n_p('  FORCE_INCLUDE_OBJC += -include $(OBJDIR)/$(notdir $(PCH))_objc')\nend\nif #cfg.forcedincludes > 0 then\n_p('  FORCE_INCLUDE      += -include %s'\n,_MAKE.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p('  ALL_CPPFLAGS       += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p('  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), c"
-	"fg.buildoptions, cfg.buildoptions_asm)))\n_p('  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p('  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p('  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p('  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))\n_p('  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n        make.list(table.join(cc.getdefines(cfg.resdefines),\n                                cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\nlocal libdeps\nl"
+	"ld commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p('  CC         = %s', platform.cc)\nend\nif platform.cxx then\n_p('  CXX        = %s', platform.cxx)\nend\nif platform.ar then\n_p('  AR         = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p('  FORCE_INCLUDE      += -include $(OBJDIR)/$(notdir $(PCH))')\n_p('  FORCE_INCLUDE_OBJC += -include $(OBJDIR)/$(notdir $(PCH))_objc')\nend\nif #cfg.forcedincludes > 0 then\n_p('  FORCE_INCLUDE      += -include %s'\n,_MAKE.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p('  ALL_CPPFLAGS       += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p('  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), c"
+	"fg.buildoptions, cfg.buildoptions_asm)))\n_p('  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p('  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p('  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p('  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))\n_p('  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n        make.list(table.join(cc.getdefines(cfg.resdefines),\n                                cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\nlocal libdeps\nl"
 	"ocal lddeps\nif #cfg.wholearchive > 0 then\nlibdeps = {}\nlddeps  = {}\nfor _, linkcfg in ipairs(premake.getlinks(cfg, \"siblings\", \"object\")) do\nlocal linkpath = path.rebase(linkcfg.linktarget.fullpath, linkcfg.location, cfg.location)\nif table.icontains(cfg.wholearchive, linkcfg.project.name) then\nlddeps = table.join(lddeps, cc.wholearchive(linkpath))\nelse\ntable.insert(lddeps, linkpath)\nend\ntable.insert(libdeps, linkpath)\nend\nlibdeps = make.list(_MAKE.esc(libdeps))\nlddeps  = make.list(_MAKE.esc(lddeps))\nelse\nlibdeps = make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\")))\nlddeps  = libdeps\nend\n_p('  ALL_LDFLAGS        += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p('  LIBDEPS            +=%s', libdeps)\n_p('  LDDEPS             +=%s', lddeps)\nif cfg.flags.UseLDResponseFile then\n_p('  LDRESP              = $(OBJDIR)/%s_libs', prj.name)\n_p('  LIBS               += @$(LDRESP)%s', make.list(cc.getlinkflags(cfg)))\nelse"
-	"\n_p('  LDRESP              =')\n_p('  LIBS               += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\nend\n_p('  EXTERNAL_LIBS      +=%s', make.list(cc.getlibfiles(cfg)))\n_p('  LINKOBJS            = %s', (cfg.flags.UseObjectResponseFile and \"@$(OBJRESP)\" or \"$(OBJECTS)\"))\nif cfg.kind == \"StaticLib\" then\nif (not prj.options.ArchiveSplit) then\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\nelse\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\n_p('  LINKCMD_NDX         = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, true)))\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\nlocal startgroup = ''\nlocal endgroup = ''\nif (cfg.flags.LinkSupportCircularDependencies) then\nstartgroup = '-Wl,--start-group '\nendgroup   = ' -Wl,--end-group'\nend\n_p('  LINKCMD             = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) %s$(LIBS)%s', tool, startgroup,"
+	"\n_p('  LDRESP              =')\n_p('  LIBS               += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\nend\n_p('  EXTERNAL_LIBS      +=%s', make.list(cc.getlibfiles(cfg)))\n_p('  LINKOBJS            = %s', (cfg.flags.UseObjectResponseFile and \"@$(OBJRESP)\" or \"$(OBJECTS)\"))\nif cfg.kind == \"StaticLib\" then\nif (not prj.options.ArchiveSplit) then\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\nelse\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\n_p('  LINKCMD_NDX         = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, true)))\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\nlocal startgroup = ''\nlocal endgroup = ''\nif (cfg.flags.LinkSupportCircularDependencies) then\nstartgroup = '-Wl,--start-group '\nendgroup   = ' -Wl,--end-group'\nend\n_p('  LINKCMD             = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES)  $(ALL_LDFLAGS) %s$(LIBS)%s', tool, startgroup,"
 	" endgroup)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = path.getabsolute(path.join(cfg.project.location, incdir))\nlocal testname = path.join(abspath, pch)\nif os.isfile(testname) then\npch = path.getrelative(cfg.location, testname)\nbreak\nend\nend\n_p('  PCH                 = %s', _MAKE.esc(pch))\n_p('  GCH                 = $(OBJDIR)/$(notdir $(PCH)).gch')\n_p('  GCH_OBJC            = $(OBJDIR)/$(notdir $(PCH))_objc.gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR)')\nif prj.msgprecompile then\n_p('\\t@echo ' .. prj.msgprecompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nlocal cmd = iif(prj.language == \"C\", \"$(CC) $(ALL_CFLAGS) -x c-header\", \"$(CXX) $(ALL_CXXFLAGS) -x c++-header\")\n_p('\\t$(SILENT) %s $(DEFINES) $(INCLUDES) -o \"$@\" -c \"$<\"', cmd)\n_p('')\n_p('$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)'"
 	")\nif prj.msgprecompile then\n_p('\\t@echo ' .. prj.msgprecompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nlocal cmd = iif(prj.language == \"C\", \"$(CC) $(ALL_OBJCFLAGS) -x objective-c-header\", \"$(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header\")\n_p('\\t$(SILENT) %s $(DEFINES) $(INCLUDES) -o \"$@\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj, cc)\nlocal platforms = premake.filterplatforms(prj.solution, cc.platforms, \"Native\")\n_p('ifneq (,$(OBJRESP))')\n_p('$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)')\n_p('\\t$(SILENT) echo $^')\n_p('\\t$(SILENT) echo $^ > $@')\n_p('endif')\n_p('')\n_p('ifneq (,$(LDRESP))')\n_p('$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)')\n_p('\\t$(SILENT) echo $^')\n_p('\\t$(SILENT) echo $^ > $@')\n_p('endif')\n_p('')\ntable.sort(prj.allfiles)\nfor _, file in ipairs(prj.allfiles or {}) do\nif path.issourcefile(file) then\nif (path.isobjcfile(file)) then\n_p('$(OBJDIR)/%s.o: %s $(GCH_OBJC) $(MAKEFILE) | $(OBJDIR)/%s'\n, _MAKE.esc(path.trimdots(path"
 	".removeext(file)))\n, _MAKE.esc(file)\n, _MAKE.esc(path.getdirectory(path.trimdots(file)))\n)\nelse\n_p('$(OBJDIR)/%s.o: %s $(GCH) $(MAKEFILE) | $(OBJDIR)/%s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n, _MAKE.esc(path.getdirectory(path.trimdots(file)))\n)\nend\nif (path.isobjcfile(file) and prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\nif (path.iscfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $(FORCE_INCLUDE_OBJC) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) $(FORCE_INCLUDE_OBJC) -o \"$@\" -c \"$<\"')\nend\nelseif (path.isasmfile(file)) then\n_p('\\t$(SILENT) $(CC) $(ALL_ASMFLAGS) -o \"$@\" -c \"$<\"')\nelse\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\nfor _, task in ipairs(prj.postcompiletasks or {}) do\n_p('\\t$(SILENT) %s', task)\n_p('')\nend\n_p('')\n"




--- 3rdparty/genie/src/tools/gcc.lua.orig	2023-05-25 09:19:09 UTC
+++ 3rdparty/genie/src/tools/gcc.lua
@@ -12,9 +12,9 @@ --
 -- Set default tools
 --
 
-	premake.gcc.cc     = "gcc"
-	premake.gcc.cxx    = "g++"
-	premake.gcc.ar     = "ar"
+	premake.gcc.cc     = _OPTIONS["CC"]
+	premake.gcc.cxx    = _OPTIONS["CXX"]
+	premake.gcc.ar     = _OPTIONS["AR"]
 	premake.gcc.rc     = "windres"
 	premake.gcc.llvm   = false
 




--- 3rdparty/genie/tests/test_gmake_cpp.lua.orig	2023-04-25 15:19:25 UTC
+++ 3rdparty/genie/tests/test_gmake_cpp.lua
@@ -47,9 +47,9 @@ endif
   SILENT = @
 endif
 
-CC = gcc
-CXX = g++
-AR = ar
+CC ?= gcc
+CXX ?= g++
+AR ?= ar
 
 ifndef RESCOMP
   ifdef WINDRES




--- makefile.orig	2023-04-25 15:19:25 UTC
+++ makefile
@@ -447,9 +447,9 @@ ifneq ($(TARGETOS),asmjs)
 endif
 
 ifneq ($(TARGETOS),asmjs)
-CC := $(SILENT)gcc
-LD := $(SILENT)g++
-CXX:= $(SILENT)g++
+CC ?= $(SILENT)gcc
+LD ?= $(SILENT)g++
+CXX ?= $(SILENT)g++
 endif
 
 #-------------------------------------------------
@@ -1409,6 +1409,11 @@ $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: make
 
 $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
 	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
+
+.PHONY: freebsd_arm64_clang
+freebsd_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
+	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile
+	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64
 
 .PHONY: freebsd_x64_clang
 freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile




--- scripts/genie.lua.orig	2023-05-24 01:14:32 UTC
+++ scripts/genie.lua
@@ -1238,6 +1238,11 @@ configuration { "netbsd" }
 			"LinkSupportCircularDependencies",
 		}
 
+configuration { "freebsd" }
+		flags {
+			"LinkSupportCircularDependencies",
+		}
+
 configuration { "osx*" }
 		links {
 			"pthread",

Lines 1-4 Link Here

(-)b/emulators/mame/files/patch-scripts_toolchain.lua (-2 / +2 lines)
1	--- scripts/toolchain.lua.orig 2023-05-06 02:56:32 UTC	1	--- scripts/toolchain.lua.orig 2023-05-27 02:18:45 UTC
2	+++ scripts/toolchain.lua	2	+++ scripts/toolchain.lua
3	@@ -60,7 +60,8 @@ function androidToolchainRoot()	3	@@ -60,7 +60,8 @@ function androidToolchainRoot()
4	local hostTags = {	4	local hostTags = {
Lines 6-12 Link Here
6	linux = "linux-x86_64",	6	linux = "linux-x86_64",
7	- macosx = "darwin-x86_64"	7	- macosx = "darwin-x86_64"
8	+ macosx = "darwin-x86_64",	8	+ macosx = "darwin-x86_64",
9	+ bsd = "freebsd-x86_64"	9	+ bsd = "freebsd-x86_64"
10	}	10	}
11	android.toolchainRoot = (os.getenv("ANDROID_NDK_HOME") or "") .. "/toolchains/llvm/prebuilt/" .. hostTags[os.get()]	11	android.toolchainRoot = (os.getenv("ANDROID_NDK_HOME") or "") .. "/toolchains/llvm/prebuilt/" .. hostTags[os.get()]
12	end	12	end




[
{ type: install
  message: <<EOM
An example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
This configuration can be copied to your "~/.mame" directory; alternatively,
run "mame -createconfig" to create a clean copy of "mame.ini", which can be
copied to "~/.mame", or elsewhere.
To run mame with a custom path, run "mame -inipath path-to-mame.ini"
To run %%MSUBTARGET%% with a custom path, run "%%MSUBTARGET%% -inipath path-to-%%MSUBTARGET%%.ini"
EOM
}
]




#
# CORE SEARCH PATH OPTIONS
#
homepath                  ~/.mame
rompath                   ~/.mame/roms;%%DATADIR%%/roms/
hashpath                  ~/.mame/hash;%%DATADIR%%/hash/
samplepath                ~/.mame/samples;%%DATADIR%%/samples/
artpath                   ~/.mame/artwork;%%DATADIR%%/artwork/
ctrlrpath                 ~/.mame/ctrlr;%%DATADIR%%/ctrlr/
inipath                   ~/.mame/;.;~/.%%MTARGET%%/ini;%%DATADIR%%/ini/
fontpath                  ~/.mame/font;%%DATADIR%%/font/
cheatpath                 ~/.mame/cheat;%%DATADIR%%/cheat/
crosshairpath             ~/.mame/crosshair;%%DATADIR%%/crosshair/
pluginspath               ~/.mame/plugins;%%DATADIR%%/plugins/
languagepath              ~/.mame/language;%%DATADIR%%/language/
swpath                    ~/.mame/software;%%DATADIR%%/software/

#
# CORE OUTPUT DIRECTORY OPTIONS
#
cfg_directory             ~/.mame/cfg
nvram_directory           ~/.mame/nvram
input_directory           ~/.mame/inp
state_directory           ~/.mame/state
snapshot_directory        ~/.mame/snapshot
diff_directory            ~/.mame/diff
comment_directory         ~/.mame/comments
share_directory           ~/.mame/share

#
# CORE STATE/PLAYBACK OPTIONS




bin/jedutil
bin/ldresample
bin/ldverify
bin/mame
bin/nltool
bin/nlwav
bin/pngcmp

man/man1/ldresample.1.gz
man/man1/ldverify.1.gz
man/man1/romcmp.1.gz
man/man6/mame.6.gz
%%DATADIR%%/artwork/LICENSE
%%DATADIR%%/artwork/README.md
%%DATADIR%%/artwork/aperture-grille.png

%%DATADIR%%/plugins/data/data_gameinit.lua
%%DATADIR%%/plugins/data/data_hiscore.lua
%%DATADIR%%/plugins/data/data_history.lua
%%DATADIR%%/plugins/data/data_mameinfo.lua
%%DATADIR%%/plugins/data/data_marp.lua
%%DATADIR%%/plugins/data/data_messinfo.lua
%%DATADIR%%/plugins/data/data_story.lua

Return to bug 271374

Added Link Here

(-)b/emulators/mame/files/patch-3rdparty_genie_build_gmake.freebsd_genie.make (+63 lines)
1	--- 3rdparty/genie/build/gmake.freebsd/genie.make.orig 2023-05-26 04:14:50 UTC
2	+++ 3rdparty/genie/build/gmake.freebsd/genie.make
3	@@ -28,9 +28,9 @@ endif
4	RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul \|\| exit 0
5	endif
6
7	-CC = gcc
8	-CXX = g++
9	-AR = ar
10	+CC ?= gcc
11	+CXX ?= g++
12	+AR ?= ar
13
14	ifndef RESCOMP
15	ifdef WINDRES
16	@@ -49,17 +49,17 @@ ifeq ($(config),release)
17	DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
18	INCLUDES += -I"../../src/host/lua-5.3.0/src"
19	ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
20	- ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
21	- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
22	- ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
23	- ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
24	- ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
25	+ ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -Os $(MPARAM)
26	+ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -Os $(MPARAM)
27	+ ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -Os $(MPARAM)
28	+ ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -Os $(MPARAM)
29	+ ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -Os $(MPARAM)
30	ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
31	ALL_LDFLAGS += $(LDFLAGS) -L. -s -rdynamic
32	LDDEPS +=
33	LIBS += $(LDDEPS) -lm
34	EXTERNAL_LIBS +=
35	- LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
36	+ LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
37	OBJECTS := \
38	$(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
39	$(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \
40	@@ -132,17 +132,17 @@ ifeq ($(config),debug)
41	DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
42	INCLUDES += -I"../../src/host/lua-5.3.0/src"
43	ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
44	- ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
45	- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
46	- ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
47	- ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
48	- ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
49	+ ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -g
50	+ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -g
51	+ ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -g
52	+ ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -g
53	+ ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -g
54	ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
55	ALL_LDFLAGS += $(LDFLAGS) -L. -rdynamic
56	LDDEPS +=
57	LIBS += $(LDDEPS) -lm
58	EXTERNAL_LIBS +=
59	- LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
60	+ LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
61	OBJECTS := \
62	$(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
63	$(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \

Added Link Here

(-)b/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c (+16 lines)
1	--- 3rdparty/genie/src/host/scripts.c.orig 2023-05-22 09:40:13 UTC
2	+++ 3rdparty/genie/src/host/scripts.c
3	@@ -237,10 +237,10 @@ const char* builtin_scripts[] = {
4	"exit 0')\n_p(' COPY = $(SILENT) copy /Y \"$(subst /,\\\\\\\\,$(1))\" \"$(subst /,\\\\\\\\,$(2))\"')\n_p(' RM = $(SILENT) del /F \"$(subst /,\\\\\\\\,$(1))\" 2> nul \|\| exit 0')\n_p('endif')\n_p('')\n_p('CC = %s', cc.cc)\n_p('CXX = %s', cc.cxx)\n_p('AR = %s', cc.ar)\n_p('')\n_p('ifndef RESCOMP')\n_p(' ifdef WINDRES')\n_p(' RESCOMP = $(WINDRES)')\n_p(' else')\n_p(' RESCOMP = %s', cc.rc or 'windres')\n_p(' endif')\n_p('endif')\n_p('')\nif (not premake.make.makefile_ignore) then\n_p('MAKEFILE = %s', _MAKE.getmakefilename(prj, true))\n_p('')\nend\nend\nlocal function is_excluded(prj, cfg, file)\nif table.icontains(prj.excludes, file) then\nreturn true\nend\nif table.icontains(cfg.excludes, file) then\nreturn true\nend\nreturn false\nend\nfunction premake.gmake_cpp_configs(prj, cc, platforms)\nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\npremake.gmake_cpp_config(prj, cfg, cc)\nend\nend\nend\nfunction premake.gmake_cpp_config(prj, cfg, cc)\n_p('ifeq ($(conf"
5	"ig),%s)', _MAKE.esc(cfg.shortname))\ncpp.platformtools(cfg, cc)\nlocal targetDir = _MAKE.esc(cfg.buildtarget.directory)\n_p(' ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") .. 'OBJDIR = %s', _MAKE.esc(cfg.objectsdir))\n_p(' ' .. (table.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR = %s', iif(targetDir == \"\", \".\", targetDir))\n_p(' ' .. (table.contains(premake.make.override,\"TARGET\") and \"override \" or \"\") .. 'TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p(' DEFINES +=%s', make.list(_MAKE.escquote(cc.getdefines(cfg.defines))))\nlocal id = make.list(cc.getincludedirs(cfg.includedirs));\nlocal uid = make.list(cc.getquoteincludedirs(cfg.userincludedirs))\nlocal sid = make.list(cc.getsystemincludedirs(cfg.systemincludedirs))\nif id ~= \"\" then\n_p(' INCLUDES +=%s', id)\nend\nif uid ~= \"\" then\n_p(' INCLUDES +=%s', uid)\nend\nif sid "
6	"~= \"\" then\n_p(' INCLUDES +=%s', sid)\nend\ncpp.pchconfig(cfg)\ncpp.flags(cfg, cc)\ncpp.linker(prj, cfg, cc)\ntable.sort(cfg.files)\nif cfg.flags.UseObjectResponseFile then\n_p(' OBJRESP = $(OBJDIR)/%s_objects', prj.name)\nelse\n_p(' OBJRESP =')\nend\n_p(' OBJECTS := \\\\')\nfor _, file in ipairs(cfg.files) do\nif path.issourcefile(file) then\nif not is_excluded(prj, cfg, file) then\n_p('\\t$(OBJDIR)/%s.o \\\\'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend\n_p('')\n_p(' define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands')\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-bui"
7	- "ld commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p(' FORCE_INCLUDE += -include $(OBJDIR)/$(notdir $(PCH))')\n_p(' FORCE_INCLUDE_OBJC += -include $(OBJDIR)/$(notdir $(PCH))_objc')\nend\nif #cfg.forcedincludes > 0 then\n_p(' FORCE_INCLUDE += -include %s'\n,_MAKE.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p(' ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), c"
8	- "fg.buildoptions, cfg.buildoptions_asm)))\n_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p(' ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p(' ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\n cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\nlocal libdeps\nl"
9	+ "ld commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p(' FORCE_INCLUDE += -include $(OBJDIR)/$(notdir $(PCH))')\n_p(' FORCE_INCLUDE_OBJC += -include $(OBJDIR)/$(notdir $(PCH))_objc')\nend\nif #cfg.forcedincludes > 0 then\n_p(' FORCE_INCLUDE += -include %s'\n,_MAKE.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p(' ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), c"
10	+ "fg.buildoptions, cfg.buildoptions_asm)))\n_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p(' ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p(' ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) %s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\n cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\nlocal libdeps\nl"
11	"ocal lddeps\nif #cfg.wholearchive > 0 then\nlibdeps = {}\nlddeps = {}\nfor _, linkcfg in ipairs(premake.getlinks(cfg, \"siblings\", \"object\")) do\nlocal linkpath = path.rebase(linkcfg.linktarget.fullpath, linkcfg.location, cfg.location)\nif table.icontains(cfg.wholearchive, linkcfg.project.name) then\nlddeps = table.join(lddeps, cc.wholearchive(linkpath))\nelse\ntable.insert(lddeps, linkpath)\nend\ntable.insert(libdeps, linkpath)\nend\nlibdeps = make.list(_MAKE.esc(libdeps))\nlddeps = make.list(_MAKE.esc(lddeps))\nelse\nlibdeps = make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\")))\nlddeps = libdeps\nend\n_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p(' LIBDEPS +=%s', libdeps)\n_p(' LDDEPS +=%s', lddeps)\nif cfg.flags.UseLDResponseFile then\n_p(' LDRESP = $(OBJDIR)/%s_libs', prj.name)\n_p(' LIBS += @$(LDRESP)%s', make.list(cc.getlinkflags(cfg)))\nelse"
12	- "\n_p(' LDRESP =')\n_p(' LIBS += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\nend\n_p(' EXTERNAL_LIBS +=%s', make.list(cc.getlibfiles(cfg)))\n_p(' LINKOBJS = %s', (cfg.flags.UseObjectResponseFile and \"@$(OBJRESP)\" or \"$(OBJECTS)\"))\nif cfg.kind == \"StaticLib\" then\nif (not prj.options.ArchiveSplit) then\n_p(' LINKCMD = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\nelse\n_p(' LINKCMD = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\n_p(' LINKCMD_NDX = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, true)))\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\nlocal startgroup = ''\nlocal endgroup = ''\nif (cfg.flags.LinkSupportCircularDependencies) then\nstartgroup = '-Wl,--start-group '\nendgroup = ' -Wl,--end-group'\nend\n_p(' LINKCMD = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) %s$(LIBS)%s', tool, startgroup,"
13	+ "\n_p(' LDRESP =')\n_p(' LIBS += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\nend\n_p(' EXTERNAL_LIBS +=%s', make.list(cc.getlibfiles(cfg)))\n_p(' LINKOBJS = %s', (cfg.flags.UseObjectResponseFile and \"@$(OBJRESP)\" or \"$(OBJECTS)\"))\nif cfg.kind == \"StaticLib\" then\nif (not prj.options.ArchiveSplit) then\n_p(' LINKCMD = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\nelse\n_p(' LINKCMD = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\n_p(' LINKCMD_NDX = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, true)))\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\nlocal startgroup = ''\nlocal endgroup = ''\nif (cfg.flags.LinkSupportCircularDependencies) then\nstartgroup = '-Wl,--start-group '\nendgroup = ' -Wl,--end-group'\nend\n_p(' LINKCMD = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ALL_LDFLAGS) %s$(LIBS)%s', tool, startgroup,"
14	" endgroup)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = path.getabsolute(path.join(cfg.project.location, incdir))\nlocal testname = path.join(abspath, pch)\nif os.isfile(testname) then\npch = path.getrelative(cfg.location, testname)\nbreak\nend\nend\n_p(' PCH = %s', _MAKE.esc(pch))\n_p(' GCH = $(OBJDIR)/$(notdir $(PCH)).gch')\n_p(' GCH_OBJC = $(OBJDIR)/$(notdir $(PCH))_objc.gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH) $(MAKEFILE) \| $(OBJDIR)')\nif prj.msgprecompile then\n_p('\\t@echo ' .. prj.msgprecompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nlocal cmd = iif(prj.language == \"C\", \"$(CC) $(ALL_CFLAGS) -x c-header\", \"$(CXX) $(ALL_CXXFLAGS) -x c++-header\")\n_p('\\t$(SILENT) %s $(DEFINES) $(INCLUDES) -o \"$@\" -c \"$<\"', cmd)\n_p('')\n_p('$(GCH_OBJC): $(PCH) $(MAKEFILE) \| $(OBJDIR)'"
15	")\nif prj.msgprecompile then\n_p('\\t@echo ' .. prj.msgprecompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nlocal cmd = iif(prj.language == \"C\", \"$(CC) $(ALL_OBJCFLAGS) -x objective-c-header\", \"$(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header\")\n_p('\\t$(SILENT) %s $(DEFINES) $(INCLUDES) -o \"$@\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj, cc)\nlocal platforms = premake.filterplatforms(prj.solution, cc.platforms, \"Native\")\n_p('ifneq (,$(OBJRESP))')\n_p('$(OBJRESP): $(OBJECTS) \| $(TARGETDIR) $(OBJDIRS)')\n_p('\\t$(SILENT) echo $^')\n_p('\\t$(SILENT) echo $^ > $@')\n_p('endif')\n_p('')\n_p('ifneq (,$(LDRESP))')\n_p('$(LDRESP): $(LDDEPS) \| $(TARGETDIR) $(OBJDIRS)')\n_p('\\t$(SILENT) echo $^')\n_p('\\t$(SILENT) echo $^ > $@')\n_p('endif')\n_p('')\ntable.sort(prj.allfiles)\nfor _, file in ipairs(prj.allfiles or {}) do\nif path.issourcefile(file) then\nif (path.isobjcfile(file)) then\n_p('$(OBJDIR)/%s.o: %s $(GCH_OBJC) $(MAKEFILE) \| $(OBJDIR)/%s'\n, _MAKE.esc(path.trimdots(path"
16	".removeext(file)))\n, _MAKE.esc(file)\n, _MAKE.esc(path.getdirectory(path.trimdots(file)))\n)\nelse\n_p('$(OBJDIR)/%s.o: %s $(GCH) $(MAKEFILE) \| $(OBJDIR)/%s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n, _MAKE.esc(path.getdirectory(path.trimdots(file)))\n)\nend\nif (path.isobjcfile(file) and prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\nif (path.iscfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $(FORCE_INCLUDE_OBJC) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) $(FORCE_INCLUDE_OBJC) -o \"$@\" -c \"$<\"')\nend\nelseif (path.isasmfile(file)) then\n_p('\\t$(SILENT) $(CC) $(ALL_ASMFLAGS) -o \"$@\" -c \"$<\"')\nelse\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\nfor _, task in ipairs(prj.postcompiletasks or {}) do\n_p('\\t$(SILENT) %s', task)\n_p('')\nend\n_p('')\n"

Added Link Here

(-)b/emulators/mame/files/patch-3rdparty_genie_src_tools_gcc.lua (+15 lines)
1	--- 3rdparty/genie/src/tools/gcc.lua.orig 2023-05-25 09:19:09 UTC
2	+++ 3rdparty/genie/src/tools/gcc.lua
3	@@ -12,9 +12,9 @@ --
4	-- Set default tools
5	--
6
7	- premake.gcc.cc = "gcc"
8	- premake.gcc.cxx = "g++"
9	- premake.gcc.ar = "ar"
10	+ premake.gcc.cc = _OPTIONS["CC"]
11	+ premake.gcc.cxx = _OPTIONS["CXX"]
12	+ premake.gcc.ar = _OPTIONS["AR"]
13	premake.gcc.rc = "windres"
14	premake.gcc.llvm = false
15

Added Link Here

(-)b/emulators/mame/files/patch-3rdparty_genie_tests_test__gmake__cpp.lua (+15 lines)
1	--- 3rdparty/genie/tests/test_gmake_cpp.lua.orig 2023-04-25 15:19:25 UTC
2	+++ 3rdparty/genie/tests/test_gmake_cpp.lua
3	@@ -47,9 +47,9 @@ endif
4	SILENT = @
5	endif
6
7	-CC = gcc
8	-CXX = g++
9	-AR = ar
10	+CC ?= gcc
11	+CXX ?= g++
12	+AR ?= ar
13
14	ifndef RESCOMP
15	ifdef WINDRES

Lines 1-14 Link Here

(-)b/emulators/mame/files/patch-makefile (-8 / +21 lines)
1	--- makefile.orig 2023-05-17 11:43:34 UTC	1	--- makefile.orig 2023-04-25 15:19:25 UTC
2	+++ makefile	2	+++ makefile
3	@@ -1425,6 +1425,11 @@ $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: make	3	@@ -447,9 +447,9 @@ ifneq ($(TARGETOS),asmjs)
		4	endif
4		5
5	.PHONY: freebsd_x64_clang	6	ifneq ($(TARGETOS),asmjs)
6	freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile	7	-CC := $(SILENT)gcc
7	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile	8	-LD := $(SILENT)g++
8	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64	9	-CXX:= $(SILENT)g++
		10	+CC ?= $(SILENT)gcc
		11	+LD ?= $(SILENT)g++
		12	+CXX ?= $(SILENT)g++
		13	endif
		14
		15	#-------------------------------------------------
		16	@@ -1409,6 +1409,11 @@ $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: make
		17
		18	$(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
		19	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
9	+	20	+
10	+.PHONY: freebsd_arm64_clang	21	+.PHONY: freebsd_arm64_clang
11	+freebsd_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile	22	+freebsd_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
12	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile	23	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile
13	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64	24	+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64
14		25
		26	.PHONY: freebsd_x64_clang
		27	freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile

Added Link Here

(-)b/emulators/mame/files/patch-scripts_genie.lua (+14 lines)
1	--- scripts/genie.lua.orig 2023-05-24 01:14:32 UTC
2	+++ scripts/genie.lua
3	@@ -1238,6 +1238,11 @@ configuration { "netbsd" }
4	"LinkSupportCircularDependencies",
5	}
6
7	+configuration { "freebsd" }
8	+ flags {
9	+ "LinkSupportCircularDependencies",
10	+ }
11	+
12	configuration { "osx*" }
13	links {
14	"pthread",

Lines 1-12 Link Here

(-)b/emulators/mame/files/pkg-message.in (-6 / +5 lines)
1	[	1	[
2	{ type: install	2	{ type: install
3	message: <<EOM	3	message: <<EOM
4	An example configuration file has been installed in	4	An example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
5	"%%EXAMPLESDIR%%/%%MSUBTARGET%%.ini" This configuration can be copied to your	5	This configuration can be copied to your "~/.mame" directory; alternatively,
6	"~/.%%MSUBTARGET%%" directory; alternatively, run "%%MSUBTARGET%% -createconfig" to	6	run "mame -createconfig" to create a clean copy of "mame.ini", which can be
7	create a clean copy of "%%MSUBTARGET%%.ini", which can be copied to	7	copied to "~/.mame", or elsewhere.
8	"~/.%%MSUBTARGET%%", or elsewhere.	8	To run mame with a custom path, run "mame -inipath path-to-mame.ini"
9	To run %%MSUBTARGET%% with a custom path, run "%%MSUBTARGET%% -inipath path-to-%%MSUBTARGET%%.ini"
10	EOM	9	EOM
11	}	10	}
12	]	11	]

Lines 7-37 writeconfig 0 Link Here

(-)b/emulators/mame/files/target.ini.in (-21 / +21 lines)
7	#	7	#
8	# CORE SEARCH PATH OPTIONS	8	# CORE SEARCH PATH OPTIONS
9	#	9	#
10	homepath ~/.%%MTARGET%%	10	homepath ~/.mame
11	rompath ~/.%%MTARGET%%/roms;%%DATADIR%%/roms/	11	rompath ~/.mame/roms;%%DATADIR%%/roms/
12	hashpath ~/.%%MTARGET%%/hash;%%DATADIR%%/hash/	12	hashpath ~/.mame/hash;%%DATADIR%%/hash/
13	samplepath ~/.%%MTARGET%%/samples;%%DATADIR%%/samples/	13	samplepath ~/.mame/samples;%%DATADIR%%/samples/
14	artpath ~/.%%MTARGET%%/artwork;%%DATADIR%%/artwork/	14	artpath ~/.mame/artwork;%%DATADIR%%/artwork/
15	ctrlrpath ~/.%%MTARGET%%/ctrlr;%%DATADIR%%/ctrlr/	15	ctrlrpath ~/.mame/ctrlr;%%DATADIR%%/ctrlr/
16	inipath ~/.%%MTARGET%%/;.;~/.%%MTARGET%%/ini;%%DATADIR%%/ini/	16	inipath ~/.mame/;.;~/.%%MTARGET%%/ini;%%DATADIR%%/ini/
17	fontpath ~/.%%MTARGET%%/font;%%DATADIR%%/font/	17	fontpath ~/.mame/font;%%DATADIR%%/font/
18	cheatpath ~/.%%MTARGET%%/cheat;%%DATADIR%%/cheat/	18	cheatpath ~/.mame/cheat;%%DATADIR%%/cheat/
19	crosshairpath ~/.%%MTARGET%%/crosshair;%%DATADIR%%/crosshair/	19	crosshairpath ~/.mame/crosshair;%%DATADIR%%/crosshair/
20	pluginspath ~/.%%MTARGET%%/plugins;%%DATADIR%%/plugins/	20	pluginspath ~/.mame/plugins;%%DATADIR%%/plugins/
21	languagepath ~/.%%MTARGET%%/language;%%DATADIR%%/language/	21	languagepath ~/.mame/language;%%DATADIR%%/language/
22	swpath ~/.%%MTARGET%%/software;%%DATADIR%%/software/	22	swpath ~/.mame/software;%%DATADIR%%/software/
23		23
24	#	24	#
25	# CORE OUTPUT DIRECTORY OPTIONS	25	# CORE OUTPUT DIRECTORY OPTIONS
26	#	26	#
27	cfg_directory ~/.%%MTARGET%%/cfg	27	cfg_directory ~/.mame/cfg
28	nvram_directory ~/.%%MTARGET%%/nvram	28	nvram_directory ~/.mame/nvram
29	input_directory ~/.%%MTARGET%%/inp	29	input_directory ~/.mame/inp
30	state_directory ~/.%%MTARGET%%/state	30	state_directory ~/.mame/state
31	snapshot_directory ~/.%%MTARGET%%/snapshot	31	snapshot_directory ~/.mame/snapshot
32	diff_directory ~/.%%MTARGET%%/diff	32	diff_directory ~/.mame/diff
33	comment_directory ~/.%%MTARGET%%/comments	33	comment_directory ~/.mame/comments
34	share_directory ~/.%%MTARGET%%/share	34	share_directory ~/.mame/share
35		35
36	#	36	#
37	# CORE STATE/PLAYBACK OPTIONS	37	# CORE STATE/PLAYBACK OPTIONS

Lines 5-11 bin/imgtool Link Here

(-)b/emulators/mame/pkg-plist (-3 / +3 lines)
5	bin/jedutil	5	bin/jedutil
6	bin/ldresample	6	bin/ldresample
7	bin/ldverify	7	bin/ldverify
8	bin/%%EMULATOR%%	8	bin/mame
9	bin/nltool	9	bin/nltool
10	bin/nlwav	10	bin/nlwav
11	bin/pngcmp	11	bin/pngcmp
Lines 25-31 man/man1/ldplayer.1.gz Link Here
25	man/man1/ldresample.1.gz	25	man/man1/ldresample.1.gz
26	man/man1/ldverify.1.gz	26	man/man1/ldverify.1.gz
27	man/man1/romcmp.1.gz	27	man/man1/romcmp.1.gz
28	man/man6/%%EMULATOR%%.6.gz	28	man/man6/mame.6.gz
29	%%DATADIR%%/artwork/LICENSE	29	%%DATADIR%%/artwork/LICENSE
30	%%DATADIR%%/artwork/README.md	30	%%DATADIR%%/artwork/README.md
31	%%DATADIR%%/artwork/aperture-grille.png	31	%%DATADIR%%/artwork/aperture-grille.png
Lines 2204-2210 man/man6/%%EMULATOR%%.6.gz Link Here
2204	%%DATADIR%%/plugins/data/data_gameinit.lua	2204	%%DATADIR%%/plugins/data/data_gameinit.lua
2205	%%DATADIR%%/plugins/data/data_hiscore.lua	2205	%%DATADIR%%/plugins/data/data_hiscore.lua
2206	%%DATADIR%%/plugins/data/data_history.lua	2206	%%DATADIR%%/plugins/data/data_history.lua
2207	%%DATADIR%%/plugins/data/data_%%EMULATOR%%info.lua	2207	%%DATADIR%%/plugins/data/data_mameinfo.lua
2208	%%DATADIR%%/plugins/data/data_marp.lua	2208	%%DATADIR%%/plugins/data/data_marp.lua
2209	%%DATADIR%%/plugins/data/data_messinfo.lua	2209	%%DATADIR%%/plugins/data/data_messinfo.lua
2210	%%DATADIR%%/plugins/data/data_story.lua	2210	%%DATADIR%%/plugins/data/data_story.lua