Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 921B87A13C for ; Tue, 7 Feb 2017 23:56:15 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 418D385624; Tue, 7 Feb 2017 23:56:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C4003855B1 for ; Tue, 7 Feb 2017 23:56:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id RnA2GgxEKXav for ; Tue, 7 Feb 2017 23:56:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 483188558F for ; Tue, 7 Feb 2017 23:56:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 46242FBE4; Tue, 7 Feb 2017 23:56:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1486511774272420" MIME-Version: 1.0 Date: Tue, 7 Feb 2017 23:56:14 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/emulators/dosbox To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170207235614.46242FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1486511774272420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Feb 7 23:56:14 UTC 2017 Modified Files: pkgsrc/emulators/dosbox: Makefile distinfo Added Files: pkgsrc/emulators/dosbox/patches: patch-src_gui_sdlmain.cpp Log Message: Fix format string. Deal with pointer ordering. Bump revision. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/emulators/dosbox/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/dosbox/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1486511774272420 Content-Disposition: inline Content-Length: 2968 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/dosbox/Makefile diff -u pkgsrc/emulators/dosbox/Makefile:1.42 pkgsrc/emulators/dosbox/Makefile:1.43 --- pkgsrc/emulators/dosbox/Makefile:1.42 Mon Nov 28 06:51:23 2016 +++ pkgsrc/emulators/dosbox/Makefile Tue Feb 7 23:56:14 2017 @@ -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/} Index: pkgsrc/emulators/dosbox/distinfo diff -u pkgsrc/emulators/dosbox/distinfo:1.21 pkgsrc/emulators/dosbox/distinfo:1.22 --- pkgsrc/emulators/dosbox/distinfo:1.21 Tue Nov 3 20:30:57 2015 +++ pkgsrc/emulators/dosbox/distinfo Tue Feb 7 23:56:14 2017 @@ -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 byte 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 Added files: Index: pkgsrc/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp diff -u /dev/null pkgsrc/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp:1.1 --- /dev/null Tue Feb 7 23:56:14 2017 +++ pkgsrc/emulators/dosbox/patches/patch-src_gui_sdlmain.cpp Tue Feb 7 23:56:14 2017 @@ -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; --_----------=_1486511774272420--