From nobody Thu Apr 21 18:52:34 2022 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 523551990DD3; Thu, 21 Apr 2022 18:52:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kkmr21qG3z4vYc; Thu, 21 Apr 2022 18:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650567154; 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=pASQditrfwgDHM+cLOxpms4VtJLrOIBlbgXewktpqAc=; b=HFTQDB3VdN1qL8QNCBzCbAUgIC+xMTKJ7Lpz1hIlQqHR5EOQgvNglrq/X3B4OuWAfuVL02 wvVeZ6ItGssfIEYpU4mbsZRteElmmFluFQsx/mv0hZI02J9sOEBBUaTLWDjOztWqEIVDJ2 1CqgHa3k3pGcOLekvRuqvJYCpu0e+ibJv+kfhERmwcHK2ioUmB5kVOHHPyf7qZIKJXB/vm ls+6e4yZB7gDBXAODpHLR4Ain/xgl+Z23X3inlOk503Q4KsdNnX7VhcJ/NoFxFw6m7cdWO AjLfRFIWWBsd/C5vrHBD5jsBszfJZMSoDqZPgLU6UV4ekzDazClF9iLbIF0njQ== 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 1F058617E; Thu, 21 Apr 2022 18:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23LIqYsL021709; Thu, 21 Apr 2022 18:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LIqYkm021708; Thu, 21 Apr 2022 18:52:34 GMT (envelope-from git) Date: Thu, 21 Apr 2022 18:52:34 GMT Message-Id: <202204211852.23LIqYkm021708@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: eefcfdabff91 - main - emulators/dosbox-x: New port 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eefcfdabff91435353e0fb63cc554405b4ca9c4f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650567154; 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=pASQditrfwgDHM+cLOxpms4VtJLrOIBlbgXewktpqAc=; b=t7UYZlWkm0tdpvEZ/fbPvVjyiQhIR7/MqYIv9Y47EfDU1ykE5oGx6fz1FOia4WDDd40RAF dFVG1WVLfJrx3xQDrfCeMgNkVDeieEFU4rB6JuTF++bJvqsFvq6fHpjjhnOQR5JhD4Mmkr 1sjXcXlr+Q+gj8mufEJf6UMY4kVyGIWVMLGNn6tVXTwsBpAqKTYzrTIaj5m1D2mhyLmxn8 KMSJAuuBND5mmiPhN8lvm327uMGWNZo+andP8t4JME0CHWWNxYido6phEA8tKDE27Cjlux l6um6aDIq7SsXZMYA2jr/oeSL1uP/5c45RODO9BaIriZLpepJsgoqafiHCXNyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650567154; a=rsa-sha256; cv=none; b=PIDy3XAvTZUsplP009/dlWhWLSx63eRN8Ihon/7/tFeELYOQmdBnteHLtQfsHrPzykkAwk SO2CAhwmnWDci+6DzIni1yZk3GzH/vA6jL0j9GGkknDCxYK1NEyRhEBslhjhXQ1wkTlusU 6jBaJ+Z484i4nddzCftHUkRLtaCTFrFZB9t3A9/852NWKO088OqO6VzfDKmFq7G5+WvFZ9 6wE2fbssiwnUFHx42XJffjbrp1hOEsxvMGm59XIHbupDS74WNrJGf+znnbcGVfhoZC7anT WXbUito166922AiW59MqfsmA/+LUqSoT0HrO0GQgaUf+yyKQlFQY0Y+C3EcZFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=eefcfdabff91435353e0fb63cc554405b4ca9c4f commit eefcfdabff91435353e0fb63cc554405b4ca9c4f Author: Neel Chauhan AuthorDate: 2022-04-21 18:52:30 +0000 Commit: Neel Chauhan CommitDate: 2022-04-21 18:52:30 +0000 emulators/dosbox-x: New port --- emulators/Makefile | 1 + emulators/dosbox-x/Makefile | 30 ++++++++++++ emulators/dosbox-x/distinfo | 3 ++ emulators/dosbox-x/files/patch-include_setup.h | 11 +++++ .../files/patch-src_cpu_core_dyn_x86_risc_x86.h | 11 +++++ .../dosbox-x/files/patch-src_gui_sdl__gui.cpp | 27 ++++++++++ emulators/dosbox-x/pkg-descr | 3 ++ emulators/dosbox-x/pkg-plist | 57 ++++++++++++++++++++++ 8 files changed, 143 insertions(+) diff --git a/emulators/Makefile b/emulators/Makefile index a23b925c5ad7..afe53c0fa4fa 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -23,6 +23,7 @@ SUBDIR += dolphin-emu SUBDIR += dosbox SUBDIR += dosbox-staging + SUBDIR += dosbox-x SUBDIR += dps8m SUBDIR += dynamips-community SUBDIR += edumips64 diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile new file mode 100644 index 000000000000..194082c2def2 --- /dev/null +++ b/emulators/dosbox-x/Makefile @@ -0,0 +1,30 @@ +PORTNAME= dosbox-x +DISTVERSIONPREFIX= ${PORTNAME}-v +DISTVERSION= 0.83.24 +CATEGORIES= emulators + +MAINTAINER= nc@FreeBSD.org +COMMENT= DOSBox fork + +LICENSE= GPLv2 + +LIB_DEPENDS= libpng.so:graphics/png + +USES= autoreconf cpe iconv sdl +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-core-inline +USE_SDL= net sdl sound + +USE_GITHUB= yes +GH_ACCOUNT= joncampbell123 + +OPTIONS_DEFINE= DOCS +OPTIONS_RADIO= DEBUGGER +OPTIONS_RADIO_DEBUGGER= DEBUGGER_ENABLE DEBUGGER_HEAVY +DEBUGGER_ENABLE_DESC= Enable internal debugger +DEBUGGER_HEAVY_DESC= Enable internal debugger with extra features + +DEBUGGER_ENABLE_CONFIGURE_ON= --enable-debug=yes +DEBUGGER_HEAVY_CONFIGURE_ON= --enable-debug=heavy + +.include diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo new file mode 100644 index 000000000000..ecbf74730c2a --- /dev/null +++ b/emulators/dosbox-x/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1650563722 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v0.83.24_GH0.tar.gz) = f4746f1524cac58756123c7acbbc565e215d7f298a19667fd845dbba040c6021 +SIZE (joncampbell123-dosbox-x-dosbox-x-v0.83.24_GH0.tar.gz) = 64650623 diff --git a/emulators/dosbox-x/files/patch-include_setup.h b/emulators/dosbox-x/files/patch-include_setup.h new file mode 100644 index 000000000000..ca81c0e0316a --- /dev/null +++ b/emulators/dosbox-x/files/patch-include_setup.h @@ -0,0 +1,11 @@ +--- include/setup.h.orig 2022-04-01 04:26:03 UTC ++++ include/setup.h +@@ -20,6 +20,8 @@ + #ifndef DOSBOX_SETUP_H + #define DOSBOX_SETUP_H + ++#include ++ + #ifdef _MSC_VER + //#pragma warning ( disable : 4786 ) + //#pragma warning ( disable : 4290 ) diff --git a/emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h b/emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h new file mode 100644 index 000000000000..2d0948efeb73 --- /dev/null +++ b/emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h @@ -0,0 +1,11 @@ +--- src/cpu/core_dyn_x86/risc_x86.h.orig 2014-12-31 12:59:53.015190887 +0000 ++++ src/cpu/core_dyn_x86/risc_x86.h 2014-12-31 13:00:30.953180886 +0000 +@@ -138,7 +138,7 @@ + "run_return_adress: \n" + "popl %%ebp \n" + :"=a" (retval), "=c" (tempflags) +- :"r" (tempflags),"r" (code) ++ :"a" (tempflags),"r" (code) + :"%edx","%ebx","%edi","%esi","cc","memory" + ); + reg_flags=(reg_flags & ~FMASK_TEST) | (tempflags & FMASK_TEST); diff --git a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp new file mode 100644 index 000000000000..e677a977b1a3 --- /dev/null +++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp @@ -0,0 +1,27 @@ +--- src/gui/sdl_gui.cpp.orig 2022-04-21 18:01:44 UTC ++++ src/gui/sdl_gui.cpp +@@ -3022,7 +3022,7 @@ class ConfigurationWindow : public GUI::ToplevelWindow + std::string url = "https://dosbox-x.com/"; + #if defined(WIN32) + ShellExecute(NULL, "open", url.c_str(), NULL, NULL, SW_SHOWNORMAL); +-#elif defined(LINUX) ++#elif defined(LINUX) || defined(__FreeBSD__) + system(("xdg-open "+url).c_str()); + #elif defined(MACOSX) + system(("open "+url).c_str()); +@@ -3436,7 +3436,7 @@ void GUI_Shortcut(int select) { + PIC_AddEvent(RunCfgTool, 100); + } else + #endif +- RunCfgTool(NULL); ++ RunCfgTool(0); + } + + void GUI_Run(bool pressed) { +@@ -3458,5 +3458,5 @@ void GUI_Run(bool pressed) { + PIC_AddEvent(RunCfgTool, 100); + } else + #endif +- RunCfgTool(NULL); ++ RunCfgTool(0); + } diff --git a/emulators/dosbox-x/pkg-descr b/emulators/dosbox-x/pkg-descr new file mode 100644 index 000000000000..0e6aeae8eaea --- /dev/null +++ b/emulators/dosbox-x/pkg-descr @@ -0,0 +1,3 @@ +DOSBox-X is a cross-platform DOS emulator based on the DOSBox project. + +WWW: https://dosbox-x.com/ diff --git a/emulators/dosbox-x/pkg-plist b/emulators/dosbox-x/pkg-plist new file mode 100644 index 000000000000..0f5fe5d22ffb --- /dev/null +++ b/emulators/dosbox-x/pkg-plist @@ -0,0 +1,57 @@ +bin/dosbox-x +man/man1/dosbox-x.1.gz +share/applications/com.dosbox_x.DOSBox-X.desktop +share/bash-completion/completions/dosbox-x +%%DATADIR%%/CHANGELOG +%%DATADIR%%/FREECG98.BMP +%%DATADIR%%/dosbox-x.reference.conf +%%DATADIR%%/dosbox-x.reference.full.conf +%%DATADIR%%/glshaders/ScanLine.glsl +%%DATADIR%%/glshaders/advinterp2x.glsl +%%DATADIR%%/glshaders/advinterp3x.glsl +%%DATADIR%%/glshaders/advmame2x.glsl +%%DATADIR%%/glshaders/advmame3x.glsl +%%DATADIR%%/glshaders/crt-aperture.glsl +%%DATADIR%%/glshaders/crt-caligari.glsl +%%DATADIR%%/glshaders/crt-easymode.glsl +%%DATADIR%%/glshaders/crt-easymode.tweaked.glsl +%%DATADIR%%/glshaders/crt-geom.glsl +%%DATADIR%%/glshaders/crt-geom.tweaked.glsl +%%DATADIR%%/glshaders/crt-hyllian.glsl +%%DATADIR%%/glshaders/crt-lottes-fast.glsl +%%DATADIR%%/glshaders/crt-lottes-fast.subtle+gain.glsl +%%DATADIR%%/glshaders/crt-lottes.glsl +%%DATADIR%%/glshaders/crt-lottes.tweaked.glsl +%%DATADIR%%/glshaders/crt-nes-mini.glsl +%%DATADIR%%/glshaders/crt-pi.glsl +%%DATADIR%%/glshaders/default.glsl +%%DATADIR%%/glshaders/fakelottes.glsl +%%DATADIR%%/glshaders/fakelottes.tweaked.glsl +%%DATADIR%%/glshaders/none.glsl +%%DATADIR%%/glshaders/pixel_perfect-scanlines.glsl +%%DATADIR%%/glshaders/pixel_perfect.glsl +%%DATADIR%%/glshaders/pixellate.glsl +%%DATADIR%%/glshaders/rgb2x.glsl +%%DATADIR%%/glshaders/rgb3x.glsl +%%DATADIR%%/glshaders/scan2x.glsl +%%DATADIR%%/glshaders/scan3x.glsl +%%DATADIR%%/glshaders/sharp.glsl +%%DATADIR%%/glshaders/tv2x.glsl +%%DATADIR%%/glshaders/tv3x.glsl +%%DATADIR%%/glshaders/xbr-lv2-3d.glsl +%%DATADIR%%/glshaders/xbr-lv2-noblend.glsl +%%DATADIR%%/glshaders/xbr-lv2.glsl +%%DATADIR%%/glshaders/xbr-lv3.glsl +%%DATADIR%%/glshaders/yee64.glsl +%%DATADIR%%/glshaders/yeetron.glsl +%%DATADIR%%/glshaders/zfast_crt.glsl +%%DATADIR%%/translations/en_US.lng +%%DATADIR%%/translations/es_ES.lng +%%DATADIR%%/translations/fr_FR.lng +%%DATADIR%%/translations/ja_JP.lng +%%DATADIR%%/translations/pt_BR.lng +%%DATADIR%%/translations/tr_TR.lng +%%DATADIR%%/translations/zh_CN.lng +%%DATADIR%%/translations/zh_TW.lng +share/icons/hicolor/scalable/apps/dosbox-x.svg +share/metainfo/com.dosbox_x.DOSBox-X.metainfo.xml