From nobody Fri Jan 20 21:40:27 2023 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 4NzCbJ0pVZz313rk; Fri, 20 Jan 2023 21:40:28 +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 4NzCbJ0Glmz3kB9; Fri, 20 Jan 2023 21:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674250828; 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=KdKd0c3M3YFxW7Jk50pZW1PdpoEBGaiPI+Ra4HUSwW8=; b=MX5Ble04lwKN4VyrpUp+41moLRvZ2ulu2nyVMnMKPDxq3oUg7rCFTYfk+HzJ5N+qr2UX4I wDHUVZGHoWH2s1KUAEZsfox7foo+lsqUF+DQse5bWGPJQLcTdD/QQg/UP4Wm8Tp/idcF2V NfEqiHDCHN324AR/9X9kMsVIUkcV78E1gbiy9I4lbcPju9zAN+Z1mtfPIPZN/23f/QQS25 m2jAkOMGiq7FcjOaQm5ZaKfPHiP+5pM01AHn4hrb5/8scaLUW/RPCmrzR7tuMgYgOEfKA0 BcDJxffO4/04ZNGUJfv/p7KZ/CkvWcqvDHAiSl4zqKVs58IXH5Vf41nR9Ne8vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674250828; 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=KdKd0c3M3YFxW7Jk50pZW1PdpoEBGaiPI+Ra4HUSwW8=; b=oM/8Kdshm+H5j1Ra3hzE2YfJd8X7NlOcW/M9gl4I4yt3VnvpkwVQ3d10veYbgVUGE0K3M8 XXbySqLGzYwDIkP9Yaa/juuuie6OWtuCP0You+jgD9E1H9rSybz9qS3E6vpCJWzXwVqziS 3c9M95QlefQyloPhTWcPbXv88fGy7vvuTAE74hNgvcx7X+n7bLLpHeDVJjDDAS/pEyGg9n Wbp8m7ZtfCD9bihBcm75CeGoCU9ucSSiKfAiEtJdC7XihPE9axOTthjkw4/SxFBEelxYv7 Djb3Jp3pEikd4ZpfdI5erEHHNUYUZBmO2bYNFm/yzIvJBSuNY1zaMflr+cEqiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674250828; a=rsa-sha256; cv=none; b=UXP6KTKv/FTIOvva4cVuFJ4OFiO8V7Lz1pRBGNMBDKcgxs3NbZ4ESRfh1bLxLQHErZ4jMZ oVt3+6bpaphJUd3TgueS1MXhd5j2wzKqC41nMooJBaUNSC8aAMrrlumJuyVeMDGI0AgXjV rPjfLihmoVs9ZxTvAl8KUAKhlEuX5Ri4/mcs1hW0B+2e/4afu4RbPRpOcvpBjfVvaYPztE 6GmmLRJj4E3FIaRhRMPj1pfTzmxh/P1pL1X+Snycgz4ftkHaiGacpTFODhHr0Wl4PvYFEW R1hKWGPE2eP9wa2ShBUMXJZA68KAIhjYU8PdrZbv99BScyidN/Ysuws085cbww== 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 4NzCbH6TjQzlj5; Fri, 20 Jan 2023 21:40:27 +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 30KLeRfI010355; Fri, 20 Jan 2023 21:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KLeR5F010354; Fri, 20 Jan 2023 21:40:27 GMT (envelope-from git) Date: Fri, 20 Jan 2023 21:40:27 GMT Message-Id: <202301202140.30KLeR5F010354@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: e8d684240659 - main - emulators/dosbox-x: Update to 2022.12.26 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: e8d684240659f6bf19a36cb42cb79afbb340259c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8d684240659f6bf19a36cb42cb79afbb340259c commit e8d684240659f6bf19a36cb42cb79afbb340259c Author: Neel Chauhan AuthorDate: 2023-01-20 21:39:08 +0000 Commit: Neel Chauhan CommitDate: 2023-01-20 21:39:08 +0000 emulators/dosbox-x: Update to 2022.12.26 --- emulators/dosbox-x/Makefile | 2 +- emulators/dosbox-x/distinfo | 6 +++--- .../dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h | 11 ----------- emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp | 12 ++++++------ emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp | 11 +++++++++++ .../dosbox-x/files/patch-src_output_output__surface.cpp | 12 ------------ emulators/dosbox-x/pkg-plist | 2 ++ 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index 979788ab23c9..e336a010f067 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -1,6 +1,6 @@ PORTNAME= dosbox-x DISTVERSIONPREFIX= ${PORTNAME}-v -DISTVERSION= 0.84.1 +DISTVERSION= 2022.12.26 CATEGORIES= emulators MAINTAINER= nc@FreeBSD.org diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo index 12c5ae8e5236..d3dd9aac5cfa 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1674249678 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v2022.12.26_GH0.tar.gz) = 39fb1ed19ea31e11883aa57655493b3100ac6b328ef59c799b840b9bfdfacb7b +SIZE (joncampbell123-dosbox-x-dosbox-x-v2022.12.26_GH0.tar.gz) = 67886370 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 deleted file mode 100644 index 97e89e49f431..000000000000 --- a/emulators/dosbox-x/files/patch-src_cpu_core__dyn__x86_risc__x86.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) -- :"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 index 9c5d8ba5efca..37f14d2e82da 100644 --- a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp +++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp @@ -1,6 +1,6 @@ ---- src/gui/sdl_gui.cpp.orig 2022-07-23 20:37:25 UTC +--- src/gui/sdl_gui.cpp.orig 2022-12-27 02:28:50 UTC +++ src/gui/sdl_gui.cpp -@@ -3563,6 +3563,7 @@ void GUI_Shortcut(int select) { +@@ -3646,6 +3646,7 @@ void GUI_Shortcut(int select) { shortcutid=select; shortcut=true; sel = select; @@ -8,10 +8,10 @@ #if defined(USE_TTF) if (ttf.inUse && !confres) { ttf_switch_off(); -@@ -3572,12 +3573,14 @@ void GUI_Shortcut(int select) { +@@ -3655,12 +3656,14 @@ void GUI_Shortcut(int select) { } else #endif - RunCfgTool(NULL); + RunCfgTool(0); +#endif } @@ -23,9 +23,9 @@ #if defined(USE_TTF) if (ttf.inUse) { ttf_switch_off(); -@@ -3587,4 +3590,5 @@ void GUI_Run(bool pressed) { +@@ -3670,4 +3673,5 @@ void GUI_Run(bool pressed) { } else #endif - RunCfgTool(NULL); + RunCfgTool(0); +#endif } diff --git a/emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp b/emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp new file mode 100644 index 000000000000..fca740b9fb78 --- /dev/null +++ b/emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp @@ -0,0 +1,11 @@ +--- src/gui/sdlmain.cpp.orig 2023-01-20 21:33:36 UTC ++++ src/gui/sdlmain.cpp +@@ -221,7 +221,7 @@ typedef enum PROCESS_DPI_AWARENESS { + extern "C" void sdl1_hax_macosx_highdpi_set_enable(const bool enable); + #endif + +-#if !defined(C_SDL2) && !defined(RISCOS) ++#if !defined(C_SDL2) && !defined(RISCOS) && !defined(__FreeBSD__) + # include "SDL_version.h" + # ifndef SDL_DOSBOX_X_SPECIAL + # warning It is STRONGLY RECOMMENDED to compile the DOSBox-X code using the SDL 1.x library provided in this source repository. diff --git a/emulators/dosbox-x/files/patch-src_output_output__surface.cpp b/emulators/dosbox-x/files/patch-src_output_output__surface.cpp deleted file mode 100644 index a6b183a465ed..000000000000 --- a/emulators/dosbox-x/files/patch-src_output_output__surface.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 79e1cdff4fea..4be9a9fd2f23 100644 --- a/emulators/dosbox-x/pkg-plist +++ b/emulators/dosbox-x/pkg-plist @@ -48,11 +48,13 @@ share/bash-completion/completions/dosbox-x %%DATADIR%%/glshaders/yee64.glsl %%DATADIR%%/glshaders/yeetron.glsl %%DATADIR%%/glshaders/zfast_crt.glsl +%%DATADIR%%/languages/de_DE.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/nl_NL.lng %%DATADIR%%/languages/pt_BR.lng %%DATADIR%%/languages/tr_TR.lng %%DATADIR%%/languages/zh_CN.lng