Tue Jan 5 11:01:49 2021 UTC ()
dosbox-x: Don't assume anything that 80-bit long double.

Add missing SDL_net dependency.

bump PKGREVISION.


(nia)
diff -r1.26 -r1.27 pkgsrc/emulators/dosbox-x/Makefile
diff -r1.15 -r1.16 pkgsrc/emulators/dosbox-x/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h
cvs diff -r1.26 -r1.27 pkgsrc/emulators/dosbox-x/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/dosbox-x/Makefile 2020/12/03 14:03:19 1.26
+++ pkgsrc/emulators/dosbox-x/Makefile 2021/01/05 11:01:49 1.27
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.26 2020/12/03 14:03:19 nia Exp $ 1# $NetBSD: Makefile,v 1.27 2021/01/05 11:01:49 nia Exp $
2 2
3DISTNAME= dosbox-x-0.83.8 3DISTNAME= dosbox-x-0.83.8
 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++
@@ -45,41 +46,46 @@ NOT_PAX_MPROTECT_SAFE+= bin/dosbox-x @@ -45,41 +46,46 @@ NOT_PAX_MPROTECT_SAFE+= bin/dosbox-x
45 46
46PKGCONFIG_OVERRIDE+= vs2015/libpng/libpng.pc.in 47PKGCONFIG_OVERRIDE+= vs2015/libpng/libpng.pc.in
47PKGCONFIG_OVERRIDE+= vs2015/sdl/sdl.pc.in 48PKGCONFIG_OVERRIDE+= vs2015/sdl/sdl.pc.in
48PKGCONFIG_OVERRIDE+= vs2015/sdl2/sdl2.pc.in 49PKGCONFIG_OVERRIDE+= vs2015/sdl2/sdl2.pc.in
49PKGCONFIG_OVERRIDE+= vs2015/sdlnet/SDL_net.pc.in 50PKGCONFIG_OVERRIDE+= vs2015/sdlnet/SDL_net.pc.in
50PKGCONFIG_OVERRIDE+= vs2015/zlib/zlib.pc.in 51PKGCONFIG_OVERRIDE+= vs2015/zlib/zlib.pc.in
51 52
52INSTALLATION_DIRS+= bin share/dosbox-x 53INSTALLATION_DIRS+= bin share/dosbox-x
53INSTALLATION_DIRS+= share/applications 54INSTALLATION_DIRS+= share/applications
54INSTALLATION_DIRS+= share/pixmaps 55INSTALLATION_DIRS+= share/pixmaps
55 56
56CHECK_PORTABILITY_SKIP+= vs2015/sdl2/build-scripts/androidbuildlibs.sh 57CHECK_PORTABILITY_SKIP+= vs2015/sdl2/build-scripts/androidbuildlibs.sh
57CHECK_PORTABILITY_SKIP+= vs2015/sdl2/build-scripts/iosbuild.sh 58CHECK_PORTABILITY_SKIP+= vs2015/sdl2/build-scripts/iosbuild.sh
 59CHECK_PORTABILITY_SKIP+= make-flatpak-sdl2.sh
 60CHECK_PORTABILITY_SKIP+= make-flatpak.sh
 61# [[ is used in an developer target that isn't useful for us
 62CHECK_PORTABILITY_SKIP+= Makefile.in Makefile.am
58 63
59BUILDLINK_TRANSFORM+= rm:-Wno-int-to-void-pointer-cast 64BUILDLINK_TRANSFORM+= rm:-Wno-int-to-void-pointer-cast
60BUILDLINK_TRANSFORM+= rm:-Wno-address-of-packed-member 65BUILDLINK_TRANSFORM+= rm:-Wno-address-of-packed-member
61 66
62pre-configure: 67pre-configure:
63 cd ${WRKSRC} && autoreconf -fi 68 cd ${WRKSRC} && autoreconf -fi
64 69
65do-install: 70do-install:
66 ${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox-x ${DESTDIR}${PREFIX}/bin 71 ${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox-x ${DESTDIR}${PREFIX}/bin
67 ${INSTALL_DATA} ${WRKSRC}/contrib/fonts/FREECG98.BMP \ 72 ${INSTALL_DATA} ${WRKSRC}/contrib/fonts/FREECG98.BMP \
68 ${DESTDIR}${PREFIX}/share/dosbox-x 73 ${DESTDIR}${PREFIX}/share/dosbox-x
69 ${INSTALL_DATA} ${WRKSRC}/contrib/icons/dosbox-x.png \ 74 ${INSTALL_DATA} ${WRKSRC}/contrib/icons/dosbox-x.png \
70 ${DESTDIR}${PREFIX}/share/pixmaps/dosbox-x.png 75 ${DESTDIR}${PREFIX}/share/pixmaps/dosbox-x.png
71 ${INSTALL_DATA} ${WRKSRC}/contrib/linux/com.dosbox_x.DOSBox-X.desktop \ 76 ${INSTALL_DATA} ${WRKSRC}/contrib/linux/com.dosbox_x.DOSBox-X.desktop \
72 ${DESTDIR}${PREFIX}/share/applications 77 ${DESTDIR}${PREFIX}/share/applications
73 ${INSTALL_DATA} ${WRKSRC}/CHANGELOG \ 78 ${INSTALL_DATA} ${WRKSRC}/CHANGELOG \
74 ${DESTDIR}${PREFIX}/share/dosbox-x 79 ${DESTDIR}${PREFIX}/share/dosbox-x
75 ${INSTALL_DATA} ${WRKSRC}/dosbox-x.reference.conf \ 80 ${INSTALL_DATA} ${WRKSRC}/dosbox-x.reference.conf \
76 ${DESTDIR}${PREFIX}/share/dosbox-x 81 ${DESTDIR}${PREFIX}/share/dosbox-x
77 82
78.include "options.mk" 83.include "options.mk"
79.include "../../audio/fluidsynth/buildlink3.mk" 84.include "../../audio/fluidsynth/buildlink3.mk"
80.include "../../devel/SDL2/buildlink3.mk" 85.include "../../devel/SDL2/buildlink3.mk"
 86.include "../../net/SDL2_net/buildlink3.mk"
81.include "../../graphics/png/buildlink3.mk" 87.include "../../graphics/png/buildlink3.mk"
82.include "../../net/libpcap/buildlink3.mk" 88.include "../../net/libpcap/buildlink3.mk"
83.include "../../sysutils/desktop-file-utils/desktopdb.mk" 89.include "../../sysutils/desktop-file-utils/desktopdb.mk"
84.include "../../mk/curses.buildlink3.mk" 90.include "../../mk/curses.buildlink3.mk"
85.include "../../mk/bsd.pkg.mk" 91.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/emulators/dosbox-x/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/dosbox-x/distinfo 2020/12/03 14:03:19 1.15
+++ pkgsrc/emulators/dosbox-x/distinfo 2021/01/05 11:01:49 1.16
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.15 2020/12/03 14:03:19 nia Exp $ 1$NetBSD: distinfo,v 1.16 2021/01/05 11:01:49 nia Exp $
2 2
3SHA1 (dosbox-x-0.83.8.tar.gz) = 25084d9903544ffe954bde2d3ad0d649e8f2eaa0 3SHA1 (dosbox-x-0.83.8.tar.gz) = 25084d9903544ffe954bde2d3ad0d649e8f2eaa0
4RMD160 (dosbox-x-0.83.8.tar.gz) = 067fb76cefde0e30dd049f04c4a2d0baf4fd54bd 4RMD160 (dosbox-x-0.83.8.tar.gz) = 067fb76cefde0e30dd049f04c4a2d0baf4fd54bd
5SHA512 (dosbox-x-0.83.8.tar.gz) = 61c75460ac71bb41a654354eb4965dc576c29456db3fd5fa41032e4071f90dce68b4f1b88a314dbb56e9c3850bd6975850d6e20efbdcffc2b14701cfd0127ec0 5SHA512 (dosbox-x-0.83.8.tar.gz) = 61c75460ac71bb41a654354eb4965dc576c29456db3fd5fa41032e4071f90dce68b4f1b88a314dbb56e9c3850bd6975850d6e20efbdcffc2b14701cfd0127ec0
6Size (dosbox-x-0.83.8.tar.gz) = 47950712 bytes 6Size (dosbox-x-0.83.8.tar.gz) = 47950712 bytes
7SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd 7SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd
8SHA1 (patch-include_dosbox.h) = 69f5fc59e419b46df65991de7469480807ac009d 8SHA1 (patch-include_dosbox.h) = 6f7397b4a611511fc1782b1603c9f5cd51b74eb9
9SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681 9SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681
cvs diff -r1.1 -r1.2 pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h (expand / switch to unified diff)

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