Received: by mail.netbsd.org (Postfix, from userid 605) id 367BD84E72; Tue, 10 Aug 2021 11:03:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6F31B84D65 for ; Tue, 10 Aug 2021 11:03:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id I8uzQ_3Ge6g7 for ; Tue, 10 Aug 2021 11:03:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9CA1A84CE3 for ; Tue, 10 Aug 2021 11:03:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9A2C6FA97; Tue, 10 Aug 2021 11:03:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1628593430215900" MIME-Version: 1.0 Date: Tue, 10 Aug 2021 11:03:50 +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: <20210810110350.9A2C6FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1628593430215900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Aug 10 11:03:50 UTC 2021 Modified Files: pkgsrc/emulators/dosbox-x: Makefile distinfo pkgsrc/emulators/dosbox-x/patches: patch-configure.ac patch-src_dos_dos__programs.cpp Log Message: dosbox-x: update to 0.83.16 Release notes: https://dosbox-x.com/release-0.83.16.html To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 pkgsrc/emulators/dosbox-x/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/dosbox-x/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1628593430215900 Content-Disposition: inline Content-Length: 6024 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.28 pkgsrc/emulators/dosbox-x/Makefile:1.29 --- pkgsrc/emulators/dosbox-x/Makefile:1.28 Mon Apr 5 10:55:28 2021 +++ pkgsrc/emulators/dosbox-x/Makefile Tue Aug 10 11:03:50 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2021/04/05 10:55:28 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2021/08/10 11:03:50 nia Exp $ -DISTNAME= dosbox-x-0.83.8 -PKGREVISION= 2 +DISTNAME= dosbox-x-0.83.16 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=joncampbell123/} GITHUB_TAG= dosbox-x-v${PKGVERSION_NOREV} @@ -83,9 +82,11 @@ do-install: .include "options.mk" .include "../../audio/fluidsynth/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" -.include "../../net/SDL2_net/buildlink3.mk" +.include "../../devel/physfs/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../net/SDL2_net/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" +.include "../../net/libslirp/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/emulators/dosbox-x/distinfo diff -u pkgsrc/emulators/dosbox-x/distinfo:1.16 pkgsrc/emulators/dosbox-x/distinfo:1.17 --- pkgsrc/emulators/dosbox-x/distinfo:1.16 Tue Jan 5 11:01:49 2021 +++ pkgsrc/emulators/dosbox-x/distinfo Tue Aug 10 11:03:50 2021 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.16 2021/01/05 11:01:49 nia Exp $ +$NetBSD: distinfo,v 1.17 2021/08/10 11:03:50 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 (dosbox-x-0.83.16.tar.gz) = 9ce23a39aafdd0abb89c6cb7fd86ba09d491f4c6 +RMD160 (dosbox-x-0.83.16.tar.gz) = ad737d496287c38310b4520bb132c1d9690127d7 +SHA512 (dosbox-x-0.83.16.tar.gz) = f2be5a3d16d2377719a78b9e0f98ef69128370d951e67257b58ba4fb5dc654e40dae14773cf2cf89104406a4608b58dcc89f70cbd00e03e41979cb4d9f23ba99 +Size (dosbox-x-0.83.16.tar.gz) = 61998617 bytes +SHA1 (patch-configure.ac) = 906aa99b5fce6224ef4c001d9bba1e4fc89a34f9 SHA1 (patch-include_dosbox.h) = 6f7397b4a611511fc1782b1603c9f5cd51b74eb9 -SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681 +SHA1 (patch-src_dos_dos__programs.cpp) = 1f64cdd66c5b850609dbe7634f60da96fba7655e +SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6 Index: pkgsrc/emulators/dosbox-x/patches/patch-configure.ac diff -u pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.4 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.5 --- pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.4 Thu Nov 19 17:17:15 2020 +++ pkgsrc/emulators/dosbox-x/patches/patch-configure.ac Tue Aug 10 11:03:50 2021 @@ -1,17 +1,11 @@ -$NetBSD: patch-configure.ac,v 1.4 2020/11/19 17:17:15 nia Exp $ +$NetBSD: patch-configure.ac,v 1.5 2021/08/10 11:03:50 nia Exp $ -Detect NetBSD/evbarm properly. +- Detect NetBSD/evbarm properly. +- Shell portability. ---- configure.ac.orig 2020-11-01 15:36:10.000000000 +0000 +--- configure.ac.orig 2021-08-01 07:45:55.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) +@@ -543,7 +543,7 @@ case "$host_cpu" in c_targetcpu="arm" c_unalignedmemory=yes ;; @@ -20,3 +14,12 @@ Detect NetBSD/evbarm properly. AC_DEFINE(C_TARGETCPU,ARMV4LE) AC_MSG_RESULT(ARMv6 Little Endian) c_targetcpu="arm" +@@ -1007,7 +1007,7 @@ esac + dnl FEATURE: Whether to use libslirp, and enable userspace TCP/IP emulation + AH_TEMPLATE(C_SLIRP, [Define to 1 to enable userspace TCP/IP emulation, requires libslirp]) + AC_ARG_ENABLE(libslirp,AC_HELP_STRING([--disable-libslirp],[Disable libslirp support]),enable_libslirp=$enableval,enable_libslirp=yes) +-if test x$enable_libslirp == xyes ; then ++if test x$enable_libslirp = xyes ; then + case "$host" in + *-*-cygwin* | *-*-mingw32*) + if test x$have_slirp_h = xyes; then Index: pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp diff -u pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp:1.1 pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp:1.2 --- pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp:1.1 Tue Jul 7 12:05:49 2020 +++ pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp Tue Aug 10 11:03:50 2021 @@ -1,16 +1,16 @@ -$NetBSD: patch-src_dos_dos__programs.cpp,v 1.1 2020/07/07 12:05:49 nia Exp $ +$NetBSD: patch-src_dos_dos__programs.cpp,v 1.2 2021/08/10 11:03:50 nia Exp $ dos_programs.cpp: In member function 'bool AUTOTYPE::ReadDoubleArg(const string&, const char*, const double&, const double&, const double&, double&)': dos_programs.cpp:5556:12: error: expected unqualified-id before '(' token if (std::isfinite(user_value)) { ---- src/dos/dos_programs.cpp.orig 2020-06-30 23:09:17.000000000 +0000 +--- src/dos/dos_programs.cpp.orig 2021-08-01 07:45:55.000000000 +0000 +++ src/dos/dos_programs.cpp -@@ -5550,11 +5550,7 @@ bool AUTOTYPE::ReadDoubleArg(const std:: +@@ -6446,11 +6446,7 @@ bool AUTOTYPE::ReadDoubleArg(const std:: if (cmd->FindString(flag, str_value, true)) { // Can the user's value be parsed? const double user_value = to_finite(str_value); --#if defined(MACOSX) +-#if defined(MACOSX) || defined(EMSCRIPTEN) || ((defined(ANDROID) || defined(__ANDROID__)) && defined(__clang__)) if (isfinite(user_value)) { /* *sigh* Really, clang, really? */ -#else - if (std::isfinite(user_value)) { --_----------=_1628593430215900--