From nobody Sat Jul 23 20:49:42 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 4Lqz2G5057z4WSSF; Sat, 23 Jul 2022 20:49:42 +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 4Lqz2G4RkQz3Xt1; Sat, 23 Jul 2022 20:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658609382; 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=pihLvTVoWAhyuCCsGZzZIY7aJSuriiDnDak46tQUaEU=; b=jFdm9VIwNXWLiJ27f0Y1mMOkBUJSK68fH3pCF+DZDHetHdtp0bfPR1X5OisbM3aD61xLBs CLuziGh4c2wVAzwgsUToiw+Fd51G2LpfksbtpQqIRZrrpX+/Kd5pIMHSA49YjP8zDMuEB1 Inni4P2EHuuOqInNXCtzuOLvQK1pX4v6boMrmNuyKbYQVAJCdGTcIM2EG48J+mUb3EYLxL FOhFRfm+ED1Uf5wehJ8IMvtNehVrbfGQlFimoUK8qtBznly04uPfNTbXPidgkNd56bfV03 x86+QuAHWWpr9eKOG+6F1J8zZJTa9pj9//6pl/aTfJJ7gebXhAZN4SIaM+dGuQ== 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 4Lqz2G3T6JzskJ; Sat, 23 Jul 2022 20:49:42 +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 26NKng8H074253; Sat, 23 Jul 2022 20:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26NKnggB074252; Sat, 23 Jul 2022 20:49:42 GMT (envelope-from git) Date: Sat, 23 Jul 2022 20:49:42 GMT Message-Id: <202207232049.26NKnggB074252@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: a87b17148e63 - main - emulators/dosbox-x: Update to 0.84.1 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: a87b17148e63e359c426eab9e67d954bc090bfe5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658609382; 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=pihLvTVoWAhyuCCsGZzZIY7aJSuriiDnDak46tQUaEU=; b=VvFvRybd2kvO5n27jj3YCel2M3ps9kSP/WNyW310oa0uJf3nEr9PyehtjdT396r7TK9ErH EN/nkW3NrA25KkPcsQiEK5DOvq8zT/prHWZk/5pJubT4RxT4Put4i6nKmjko7CRH5xk9V0 wDqLZLLP/SLum4eeug7lXGCW8jfFWOOIiMWgqDtvegTtx7LGY0nKjKh9RqEUW/IXXrFd+M gnuFcVb3DsmIebKS/CNQUASVx2JuGNvD0f5DbOSO9msc62UtMQuB5gLZpYLOS0ZgOMEk8P ufXPQJIwuPTgrhUbujapYmnDQhifIw+BQCN12I0iEhBl6/4JsYLaKEQkG9/n3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658609382; a=rsa-sha256; cv=none; b=uqTFXUc9NBMHbo76UE6jMPcZB0VZTZjhYhxlH2PmwHLUuehByXSEuEAD/P5PMO77zDKfRZ xk1s5NM+EHYmW76YGtSg3FoklTXn04Hkg5HmYefZPonQ9DH2L24BTCjOgs/cI546NYMdK0 rbwi3MuYY23Sx068GR3EBcjfszCgoLCZXwQQB58jdyUundNIbdjfbuPucBZTHTK4btX3T3 JSubdi5FVb0treFvUp1qB2MnmupjtsqQmxtagylkAWBhlU0mYHOV7HbHnSrA1rolikAXC3 h51p7RFwOC0rbG1QunptFKKfULIbsEnhq6dzo6kJnMzU1v0hmBD6+zJiaERs/A== 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=a87b17148e63e359c426eab9e67d954bc090bfe5 commit a87b17148e63e359c426eab9e67d954bc090bfe5 Author: Neel Chauhan AuthorDate: 2022-07-23 20:49:29 +0000 Commit: Neel Chauhan CommitDate: 2022-07-23 20:49:29 +0000 emulators/dosbox-x: Update to 0.84.1 --- emulators/dosbox-x/Makefile | 2 +- emulators/dosbox-x/distinfo | 6 ++-- ....h => patch-src_cpu_core__dyn__x86_risc__x86.h} | 6 ++-- .../dosbox-x/files/patch-src_gui_sdl__gui.cpp | 38 ++++++++++------------ .../files/patch-src_output_output__surface.cpp | 12 +++++++ emulators/dosbox-x/pkg-plist | 23 ++++++++----- 6 files changed, 51 insertions(+), 36 deletions(-) diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index f72bc7ee6f77..e91328bd2b16 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -1,6 +1,6 @@ PORTNAME= dosbox-x DISTVERSIONPREFIX= ${PORTNAME}-v -DISTVERSION= 0.84.0 +DISTVERSION= 0.84.1 CATEGORIES= emulators MAINTAINER= nc@FreeBSD.org diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo index a7ef853f7ab5..12c5ae8e5236 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654118426 -SHA256 (joncampbell123-dosbox-x-dosbox-x-v0.84.0_GH0.tar.gz) = 564fbf8f0ab090c8b32bc38637c8204358c386b9cbffcb4f99a81bc82fddbad7 -SIZE (joncampbell123-dosbox-x-dosbox-x-v0.84.0_GH0.tar.gz) = 65495321 +TIMESTAMP = 1658608171 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v0.84.1_GH0.tar.gz) = d5ba5b3d87b0dc69d70f6c9701eec36772bbc3716e0b201b74ec73d4b3ff38cc +SIZE (joncampbell123-dosbox-x-dosbox-x-v0.84.1_GH0.tar.gz) = 67617800 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 similarity index 61% rename from emulators/dosbox-x/files/patch-src_cpu_core_dyn_x86_risc_x86.h rename to emulators/dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h index 2d0948efeb73..97e89e49f431 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/cpu/core_dyn_x86/risc_x86.h.orig 2022-07-01 13:24:06 UTC ++++ src/cpu/core_dyn_x86/risc_x86.h +@@ -137,7 +137,7 @@ return_address: "run_return_adress: \n" "popl %%ebp \n" :"=a" (retval), "=c" (tempflags) diff --git a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp index 75caa4925894..9c5d8ba5efca 100644 --- a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp +++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp @@ -1,33 +1,31 @@ ---- src/gui/sdl_gui.cpp.orig 2022-05-01 06:25:42 UTC +--- src/gui/sdl_gui.cpp.orig 2022-07-23 20:37:25 UTC +++ src/gui/sdl_gui.cpp -@@ -3059,7 +3059,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()); -@@ -3475,7 +3475,11 @@ void GUI_Shortcut(int select) { - PIC_AddEvent(RunCfgTool, 100); +@@ -3563,6 +3563,7 @@ void GUI_Shortcut(int select) { + shortcutid=select; + shortcut=true; + sel = select; ++#ifndef __FreeBSD__ + #if defined(USE_TTF) + if (ttf.inUse && !confres) { + ttf_switch_off(); +@@ -3572,12 +3573,14 @@ void GUI_Shortcut(int select) { } else #endif -+#ifdef __FreeBSD__ -+ RunCfgTool(0); -+#else RunCfgTool(NULL); +#endif } void GUI_Run(bool pressed) { -@@ -3490,5 +3494,9 @@ void GUI_Run(bool pressed) { - PIC_AddEvent(RunCfgTool, 100); + if (pressed || running) return; + + sel = -1; ++#ifndef __FreeBSD__ + #if defined(USE_TTF) + if (ttf.inUse) { + ttf_switch_off(); +@@ -3587,4 +3590,5 @@ void GUI_Run(bool pressed) { } else #endif -+#ifdef __FreeBSD__ -+ RunCfgTool(0); -+#else RunCfgTool(NULL); +#endif } diff --git a/emulators/dosbox-x/files/patch-src_output_output__surface.cpp b/emulators/dosbox-x/files/patch-src_output_output__surface.cpp new file mode 100644 index 000000000000..a6b183a465ed --- /dev/null +++ b/emulators/dosbox-x/files/patch-src_output_output__surface.cpp @@ -0,0 +1,12 @@ +--- src/output/output_surface.cpp.orig 2022-07-23 20:42:49 UTC ++++ src/output/output_surface.cpp +@@ -24,7 +24,9 @@ void OUTPUT_SURFACE_Initialize() + // blitting the wrong dimensions to the window and trigger an X11 BadValue error. + // Set up an error handler that prints the error to STDERR and then returns, + // instead of the default handler which prints an error and exit()s this program. ++#ifndef __FreeBSD__ + X11_ErrorHandlerInstall(); ++#endif + #endif + } + diff --git a/emulators/dosbox-x/pkg-plist b/emulators/dosbox-x/pkg-plist index 2573a48e524a..79e1cdff4fea 100644 --- a/emulators/dosbox-x/pkg-plist +++ b/emulators/dosbox-x/pkg-plist @@ -4,8 +4,11 @@ share/applications/com.dosbox_x.DOSBox-X.desktop share/bash-completion/completions/dosbox-x %%DATADIR%%/CHANGELOG %%DATADIR%%/FREECG98.BMP +%%DATADIR%%/Nouveau_IBM.ttf +%%DATADIR%%/SarasaGothicFixed.ttf %%DATADIR%%/dosbox-x.reference.conf %%DATADIR%%/dosbox-x.reference.full.conf +%%DATADIR%%/drivez/readme.txt %%DATADIR%%/glshaders/ScanLine.glsl %%DATADIR%%/glshaders/advinterp2x.glsl %%DATADIR%%/glshaders/advinterp3x.glsl @@ -45,14 +48,16 @@ share/bash-completion/completions/dosbox-x %%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/ko_KR.lng -%%DATADIR%%/translations/pt_BR.lng -%%DATADIR%%/translations/tr_TR.lng -%%DATADIR%%/translations/zh_CN.lng -%%DATADIR%%/translations/zh_TW.lng +%%DATADIR%%/languages/en_US.lng +%%DATADIR%%/languages/es_ES.lng +%%DATADIR%%/languages/fr_FR.lng +%%DATADIR%%/languages/ja_JP.lng +%%DATADIR%%/languages/ko_KR.lng +%%DATADIR%%/languages/pt_BR.lng +%%DATADIR%%/languages/tr_TR.lng +%%DATADIR%%/languages/zh_CN.lng +%%DATADIR%%/languages/zh_TW.lng +%%DATADIR%%/wqy_11pt.bdf +%%DATADIR%%/wqy_12pt.bdf share/icons/hicolor/scalable/apps/dosbox-x.svg share/metainfo/com.dosbox_x.DOSBox-X.metainfo.xml