From nobody Fri Dec 06 08:25:46 2024 X-Original-To: dev-commits-ports-all@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 4Y4PTk4Lvnz5frTP; Fri, 06 Dec 2024 08:25:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4PTk3vNqz4bVH; Fri, 6 Dec 2024 08:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733473546; 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=OFL5EPIc8hrIWDL901fkXMjxJwkzUPGukKv9tNCDu8A=; b=j1aWOMWYAP4AvCT/0wN2EniO3fR4J4hRRoe2howpraYeCJJP4RY4DJl5u1L1ZCdoCDlS9v R24OrU74zep1kwSGm2IUSYD/DnK2xLZU2p+prr5Hgw4Pxmc5fW6MTby5nokg5y+Obmf6oF 094leIrBSbCHRtHtj9Uuv/PuVFaN/jvjGLmTimVx8j2bnzgszS6vAgHQmSNbRCzWkPw898 9aNVBC5T1RfnxwMfoLR7y4Ba548qjJyYBpqjTQDh+Xi5LWmY+NE2WIaZ4JKunVbFwhXKs/ q9NxuF8djeVFnsJFhMpD4w1i9DmaApfG0jnYhzHKSExPYIAqTc40YkieQMpL+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733473546; 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=OFL5EPIc8hrIWDL901fkXMjxJwkzUPGukKv9tNCDu8A=; b=bFxg8rJdTgchbRojcG5zpliHb31FlryvVtW4AO0+Hx97p2hK8EaIuogWm62B8sBOxfoc1B g8GwKfGA7FBa2yWGen7xYTuY/rs7HunTcWCSavzU48VapEjqoskHy34l74OwMy4UbBzfzS SRW8U7hT0wKHeeR+78MMV0FSYFrM6N3GWmGmfcF+KJsTN0P35fbrWYeAL4+LUuldCICmWg qM3a4kAgLpBBEEAQB2/9J2kp9hucp7xu86ZjBd/xAzj8Fsq5s0ae9x4TboupkbTo+elwR+ aZE5xe4zsU6ams//wFAxXsPynY/l6cjwCNB93uFg+t8U0XVodXNT/AO53w6rEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733473546; a=rsa-sha256; cv=none; b=NkwjInQzx+KIYe8NXJ8fzvIuwbgJJhbmWwln+06qrmxk88sYc7zTDym2z8d84kyn9mjCRZ 9MxkhEzTjyrbP1oTAoerjgnU3LTLAfrtqDfdAtf3mCXiPrYtLOylEAjM2b+Oc7B2kZCLkJ elNLclZyd5fbKxKb7rm6FEaJpWxToxjdvGdXyc2GTXDvP3YNgX4GgB6qcXNmHokAYrVDu7 kcpd3UcKVykrLMe8l8/Gg1rgSsqXqpBTPJfribLqIxrML3Ws3uxYnL665pgmAtSYi+tO3F eE1EpsJxzLZpv88Y8pm4oe1xlA0MMjgfOo7UYbcRux6jQnYg5ZQv+7ERveTS9g== 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 4Y4PTk3VTzzW1G; Fri, 6 Dec 2024 08:25:46 +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 4B68PkOe007080; Fri, 6 Dec 2024 08:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B68PkKV007077; Fri, 6 Dec 2024 08:25:46 GMT (envelope-from git) Date: Fri, 6 Dec 2024 08:25:46 GMT Message-Id: <202412060825.4B68PkKV007077@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 3d58b32aa5c8 - main - emulators/dosbox-x: Update to 2024.12.04 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d58b32aa5c8f09eefac0e3b97b53ef686e8fbdb Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d58b32aa5c8f09eefac0e3b97b53ef686e8fbdb commit 3d58b32aa5c8f09eefac0e3b97b53ef686e8fbdb Author: Nuno Teixeira AuthorDate: 2024-12-05 20:25:18 +0000 Commit: Nuno Teixeira CommitDate: 2024-12-06 08:25:19 +0000 emulators/dosbox-x: Update to 2024.12.04 ChangeLog: https://github.com/joncampbell123/dosbox-x/releases/tag/dosbox-x-v2024.12.04 --- emulators/dosbox-x/Makefile | 2 +- emulators/dosbox-x/distinfo | 6 ++-- .../dosbox-x/files/patch-src_dos_dos__programs.cpp | 24 --------------- .../dosbox-x/files/patch-src_dos_drive__iso.cpp | 34 ---------------------- 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index 0a184128401b..d8e682dd472f 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -1,6 +1,6 @@ PORTNAME= dosbox-x DISTVERSIONPREFIX= ${PORTNAME}-v -DISTVERSION= 2024.10.01 +DISTVERSION= 2024.12.04 CATEGORIES= emulators MAINTAINER= eduardo@FreeBSD.org diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo index 31ced073fe30..7ac2289f2033 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727854016 -SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 9940662759b9910e3c4549216be8db0278ceaaa80ace5b19f87b04d0b6ff8a3a -SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 121316697 +TIMESTAMP = 1733389595 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.12.04_GH0.tar.gz) = f2bca4c2c8da69085c0eabfb60886b67e3ad55b21974d4e1c3c79a2d3756add3 +SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.12.04_GH0.tar.gz) = 121318659 diff --git a/emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp b/emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp deleted file mode 100644 index 07b492f03787..000000000000 --- a/emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with clang 19 -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282386 - ---- src/dos/dos_programs.cpp.orig 2024-10-02 06:16:36 UTC -+++ src/dos/dos_programs.cpp -@@ -81,7 +81,7 @@ host_cnv_char_t *CodePageGuestToHost(const char *s); - #endif - #ifdef C_ICONV - #include "iconvpp.hpp" --typedef uint16_t test_char_t; -+typedef char16_t test_char_t; - typedef std::basic_string test_string; - typedef std::basic_string test_char; - #endif -@@ -102,6 +102,9 @@ bool CodePageHostToGuestUTF8(char *d/*CROSS_LEN*/,cons - bool qmount = false; - bool nowarn = false; - bool CodePageHostToGuestUTF8(char *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/), CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/); -+inline bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const char16_t *s/*CROSS_LEN*/) { -+ return CodePageHostToGuestUTF16(d, reinterpret_cast(s)); -+} - extern bool systemmessagebox(char const * aTitle, char const * aMessage, char const * aDialogType, char const * aIconType, int aDefaultButton); - extern bool addovl, addipx, addne2k, prepared, inshell, usecon, uao, loadlang, morelen, mountfro[26], mountiro[26], resetcolor, staycolors, printfont, notrycp, internal_program; - extern bool clear_screen(), OpenGL_using(void), DOS_SetAnsiAttr(uint8_t attr), isDBCSCP(); diff --git a/emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp b/emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp deleted file mode 100644 index 80cb9fb5a9f3..000000000000 --- a/emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp +++ /dev/null @@ -1,34 +0,0 @@ -Fix build with clang 19 -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282386 - ---- src/dos/drive_iso.cpp.orig 2024-10-02 06:16:36 UTC -+++ src/dos/drive_iso.cpp -@@ -40,6 +40,10 @@ extern bool CodePageHostToGuestUTF16(char *d/*CROSS_LE - extern bool gbk, isDBCSCP(), isKanji1_gbk(uint8_t chr), shiftjis_lead_byte(int c); - extern bool filename_not_8x3(const char *n), filename_not_strict_8x3(const char *n); - extern bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/); -+inline bool CodePageHostToGuestUTF16(uint8_t *d/*CROSS_LEN*/,const uint8_t *s/*CROSS_LEN*/) { -+ std::u16string u16s(reinterpret_cast(s)); -+ return CodePageHostToGuestUTF16(reinterpret_cast(d), reinterpret_cast(u16s.c_str())); -+} - - using namespace std; - -@@ -1762,7 +1766,7 @@ int isoDrive::readDirEntry(isoDirEntry* de, const uint - // The string is big Endian UCS-16, convert to host Endian UCS-16 - for (size_t i=0;((const uint16_t*)de->ident)[i] != 0;i++) ((uint16_t*)de->ident)[i] = be16toh(((uint16_t*)de->ident)[i]); - // finally, convert from UCS-16 to local code page, using C++ string construction to make a copy first -- CodePageHostToGuestUTF16((char*)de->ident,std::basic_string((const uint16_t*)de->ident).c_str()); -+ CodePageHostToGuestUTF16(de->ident, de->ident); - } - } - } else { -@@ -1784,7 +1788,7 @@ int isoDrive::readDirEntry(isoDirEntry* de, const uint - // The string is big Endian UCS-16, convert to host Endian UCS-16 - for (size_t i=0;((const uint16_t*)de->ident)[i] != 0;i++) ((uint16_t*)de->ident)[i] = be16toh(((uint16_t*)de->ident)[i]); - // finally, convert from UCS-16 to local code page, using C++ string construction to make a copy first -- CodePageHostToGuestUTF16((char*)de->ident,std::basic_string((const uint16_t*)de->ident).c_str()); -+ CodePageHostToGuestUTF16(de->ident, de->ident); - } - else { - // remove any file version identifiers as there are some cdroms that don't have them