[pkgsrc/trunk]: pkgsrc/emulators/dosbox Fix format string. Deal with pointer ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/908eeac53365
branches:  trunk
changeset: 358248:908eeac53365
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 07 23:56:14 2017 +0000

description:
Fix format string. Deal with pointer ordering. Bump revision.

diffstat:

 emulators/dosbox/Makefile                          |   4 +-
 emulators/dosbox/distinfo                          |   3 +-
 emulators/dosbox/patches/patch-src_gui_sdlmain.cpp |  26 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 3321548636f9 -r 908eeac53365 emulators/dosbox/Makefile
--- a/emulators/dosbox/Makefile Tue Feb 07 23:55:05 2017 +0000
+++ b/emulators/dosbox/Makefile Tue Feb 07 23:56:14 2017 +0000
@@ -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 -r 3321548636f9 -r 908eeac53365 emulators/dosbox/distinfo
--- a/emulators/dosbox/distinfo Tue Feb 07 23:55:05 2017 +0000
+++ b/emulators/dosbox/distinfo Tue Feb 07 23:56:14 2017 +0000
@@ -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 @@
 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 -r 3321548636f9 -r 908eeac53365 emulators/dosbox/patches/patch-src_gui_sdlmain.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp        Tue Feb 07 23:56:14 2017 +0000
@@ -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;