From nobody Wed Aug 07 00:15:54 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WdrLM08Bdz5SCrB; Wed, 07 Aug 2024 00:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WdrLL6MHlz4sQ8; Wed, 7 Aug 2024 00:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722989754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00PHk0X3ptXgebmHEd8F7uSmNvov7Lr9vgTbnDJYsgs=; b=F6SVK/VaId4YuSUplCHROloxFjlZyffw+MvYX0bIttZGez+05R01ztUz0hFgdur2IXsNv5 HYJIrgY3fjFT6wW4GCE9e1yS3yQoAfgBO+fYY0hancjq+1Q3mXpZ+n1MaGflVH4of+Y7BH vHYKwJNbB+DsmQpN3EytDlokaV+w5uUf5OncnyR7gM/576kXi00RTpAFPkjgQVKB9uwR+F thRnmrTHZipGFGP2Cvm5ukni5Yp/hWHC7DaCijVuYlI1+2jJV8Lo71eUTLw/3ywpfblPhL d/1ONWRtjKFPSFq/PVP95tr+ndvoo/FIX3RZXgP/nFc438wYJeTJjotocWD02A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722989754; a=rsa-sha256; cv=none; b=NcEAkJ8D8zBTCXIu3+IrheKcbMU14BvJ0DUxhv5vUdyg28pLJ7FyqjV06RMx0lGkHvIUM1 N4ucS+l2Tc1ZoGQ8o0uVdMZY4lW/kuqIUCAgBNgFMTuqsJHnb8b4+BeqjbOMZHC7YUAXH2 hBSeklBKnCFzcq8/A1dt+RKvaMcjgBRKD4yx2qw1+PZpOOc46rjb68lPTn9qVthrsbCp2T 63c/5rQp88AKsPR9R/uEdZNpvjuCfv5jXnvkdya+A2rZOhIuNuGO7uk9yIwRq4u1w1J1Ny m2h3YffAuTOb9QtuB3MY/acG9HfK5caT3APq5qXkxXFhejANglMn+d/hMIe+1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722989754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00PHk0X3ptXgebmHEd8F7uSmNvov7Lr9vgTbnDJYsgs=; b=L3bWMnRqJKWFMKV1aWI1X+0zu+hob5FS8jL+JpJTpTz8pWK8OOckdH+B73KYtBtXSKnCxL XVH+spqG1u/WsQqnoYZJvN7DimsJXMMtSZD8Tsocd3e7qCiS2ETKZWYQqLE8MfnSWtltWz hq334sGIolH7lscNb4xcjhz21chjKwKb+IofVMDmwjelvaTOTK0EErh3OOQjgTTGjcUgel z0SaIO2LgfR/hJWbTesS6qEaIG3DcFJcf1n8YACBS0HnfgwkDf9XkV74xb5KWn48ekBMRw eMlOTdw1qmzvV1FzE5s8HxSYDw4D0utkrykXHr6Qs4joB8sgcgprkSlvRW3j7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WdrLL5s2YzSDc; Wed, 7 Aug 2024 00:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4770FsL2056304; Wed, 7 Aug 2024 00:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4770FsDd056301; Wed, 7 Aug 2024 00:15:54 GMT (envelope-from git) Date: Wed, 7 Aug 2024 00:15:54 GMT Message-Id: <202408070015.4770FsDd056301@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: d2c76bc40a75 - main - emulators/86Box: add helper script to allow user to easily download ROMs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2c76bc40a757fd78ebd31b13616f916e6dfc012 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2c76bc40a757fd78ebd31b13616f916e6dfc012 commit d2c76bc40a757fd78ebd31b13616f916e6dfc012 Author: gatekeeper AuthorDate: 2024-08-07 00:12:33 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-07 00:12:33 +0000 emulators/86Box: add helper script to allow user to easily download ROMs To run 86Box, users need to install the necessary ROMs. This commit provides a helper script called 86Box-install-roms.sh that automates this process. PR: 280664 --- emulators/86Box/Makefile | 9 +++- emulators/86Box/files/86Box-install-roms.sh.in | 69 ++++++++++++++++++++++++++ emulators/86Box/pkg-message | 9 ++++ emulators/86Box/pkg-plist | 1 + 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/emulators/86Box/Makefile b/emulators/86Box/Makefile index 9e15cd3f7f9e..8e5d63b186bd 100644 --- a/emulators/86Box/Makefile +++ b/emulators/86Box/Makefile @@ -1,6 +1,7 @@ PORTNAME= 86Box DISTVERSIONPREFIX= v DISTVERSION= 4.2 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= tiago.gasiba@gmail.com @@ -36,7 +37,8 @@ USE_XORG= x11 xcb xext xi .if ${FLAVOR} == qt5 USES+= qt:5 -USE_QT= core gui network opengl widgets buildtools:build linguisttools:build +USE_QT= core gui network opengl widgets buildtools:build \ + linguisttools:build .else BUILD_DEPENDS+= vulkan-headers>0:graphics/vulkan-headers USES+= gl qt:6 @@ -46,6 +48,10 @@ CMAKE_ON= USE_QT6 CXXFLAGS+= -I${LOCALBASE}/include/qt6/QtGui/`pkg-config --modversion Qt6Gui`/QtGui .endif +SUB_FILES= 86Box-install-roms.sh +SUB_LIST= DISTVERSION=${DISTVERSION} \ + DISTVERSIONPREFIX=${DISTVERSIONPREFIX} + OPTIONS_DEFINE= NLS WAYLAND OPTIONS_DEFAULT= WAYLAND @@ -61,6 +67,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"|' \ ${WRKSRC}/src/unix/assets/net.86box.86Box.desktop ${INSTALL_DATA} ${WRKSRC}/src/unix/assets/net.86box.86Box.desktop \ diff --git a/emulators/86Box/files/86Box-install-roms.sh.in b/emulators/86Box/files/86Box-install-roms.sh.in new file mode 100644 index 000000000000..0c0cf18f342b --- /dev/null +++ b/emulators/86Box/files/86Box-install-roms.sh.in @@ -0,0 +1,69 @@ +#!/bin/sh + +URL="https://github.com/86Box/roms/archive/refs/tags/%%DISTVERSIONPREFIX%%%%DISTVERSION%%.zip" +DEFAULT_TARGET_DIR="$HOME/.local/share/86Box/" +TARGET_DIR=${TARGET_DIR:-$DEFAULT_TARGET_DIR} + +install_roms() { + if [ -d "$TARGET_DIR" ] && [ "$(ls -A $TARGET_DIR)" ]; then + echo "ROMs already installed in $TARGET_DIR" + echo "To (re)install, please first remove ROMs with -r parameter" + exit 1 + fi + + TMP_DIR=$(mktemp -d) + TMP_FILE="$TMP_DIR/86Box-ROMs.zip" + echo "Fetching ROMs..." + fetch -qo "$TMP_FILE" "$URL" + + if [ $? -ne 0 ]; then + echo "Failed to download the file from $URL" + exit 1 + fi + + echo "Extracting ROMs..." + mkdir -p "$TARGET_DIR" + unzip -q "$TMP_FILE" -d "$TARGET_DIR" + + if [ $? -ne 0 ]; then + echo "Failed to decompress the file" + rm "$TMP_FILE" + exit 1 + fi + + mv "$TARGET_DIR/roms-"* "$TARGET_DIR/roms" + rm -rf "$TMP_DIR" + echo "ROMs installed successfully in $TARGET_DIR" +} + +remove_roms() { + if [ -d "$TARGET_DIR/roms" ]; then + rm -rf "$TARGET_DIR/roms" + echo "ROMs removed successfully from $TARGET_DIR" + else + echo "No ROMs directory found in $TARGET_DIR" + fi +} + +help() { + echo "" + echo "$0 [-h|-i|-r]" + echo " -h : this help" + echo " -i : install ROMs (this parameter can be omitted)" + echo " -r : remove the ROMs" + echo "" +} + +case "$1" in + -h) + help + ;; + -r) + remove_roms + ;; + -i|*) + install_roms + ;; +esac + +exit 0 diff --git a/emulators/86Box/pkg-message b/emulators/86Box/pkg-message new file mode 100644 index 000000000000..3d817927cd34 --- /dev/null +++ b/emulators/86Box/pkg-message @@ -0,0 +1,9 @@ +[ +{ type: install + message: <