diff options
| author | joerg <joerg@pkgsrc.org> | 2017-02-07 23:56:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2017-02-07 23:56:14 +0000 |
| commit | 33c0aa794b60de2a7225c79542ba7e71d2f17426 (patch) | |
| tree | 67681ee79e2d645765455d64ec4eda1fb728d14b | |
| parent | 19a5b2f8fe02697506a1de37d3b4161d5d1dccb5 (diff) | |
| download | pkgsrc-33c0aa794b60de2a7225c79542ba7e71d2f17426.tar.gz | |
Fix format string. Deal with pointer ordering. Bump revision.
| -rw-r--r-- | emulators/dosbox/Makefile | 4 | ||||
| -rw-r--r-- | emulators/dosbox/distinfo | 3 | ||||
| -rw-r--r-- | emulators/dosbox/patches/patch-src_gui_sdlmain.cpp | 26 |
3 files changed, 30 insertions, 3 deletions
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index e3c3db81b00..cb06cb0ba55 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2016/11/28 06:51:23 dholland Exp $ +# $NetBSD: Makefile,v 1.43 2017/02/07 23:56:14 joerg Exp $ DISTNAME= dosbox-0.74 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dosbox/} diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo index 43f349f6af5..0974cf80393 100644 --- a/emulators/dosbox/distinfo +++ b/emulators/dosbox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2015/11/03 20:30:57 agc Exp $ +$NetBSD: distinfo,v 1.22 2017/02/07 23:56:14 joerg Exp $ SHA1 (dosbox-0.74.tar.gz) = 2d99f0013350efb29b769ff19ddc8e4d86f4e77e RMD160 (dosbox-0.74.tar.gz) = 4534d87206de8401cd0de471d8172726f2c6b788 @@ -7,3 +7,4 @@ 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 +SHA1 (patch-src_gui_sdlmain.cpp) = 317cd169e6b75a238bb1a4a72812654d36049227 diff --git a/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp b/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp new file mode 100644 index 00000000000..6617af1251d --- /dev/null +++ b/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp @@ -0,0 +1,26 @@ +$NetBSD: patch-src_gui_sdlmain.cpp,v 1.1 2017/02/07 23:56:14 joerg Exp $ + +Pointers are not ordered with 0. Fix format string. + +--- src/gui/sdlmain.cpp.orig 2017-01-08 18:35:26.455430930 +0000 ++++ src/gui/sdlmain.cpp +@@ -1134,8 +1134,8 @@ static void GUI_StartUp(Section * sec) { + #endif + const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS); + if(gl_ext && *gl_ext){ +- sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0); +- sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0); ++ sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") != NULL); ++ sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") != NULL); + #if defined(NVIDIA_PixelDataRange) + sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) && + glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV; +@@ -1529,7 +1529,7 @@ static void show_warning(char const * co + if ( !sdl.inited && SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) < 0 ) textonly = true; + sdl.inited = true; + #endif +- printf(message); ++ printf("%s", message); + if(textonly) return; + if(!sdl.surface) sdl.surface = SDL_SetVideoMode(640,400,0,0); + if(!sdl.surface) return; |