Thu Nov 19 17:17:16 2020 UTC ()
dosbox-x: Patch pregenerated ./configure. Don't use long double on non-x86.


(nia)
diff -r1.23 -r1.24 pkgsrc/emulators/dosbox-x/Makefile
diff -r1.13 -r1.14 pkgsrc/emulators/dosbox-x/distinfo
diff -r1.1 -r0 pkgsrc/emulators/dosbox-x/patches/patch-configure
diff -r0 -r1.4 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h
cvs diff -r1.23 -r1.24 pkgsrc/emulators/dosbox-x/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/dosbox-x/Makefile 2020/11/19 16:52:31 1.23
+++ pkgsrc/emulators/dosbox-x/Makefile 2020/11/19 17:17:15 1.24
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2020/11/19 16:52:31 nia Exp $ 1# $NetBSD: Makefile,v 1.24 2020/11/19 17:17:15 nia Exp $
2 2
3DISTNAME= dosbox-x-0.83.7 3DISTNAME= dosbox-x-0.83.7
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/}
6GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV} 7GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV}
7 8
8MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
9HOMEPAGE= https://dosbox-x.com/ 10HOMEPAGE= https://dosbox-x.com/
10COMMENT= DOSBox fork with enhancements 11COMMENT= DOSBox fork with enhancements
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13WRKSRC= ${WRKDIR}/dosbox-x-${GITHUB_TAG} 14WRKSRC= ${WRKDIR}/dosbox-x-${GITHUB_TAG}
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
15USE_TOOLS+= autoconf autoreconf automake pkg-config 16USE_TOOLS+= autoconf autoreconf automake pkg-config
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
cvs diff -r1.13 -r1.14 pkgsrc/emulators/dosbox-x/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/dosbox-x/distinfo 2020/11/19 16:52:31 1.13
+++ pkgsrc/emulators/dosbox-x/distinfo 2020/11/19 17:17:15 1.14
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.13 2020/11/19 16:52:31 nia Exp $ 1$NetBSD: distinfo,v 1.14 2020/11/19 17:17:15 nia Exp $
2 2
3SHA1 (dosbox-x-0.83.7.tar.gz) = 9ddfa4b40d816593dde04ca3485e80cfe8554bb6 3SHA1 (dosbox-x-0.83.7.tar.gz) = 9ddfa4b40d816593dde04ca3485e80cfe8554bb6
4RMD160 (dosbox-x-0.83.7.tar.gz) = cd4edafe72c77e00166151c1fcc7d2e772d99db7 4RMD160 (dosbox-x-0.83.7.tar.gz) = cd4edafe72c77e00166151c1fcc7d2e772d99db7
5SHA512 (dosbox-x-0.83.7.tar.gz) = 2e57bfba9e2373752142be1c61d5f59c88ca04dcf05be6c4052bc850aa413d8c359062eb5a87709b4cdc4142d21f1c0725c987d07ea7d2b67b9a3024d5c9fccb 5SHA512 (dosbox-x-0.83.7.tar.gz) = 2e57bfba9e2373752142be1c61d5f59c88ca04dcf05be6c4052bc850aa413d8c359062eb5a87709b4cdc4142d21f1c0725c987d07ea7d2b67b9a3024d5c9fccb
6Size (dosbox-x-0.83.7.tar.gz) = 47403831 bytes 6Size (dosbox-x-0.83.7.tar.gz) = 47403831 bytes
7SHA1 (patch-configure) = 6a4be02b1b7581dbb9656673a32a92c01cd89c83 7SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd
 8SHA1 (patch-include_dosbox.h) = 69f5fc59e419b46df65991de7469480807ac009d
8SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681 9SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681
File Deleted: pkgsrc/emulators/dosbox-x/patches/Attic/patch-configure
File Added: pkgsrc/emulators/dosbox-x/patches/patch-configure.ac
$NetBSD: patch-configure.ac,v 1.4 2020/11/19 17:17:15 nia Exp $

Detect NetBSD/evbarm properly.

--- configure.ac.orig	2020-11-01 15:36:10.000000000 +0000
+++ configure.ac
@@ -499,13 +499,13 @@ case "$host_cpu" in
     c_targetcpu="m68k"
     c_unalignedmemory=yes
     ;;
-   armv7l)
+   armv7*)
     AC_DEFINE(C_TARGETCPU,ARMV7LE)
     AC_MSG_RESULT(ARMv7 Little Endian)
     c_targetcpu="arm"
     c_unalignedmemory=yes
     ;;
-   armv6l)
+   armv6*)
     AC_DEFINE(C_TARGETCPU,ARMV4LE)
     AC_MSG_RESULT(ARMv6 Little Endian)
     c_targetcpu="arm"
File Added: pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h
$NetBSD: patch-include_dosbox.h,v 1.1 2020/11/19 17:17:15 nia Exp $

Only attempt to use long double on x86.

--- include/dosbox.h.orig	2020-11-01 15:36:10.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)
-#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