sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 09:36:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

emulators/dosbox-x: Update to 2024.12.04

Browse source 
ChangeLog:
https://github.com/joncampbell123/dosbox-x/releases/tag/dosbox-x-v2024.12.04
This commit is contained in:
Nuno Teixeira 2024-12-05 20:25:18 +00:00
parent 779a5ac2ce
commit 3d58b32aa5
4 changed files with 4 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emulators/dosbox-x/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= dosbox-x PORTNAME= dosbox-x
DISTVERSIONPREFIX= ${PORTNAME}-v DISTVERSIONPREFIX= ${PORTNAME}-v
DISTVERSION= 2024.10.01 DISTVERSION= 2024.12.04
CATEGORIES= emulators CATEGORIES= emulators
MAINTAINER= eduardo@FreeBSD.org MAINTAINER= eduardo@FreeBSD.org

6
emulators/dosbox-x/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1727854016 TIMESTAMP = 1733389595
SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 9940662759b9910e3c4549216be8db0278ceaaa80ace5b19f87b04d0b6ff8a3a SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.12.04_GH0.tar.gz) = f2bca4c2c8da69085c0eabfb60886b67e3ad55b21974d4e1c3c79a2d3756add3
SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 121316697 SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.12.04_GH0.tar.gz) = 121318659

24
emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp
View file

@ -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_char_t> test_string;
typedef std::basic_string<char> 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<const uint16_t *>(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();

34
emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp
View file

@ -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<const char16_t *>(s));
+ return CodePageHostToGuestUTF16(reinterpret_cast<char *>(d), reinterpret_cast<const uint16_t *>(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<uint16_t>((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<uint16_t>((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