Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1609844509285970"
MIME-Version: 1.0
Date: Tue, 5 Jan 2021 11:01:49 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/emulators/dosbox-x
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20210105110149.61757FA9D@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1609844509285970
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Tue Jan  5 11:01:49 UTC 2021

Modified Files:
	pkgsrc/emulators/dosbox-x: Makefile distinfo
	pkgsrc/emulators/dosbox-x/patches: patch-include_dosbox.h

Log Message:
dosbox-x: Don't assume anything that 80-bit long double.

Add missing SDL_net dependency.

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/emulators/dosbox-x/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/dosbox-x/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1609844509285970
Content-Disposition: inline
Content-Length: 4193
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/emulators/dosbox-x/Makefile
diff -u pkgsrc/emulators/dosbox-x/Makefile:1.26 pkgsrc/emulators/dosbox-x/Makefile:1.27
--- pkgsrc/emulators/dosbox-x/Makefile:1.26	Thu Dec  3 14:03:19 2020
+++ pkgsrc/emulators/dosbox-x/Makefile	Tue Jan  5 11:01:49 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2020/12/03 14:03:19 nia Exp $
+# $NetBSD: Makefile,v 1.27 2021/01/05 11:01:49 nia Exp $
 
 DISTNAME=	dosbox-x-0.83.8
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=joncampbell123/}
 GITHUB_TAG=	dosbox-x-v${PKGVERSION_NOREV}
@@ -55,6 +56,10 @@ INSTALLATION_DIRS+=	share/pixmaps
 
 CHECK_PORTABILITY_SKIP+=	vs2015/sdl2/build-scripts/androidbuildlibs.sh
 CHECK_PORTABILITY_SKIP+=	vs2015/sdl2/build-scripts/iosbuild.sh
+CHECK_PORTABILITY_SKIP+=	make-flatpak-sdl2.sh
+CHECK_PORTABILITY_SKIP+=	make-flatpak.sh
+# [[ is used in an developer target that isn't useful for us
+CHECK_PORTABILITY_SKIP+=	Makefile.in Makefile.am
 
 BUILDLINK_TRANSFORM+=	rm:-Wno-int-to-void-pointer-cast
 BUILDLINK_TRANSFORM+=	rm:-Wno-address-of-packed-member
@@ -78,6 +83,7 @@ do-install:
 .include "options.mk"
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../net/SDL2_net/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/emulators/dosbox-x/distinfo
diff -u pkgsrc/emulators/dosbox-x/distinfo:1.15 pkgsrc/emulators/dosbox-x/distinfo:1.16
--- pkgsrc/emulators/dosbox-x/distinfo:1.15	Thu Dec  3 14:03:19 2020
+++ pkgsrc/emulators/dosbox-x/distinfo	Tue Jan  5 11:01:49 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2020/12/03 14:03:19 nia Exp $
+$NetBSD: distinfo,v 1.16 2021/01/05 11:01:49 nia Exp $
 
 SHA1 (dosbox-x-0.83.8.tar.gz) = 25084d9903544ffe954bde2d3ad0d649e8f2eaa0
 RMD160 (dosbox-x-0.83.8.tar.gz) = 067fb76cefde0e30dd049f04c4a2d0baf4fd54bd
 SHA512 (dosbox-x-0.83.8.tar.gz) = 61c75460ac71bb41a654354eb4965dc576c29456db3fd5fa41032e4071f90dce68b4f1b88a314dbb56e9c3850bd6975850d6e20efbdcffc2b14701cfd0127ec0
 Size (dosbox-x-0.83.8.tar.gz) = 47950712 bytes
 SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd
-SHA1 (patch-include_dosbox.h) = 69f5fc59e419b46df65991de7469480807ac009d
+SHA1 (patch-include_dosbox.h) = 6f7397b4a611511fc1782b1603c9f5cd51b74eb9
 SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681

Index: pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h
diff -u pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.1 pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.2
--- pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.1	Thu Nov 19 17:17:15 2020
+++ pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h	Tue Jan  5 11:01:49 2021
@@ -1,17 +1,23 @@
-$NetBSD: patch-include_dosbox.h,v 1.1 2020/11/19 17:17:15 nia Exp $
+$NetBSD: patch-include_dosbox.h,v 1.2 2021/01/05 11:01:49 nia Exp $
 
-Only attempt to use long double on x86.
+GCC having 80-bit long double is far from a safe assumption.
 
---- include/dosbox.h.orig	2020-11-01 15:36:10.000000000 +0000
+--- include/dosbox.h.orig	2020-12-01 02:49:53.000000000 +0000
 +++ include/dosbox.h
-@@ -72,9 +72,7 @@
- // TODO: The autoconf script should test the size of long double
- #if defined(_MSC_VER)
- // Microsoft C++ sizeof(long double) == sizeof(double)
+@@ -69,16 +69,6 @@
+ # define pref_struct_stat	struct stat
+ #endif
+ 
+-// TODO: The autoconf script should test the size of long double
+-#if defined(_MSC_VER)
+-// Microsoft C++ sizeof(long double) == sizeof(double)
 -#elif defined(__arm__)
 -// ARMv7 (Raspberry Pi) does not have long double, sizeof(long double) == sizeof(double)
 -#else
-+#elif C_TARGETCPU == X86_64 || C_TARGETCPU == X86
- // GCC, other compilers, have sizeof(long double) == 10 80-bit IEEE
- # define HAS_LONG_DOUBLE		1
- #endif
+-// GCC, other compilers, have sizeof(long double) == 10 80-bit IEEE
+-# define HAS_LONG_DOUBLE		1
+-#endif
+-
+ GCC_ATTRIBUTE(noreturn) void		E_Exit(const char * format,...) GCC_ATTRIBUTE( __format__(__printf__, 1, 2));
+ 
+ typedef Bits cpu_cycles_count_t;


--_----------=_1609844509285970--