Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Aug 2024 13:55:11 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 465c31f9b51d - main - emulators/86Box: add support for aarch64 and improvements to configuration file
Message-ID:  <202408121355.47CDtB5o041936@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd:

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

commit 465c31f9b51d509db686cd8dffca54b498839a04
Author:     gatekeeper <tiago.gasiba@gmail.com>
AuthorDate: 2024-08-12 13:49:40 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-12 13:50:52 +0000

    emulators/86Box: add support for aarch64 and improvements to configuration file
    
    * Add support for aarch64
    * Set the configuration to ~/.config/86Box.cfg when running from desktop shortcut
    * Make this behavior explicit in pkg-message
    
    PR:     280764
---
 emulators/86Box/Makefile    | 9 ++++++---
 emulators/86Box/pkg-message | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/emulators/86Box/Makefile b/emulators/86Box/Makefile
index 8e5d63b186bd..6113d4afc5b5 100644
--- a/emulators/86Box/Makefile
+++ b/emulators/86Box/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	86Box
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 
 MAINTAINER=	tiago.gasiba@gmail.com
@@ -11,7 +11,7 @@ WWW=		https://86box.net/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	evdev-proto>=5.8:devel/evdev-proto
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
@@ -48,6 +48,9 @@ CMAKE_ON=	USE_QT6
 CXXFLAGS+=	-I${LOCALBASE}/include/qt6/QtGui/`pkg-config --modversion Qt6Gui`/QtGui
 .endif
 
+CMAKE_ON+=		${CMAKE_ON_${ARCH}}
+CMAKE_ON_aarch64=	NEW_DYNAREC
+
 SUB_FILES=	86Box-install-roms.sh
 SUB_LIST=	DISTVERSION=${DISTVERSION} \
 		DISTVERSIONPREFIX=${DISTVERSIONPREFIX}
@@ -68,7 +71,7 @@ ICON_RESOLUTIONS=	128x128 192x192 256x256 48x48 512x512 64x64 72x72 96x96
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/src/86Box ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/86Box-install-roms.sh ${STAGEDIR}${PREFIX}/bin
-	${REINPLACE_CMD} -e 's|Exec=86Box|Exec=/bin/sh -c "${PREFIX}/bin/86Box -C $${HOME}/86box.cfg"|' \
+	${REINPLACE_CMD} -e 's|Exec=86Box|Exec=/bin/sh -c "${PREFIX}/bin/86Box -C $${HOME}/.config/86Box.cfg"|' \
 		${WRKSRC}/src/unix/assets/net.86box.86Box.desktop
 	${INSTALL_DATA} ${WRKSRC}/src/unix/assets/net.86box.86Box.desktop \
 		${STAGEDIR}${DESKTOPDIR}
diff --git a/emulators/86Box/pkg-message b/emulators/86Box/pkg-message
index 3d817927cd34..eba3050826d6 100644
--- a/emulators/86Box/pkg-message
+++ b/emulators/86Box/pkg-message
@@ -1,9 +1,12 @@
 [
 { type: install
   message: <<EOM
-86Box requires you to manually install ROMS to be able to run.
-To do this, you can type in the following command:
-    86Box-install-roms.sh -i
+(1) 86Box requires you to manually install ROMS to be able to run.
+    To do this, you can type in the following command:
+        86Box-install-roms.sh -i
+
+(2) Running 86Box through the desktop shortcut uses the configuration
+    which is placed in the folder ~/.config/86Box.cfg
 EOM
 }
 ]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408121355.47CDtB5o041936>