diff options
| author | wiz <wiz@pkgsrc.org> | 2014-04-17 00:49:51 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-04-17 00:49:51 +0000 |
| commit | 327a0907bbc98b8ea21fe8b516843709065011f5 (patch) | |
| tree | 496b3cf9582997ae4d697160128ab736f1b1a560 /emulators | |
| parent | 6f9add0972a21acecad9a4a346ed84e9137f1bef (diff) | |
| download | pkgsrc-327a0907bbc98b8ea21fe8b516843709065011f5.tar.gz | |
Add two patches from Fedora that fix the build with gcc-4.8.
Bump PKGREVISION.
Addresses PR 48681 by John D. Baker.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/dosbox/Makefile | 6 | ||||
| -rw-r--r-- | emulators/dosbox/distinfo | 4 | ||||
| -rw-r--r-- | emulators/dosbox/patches/patch-include_dos__inc.h | 14 | ||||
| -rw-r--r-- | emulators/dosbox/patches/patch-src_gui_sdl__mapper.cpp | 19 |
4 files changed, 39 insertions, 4 deletions
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index edcdc4cfea1..5c8cb938a63 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2014/02/05 08:40:11 obache Exp $ +# $NetBSD: Makefile,v 1.39 2014/04/17 00:49:51 wiz Exp $ DISTNAME= dosbox-0.74 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dosbox/} @@ -14,7 +14,7 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CPPFLAGS.SunOS+= -DDISABLE_JOYSTICK .include "../../mk/compiler.mk" -.if !empty(CC_VERSION:Mclang*) +.if !empty(CC_VERSION:Mclang*) CPPFLAGS+= -fPIC .endif LDFLAGS.SunOS+= -lsocket diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo index b03c2c057d4..79c009172d2 100644 --- a/emulators/dosbox/distinfo +++ b/emulators/dosbox/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.19 2013/10/21 09:48:10 fhajny Exp $ +$NetBSD: distinfo,v 1.20 2014/04/17 00:49:51 wiz Exp $ SHA1 (dosbox-0.74.tar.gz) = 2d99f0013350efb29b769ff19ddc8e4d86f4e77e RMD160 (dosbox-0.74.tar.gz) = 4534d87206de8401cd0de471d8172726f2c6b788 Size (dosbox-0.74.tar.gz) = 1265711 bytes +SHA1 (patch-include_dos__inc.h) = c6c9e5e29b3861fa477ae6c00e335dc57737f8ff SHA1 (patch-src_Makefile.in) = 6f811b5a1450ca88cb47d99d0381fb682d8b994d +SHA1 (patch-src_gui_sdl__mapper.cpp) = 030a05b6036f28063a42f4fc601dc7add5a85d6b diff --git a/emulators/dosbox/patches/patch-include_dos__inc.h b/emulators/dosbox/patches/patch-include_dos__inc.h new file mode 100644 index 00000000000..fd9f3eacd5d --- /dev/null +++ b/emulators/dosbox/patches/patch-include_dos__inc.h @@ -0,0 +1,14 @@ +$NetBSD: patch-include_dos__inc.h,v 1.1 2014/04/17 00:49:51 wiz Exp $ + +Add missing header for offsetof() and friends. + +--- include/dos_inc.h.orig 2010-05-10 17:43:54.000000000 +0000 ++++ include/dos_inc.h +@@ -27,6 +27,7 @@ + #ifndef DOSBOX_MEM_H + #include "mem.h" + #endif ++#include <stddef.h> + + #ifdef _MSC_VER + #pragma pack (1) diff --git a/emulators/dosbox/patches/patch-src_gui_sdl__mapper.cpp b/emulators/dosbox/patches/patch-src_gui_sdl__mapper.cpp new file mode 100644 index 00000000000..52e20efc573 --- /dev/null +++ b/emulators/dosbox/patches/patch-src_gui_sdl__mapper.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-src_gui_sdl__mapper.cpp,v 1.1 2014/04/17 00:49:51 wiz Exp $ + +Avoid overrunning array. + +--- src/gui/sdl_mapper.cpp.orig 2010-05-10 18:58:06.000000000 +0000 ++++ src/gui/sdl_mapper.cpp +@@ -2384,9 +2384,11 @@ void MAPPER_StartUp(Section * sec) { + mapper.sticks.num=0; + mapper.sticks.num_groups=0; + Bitu i; +- for (i=0; i<16; i++) { ++ for (i=0; i<MAX_VJOY_BUTTONS; i++) { + virtual_joysticks[0].button_pressed[i]=false; + virtual_joysticks[1].button_pressed[i]=false; ++ } ++ for (i=0; i<16; i++) { + virtual_joysticks[0].hat_pressed[i]=false; + virtual_joysticks[1].hat_pressed[i]=false; + } |