diff options
author | nia <nia@pkgsrc.org> | 2021-08-10 11:03:50 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2021-08-10 11:03:50 +0000 |
commit | 487ac7258197eee1a6a32c2fbfc08032ae9418cf (patch) | |
tree | d4af8985968f1c3554d510ec20ef2ccd6efd0712 /emulators | |
parent | 43f3c9a06a3c987d2ba0d64c684abcd7fafc18d0 (diff) | |
download | pkgsrc-487ac7258197eee1a6a32c2fbfc08032ae9418cf.tar.gz |
dosbox-x: update to 0.83.16
Release notes:
https://dosbox-x.com/release-0.83.16.html
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/dosbox-x/Makefile | 9 | ||||
-rw-r--r-- | emulators/dosbox-x/distinfo | 15 | ||||
-rw-r--r-- | emulators/dosbox-x/patches/patch-configure.ac | 25 | ||||
-rw-r--r-- | emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp | 8 |
4 files changed, 31 insertions, 26 deletions
diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index 581c17075b5..72f39a5611b 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -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" diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo index 5832ba52a96..b5526d73787 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -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 diff --git a/emulators/dosbox-x/patches/patch-configure.ac b/emulators/dosbox-x/patches/patch-configure.ac index d584aa21587..74d120dc6a0 100644 --- a/emulators/dosbox-x/patches/patch-configure.ac +++ b/emulators/dosbox-x/patches/patch-configure.ac @@ -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 diff --git a/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp b/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp index d33f35235e9..bf6aa266888 100644 --- a/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp +++ b/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp @@ -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<double>(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)) { |