Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1173A1A921F for ; Thu, 19 Nov 2020 17:17:34 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4F7968510A; Thu, 19 Nov 2020 17:17:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8B0EC85105 for ; Thu, 19 Nov 2020 17:17:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YKuwtNKoDcyZ for ; Thu, 19 Nov 2020 17:17:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 316E984DA6 for ; Thu, 19 Nov 2020 17:17:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2BCA2FA9D; Thu, 19 Nov 2020 17:17:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1605806236229440" MIME-Version: 1.0 Date: Thu, 19 Nov 2020 17:17:16 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/dosbox-x To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20201119171716.2BCA2FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1605806236229440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Nov 19 17:17:16 UTC 2020 Modified Files: pkgsrc/emulators/dosbox-x: Makefile distinfo Added Files: pkgsrc/emulators/dosbox-x/patches: patch-configure.ac patch-include_dosbox.h Removed Files: pkgsrc/emulators/dosbox-x/patches: patch-configure Log Message: dosbox-x: Patch pregenerated ./configure. Don't use long double on non-x86. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/emulators/dosbox-x/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/emulators/dosbox-x/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/dosbox-x/patches/patch-configure cvs rdiff -u -r0 -r1.4 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac cvs rdiff -u -r0 -r1.1 \ 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. --_----------=_1605806236229440 Content-Disposition: inline Content-Length: 3429 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.23 pkgsrc/emulators/dosbox-x/Makefile:1.24 --- pkgsrc/emulators/dosbox-x/Makefile:1.23 Thu Nov 19 16:52:31 2020 +++ pkgsrc/emulators/dosbox-x/Makefile Thu Nov 19 17:17:15 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2020/11/19 16:52:31 nia Exp $ +# $NetBSD: Makefile,v 1.24 2020/11/19 17:17:15 nia Exp $ DISTNAME= dosbox-x-0.83.7 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/} GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV} Index: pkgsrc/emulators/dosbox-x/distinfo diff -u pkgsrc/emulators/dosbox-x/distinfo:1.13 pkgsrc/emulators/dosbox-x/distinfo:1.14 --- pkgsrc/emulators/dosbox-x/distinfo:1.13 Thu Nov 19 16:52:31 2020 +++ pkgsrc/emulators/dosbox-x/distinfo Thu Nov 19 17:17:15 2020 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.13 2020/11/19 16:52:31 nia Exp $ +$NetBSD: distinfo,v 1.14 2020/11/19 17:17:15 nia Exp $ SHA1 (dosbox-x-0.83.7.tar.gz) = 9ddfa4b40d816593dde04ca3485e80cfe8554bb6 RMD160 (dosbox-x-0.83.7.tar.gz) = cd4edafe72c77e00166151c1fcc7d2e772d99db7 SHA512 (dosbox-x-0.83.7.tar.gz) = 2e57bfba9e2373752142be1c61d5f59c88ca04dcf05be6c4052bc850aa413d8c359062eb5a87709b4cdc4142d21f1c0725c987d07ea7d2b67b9a3024d5c9fccb Size (dosbox-x-0.83.7.tar.gz) = 47403831 bytes -SHA1 (patch-configure) = 6a4be02b1b7581dbb9656673a32a92c01cd89c83 +SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd +SHA1 (patch-include_dosbox.h) = 69f5fc59e419b46df65991de7469480807ac009d SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681 Added files: Index: pkgsrc/emulators/dosbox-x/patches/patch-configure.ac diff -u /dev/null pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.4 --- /dev/null Thu Nov 19 17:17:16 2020 +++ pkgsrc/emulators/dosbox-x/patches/patch-configure.ac Thu Nov 19 17:17:15 2020 @@ -0,0 +1,22 @@ +$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" Index: pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h diff -u /dev/null pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.1 --- /dev/null Thu Nov 19 17:17:16 2020 +++ pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h Thu Nov 19 17:17:15 2020 @@ -0,0 +1,17 @@ +$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 --_----------=_1605806236229440--