CVS commit: [pkgsrc-2017Q2] pkgsrc/devel/SDL2

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat Sep 16 15:39:08 UTC 2017

Modified Files:
        pkgsrc/devel/SDL2 [pkgsrc-2017Q2]: distinfo
Added Files:
        pkgsrc/devel/SDL2/patches [pkgsrc-2017Q2]:
            patch-src_video_SDL__blit__N.c

Log Message:
Pullup ticket #5548 - requested by he
devel/SDL2: build fix for macppc

Revisions pulled up:
- devel/SDL2/distinfo                                           1.25
- devel/SDL2/patches/patch-src_video_SDL__blit__N.c             1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        he
   Date:                Tue Sep  5 09:02:18 UTC 2017

   Modified Files:
        pkgsrc/devel/SDL2: distinfo
   Added Files:
        pkgsrc/devel/SDL2/patches: patch-src_video_SDL__blit__N.c

   Log Message:
   Add a patch to move active code after declarations in the altivec case.
   No PKGREVISION bump, since this is a build fix only.

   To generate a diff of this commit:
   cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/SDL2/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/devel/SDL2/patches/patch-src_video_SDL__blit__N.c


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.4.1 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/devel/SDL2/patches/patch-src_video_SDL__blit__N.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/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.24 pkgsrc/devel/SDL2/distinfo:1.24.4.1
--- pkgsrc/devel/SDL2/distinfo:1.24     Thu Jan 26 03:46:20 2017
+++ pkgsrc/devel/SDL2/distinfo  Sat Sep 16 15:39:07 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2017/01/26 03:46:20 nat Exp $
+$NetBSD: distinfo,v 1.24.4.1 2017/09/16 15:39:07 spz Exp $
 
 SHA1 (SDL2-2.0.5.tar.gz) = c4f87580630387796df4ac87c362b4f9a721457e
 RMD160 (SDL2-2.0.5.tar.gz) = 91283ce74bd451e83651910259cf226cae70e4bb
@@ -8,5 +8,6 @@ SHA1 (patch-configure) = 5637a66f8890586
 SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 2c57a04b4c0bf2f07bde782b2cbf041694539349
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = fc2c8f50b55ae86a1f89e2b829322231240dee7d
 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 37f19752cbba8def12a210deafec66965e3ad9ac
+SHA1 (patch-src_video_SDL__blit__N.c) = 73c15497e94c94f27e1c0f7463cf711f084d0635
 SHA1 (patch-src_video_SDL__egl.c) = dc6e8044d060a134548f113602258a0155eaa4da
 SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0

Added files:

Index: pkgsrc/devel/SDL2/patches/patch-src_video_SDL__blit__N.c
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-src_video_SDL__blit__N.c:1.1.2.2
--- /dev/null   Sat Sep 16 15:39:08 2017
+++ pkgsrc/devel/SDL2/patches/patch-src_video_SDL__blit__N.c    Sat Sep 16 15:39:07 2017
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_video_SDL__blit__N.c,v 1.1.2.2 2017/09/16 15:39:07 spz Exp $
+
+Put code after declarations.
+
+--- src/video/SDL_blit_N.c.orig        2016-10-20 03:56:26.000000000 +0000
++++ src/video/SDL_blit_N.c
+@@ -118,12 +118,6 @@ calc_swizzle32(const SDL_PixelFormat * s
+         16, 8, 0, 24,
+         0, NULL
+     };
+-    if (!srcfmt) {
+-        srcfmt = &default_pixel_format;
+-    }
+-    if (!dstfmt) {
+-        dstfmt = &default_pixel_format;
+-    }
+     const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
+                                                        0x04, 0x04, 0x04, 0x04,
+                                                        0x08, 0x08, 0x08, 0x08,
+@@ -136,6 +130,13 @@ calc_swizzle32(const SDL_PixelFormat * s
+     Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
+     Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
+     Uint32 amask;
++
++    if (!srcfmt) {
++        srcfmt = &default_pixel_format;
++    }
++    if (!dstfmt) {
++        dstfmt = &default_pixel_format;
++    }
+     /* Use zero for alpha if either surface doesn't have alpha */
+     if (dstfmt->Amask) {
+         amask =