CVS commit: [pkgsrc-2019Q2] pkgsrc/devel/SDL

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Sep 15 09:26:26 UTC 2019

Modified Files:
        pkgsrc/devel/SDL [pkgsrc-2019Q2]: distinfo
        pkgsrc/devel/SDL/patches [pkgsrc-2019Q2]: patch-src_video_SDL__pixels.c

Log Message:
Pullup ticket #6052 - requested by maya
devel/SDL: NetBSD build fix (follow up to #6008)

Revisions pulled up:
- devel/SDL/distinfo                                            1.82
- devel/SDL/patches/patch-src_video_SDL__pixels.c               1.2

---
   Module Name:    pkgsrc
   Committed By:   micha
   Date:           Wed Jul 24 14:08:23 UTC 2019

   Modified Files:
           pkgsrc/devel/SDL: distinfo
           pkgsrc/devel/SDL/patches: patch-src_video_SDL__pixels.c

   Log Message:
   Fixed patch-src_video_SDL__pixels.c for NetBSD 7

   Declaration of local variable 'byte' moved out of for loop because this syntax
   requires C99 (breaks e.g. NetBSD 7 because LANGUAGES= c99 is not defined by
   package).


To generate a diff of this commit:
cvs rdiff -u -r1.80.14.1 -r1.80.14.2 pkgsrc/devel/SDL/distinfo
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
    pkgsrc/devel/SDL/patches/patch-src_video_SDL__pixels.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL/distinfo
diff -u pkgsrc/devel/SDL/distinfo:1.80.14.1 pkgsrc/devel/SDL/distinfo:1.80.14.2
--- pkgsrc/devel/SDL/distinfo:1.80.14.1 Tue Jul 23 11:19:51 2019
+++ pkgsrc/devel/SDL/distinfo   Sun Sep 15 09:26:26 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80.14.1 2019/07/23 11:19:51 bsiegert Exp $
+$NetBSD: distinfo,v 1.80.14.2 2019/09/15 09:26:26 bsiegert Exp $
 
 SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
 RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
@@ -12,7 +12,7 @@ SHA1 (patch-src_audio_dma_SDL__dmaaudio.
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = a20608d6a4cc8f2c8f5fb2d77a572f373178151b
 SHA1 (patch-src_video_SDL__bmp.c) = 87b14ee02315703479ce522299ffe8d9e83d7e06
-SHA1 (patch-src_video_SDL__pixels.c) = 4a6522ddfc370b2b7e216b79ea3b16a732ab9603
+SHA1 (patch-src_video_SDL__pixels.c) = e4c1feeda33cdd5e891ff203c573c5f578d17368
 SHA1 (patch-src_video_nanox_SDL__nxvideo.c) = 653ff4358d62f7093f646fba5ddae2921876144c
 SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8
 SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21

Index: pkgsrc/devel/SDL/patches/patch-src_video_SDL__pixels.c
diff -u pkgsrc/devel/SDL/patches/patch-src_video_SDL__pixels.c:1.1.2.2 pkgsrc/devel/SDL/patches/patch-src_video_SDL__pixels.c:1.1.2.3
--- pkgsrc/devel/SDL/patches/patch-src_video_SDL__pixels.c:1.1.2.2      Tue Jul 23 11:19:51 2019
+++ pkgsrc/devel/SDL/patches/patch-src_video_SDL__pixels.c      Sun Sep 15 09:26:26 2019
@@ -1,11 +1,15 @@
-$NetBSD: patch-src_video_SDL__pixels.c,v 1.1.2.2 2019/07/23 11:19:51 bsiegert Exp $
+$NetBSD: patch-src_video_SDL__pixels.c,v 1.1.2.3 2019/09/15 09:26:26 bsiegert Exp $
 
 CVE-2019-7637: Fix in integer overflow in SDL_CalculatePitch
 From https://hg.libsdl.org/SDL/rev/9b0e5c555c0f
 
+Local variable 'byte':
+Declaration moved out of for loop because this syntax requires C99
+(breaks e.g. NetBSD 7 because LANGUAGES= c99 is not defined by package)
+
 --- src/video/SDL_pixels.c.orig        2012-01-19 06:30:06.000000000 +0000
 +++ src/video/SDL_pixels.c
-@@ -286,26 +286,53 @@ void SDL_DitherColors(SDL_Color *colors,
+@@ -286,26 +286,54 @@ void SDL_DitherColors(SDL_Color *colors,
        }
  }
  /* 
@@ -17,11 +21,12 @@ From https://hg.libsdl.org/SDL/rev/9b0e5
  {
 -      Uint16 pitch;
 +      unsigned int pitch = 0;
++      Uint8 byte;  // Requires C99 if defined inside for loop
  
        /* Surface should be 4-byte aligned for speed */
 -      pitch = surface->w*surface->format->BytesPerPixel;
 +      /* The code tries to prevent from an Uint16 overflow. */;
-+      for (Uint8 byte = surface->format->BytesPerPixel; byte; byte--) {
++      for (byte = surface->format->BytesPerPixel; byte; byte--) {
 +              pitch += (unsigned int)surface->w;
 +              if (pitch < surface->w) {
 +                      SDL_SetError("A scanline is too wide");