On Fri, Mar 08, 2024 at 09:58:47PM +0900, SASANO Takayoshi wrote:
> Hi,
> 
> here is the diff for dosbox-x 2023.10.06 -> 2024.03.01.
> 
> ok?

I would recommend running `make update-patches` to update the patch for
Makefile.am, otherwise looks good and runs. ok thfr@

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/dosbox-x/Makefile,v
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile	21 Feb 2024 12:29:10 -0000	1.1.1.1
> +++ Makefile	8 Mar 2024 12:57:53 -0000
> @@ -1,6 +1,6 @@
>  COMMENT=	x86 with DOS emulator targeted at playing games
>  
> -VERSION=	2023.10.06
> +VERSION=	2024.03.01
>  DISTNAME=	dosbox-x-v${VERSION}
>  PKGNAME=	dosbox-x-${VERSION}
>  CATEGORIES=	games x11 emulators
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/emulators/dosbox-x/distinfo,v
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo	21 Feb 2024 12:29:10 -0000	1.1.1.1
> +++ distinfo	8 Mar 2024 12:57:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (dosbox-x-v2023.10.06.tar.gz) = ZfdW4p+cm4mP29IrDLmzskxuO+y13NpYiqIKP96VOaU=
> -SIZE (dosbox-x-v2023.10.06.tar.gz) = 119420489
> +SHA256 (dosbox-x-v2024.03.01.tar.gz) = KonTGW3cFTYfbcfmqxQr/pWUXZPVJ8/Wusyh96QBpRM=
> +SIZE (dosbox-x-v2024.03.01.tar.gz) = 119593920
> Index: patches/patch-include_dos_inc_h
> ===================================================================
> RCS file: patches/patch-include_dos_inc_h
> diff -N patches/patch-include_dos_inc_h
> --- patches/patch-include_dos_inc_h	21 Feb 2024 12:29:10 -0000	1.1.1.1
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> ---- include/dos_inc.h.orig.port	Mon Nov 27 22:44:22 2023
> -+++ include/dos_inc.h	Mon Nov 27 22:44:22 2023
> -@@ -390,7 +390,7 @@ static INLINE uint16_t DOS_PackDate(uint16_t year,uint
> - 
> - 
> - /* Remains some classes used to access certain things */
> --#define sOffset(s,m) ((char*)&(((s*)NULL)->m)-(char*)NULL)
> -+#define sOffset(s,m) offsetof(s,m)
> - #define sGet(s,m) GetIt(sizeof(((s *)&pt)->m),(PhysPt)sOffset(s,m))
> - #define sSave(s,m,val) SaveIt(sizeof(((s *)&pt)->m),(PhysPt)sOffset(s,m),val)
> - 
> Index: patches/patch-src_dos_dos_programs_cpp
> ===================================================================
> RCS file: patches/patch-src_dos_dos_programs_cpp
> diff -N patches/patch-src_dos_dos_programs_cpp
> --- patches/patch-src_dos_dos_programs_cpp	21 Feb 2024 12:29:10 -0000	1.1.1.1
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> ---- src/dos/dos_programs.cpp.orig	Sat Oct  7 14:52:23 2023
> -+++ src/dos/dos_programs.cpp	Fri Nov  3 05:51:29 2023
> -@@ -5926,7 +5926,7 @@ class IMGMOUNT : public Program {
> - 								FILE* newDisk = fopen_lock(fname, ro ? "rb" : "rb+", ro);
> - 								if(!newDisk) {
> - 									if(!qmount) WriteOut("Unable to open '%s'\n", fname);
> --									return NULL;
> -+									return false;
> - 								}
> - 								QCow2Image::QCow2Header qcow2_header = QCow2Image::read_header(newDisk);
> - 								// uint64_t sectors; /* unused */
> -@@ -5936,7 +5936,7 @@ class IMGMOUNT : public Program {
> - 									uint32_t cluster_size = 1u << qcow2_header.cluster_bits;
> - 									if((sizes[0] < 512) || ((cluster_size % sizes[0]) != 0)) {
> - 										WriteOut("Sector size must be larger than 512 bytes and evenly divide the image cluster size of %lu bytes.\n", cluster_size);
> --										return 0;
> -+										return false;
> - 									}
> - 									// sectors = (uint64_t)qcow2_header.size / (uint64_t)sizes[0]; /* unused */
> - 									imagesize = (uint32_t)(qcow2_header.size / 1024L);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/emulators/dosbox-x/pkg/PLIST,v
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST	21 Feb 2024 12:29:10 -0000	1.1.1.1
> +++ pkg/PLIST	8 Mar 2024 12:57:53 -0000
> @@ -65,11 +65,13 @@ share/dosbox-x/languages/de_pc98.lng
>  share/dosbox-x/languages/en_US.lng
>  share/dosbox-x/languages/es_ES.lng
>  share/dosbox-x/languages/fr_FR.lng
> +share/dosbox-x/languages/hu_HU.lng
>  share/dosbox-x/languages/it_IT.lng
>  share/dosbox-x/languages/ja_JP.lng
>  share/dosbox-x/languages/ko_KR.lng
>  share/dosbox-x/languages/nl_NL.lng
>  share/dosbox-x/languages/pt_BR.lng
> +share/dosbox-x/languages/ru_RU.lng
>  share/dosbox-x/languages/tr_TR.lng
>  share/dosbox-x/languages/zh_CN.lng
>  share/dosbox-x/languages/zh_TW.lng
> 
> -- 
> SASANO Takayoshi (JG1UAA) <uaa@mx5.nisiq.net>
>