diff options
author | he <he@pkgsrc.org> | 2017-09-05 09:02:18 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2017-09-05 09:02:18 +0000 |
commit | 49f7f24be79ec8b7f26d8f7d99963310ecbfc977 (patch) | |
tree | b89ef8b93f29f6160d033f73521f1248eb9c3d80 /devel | |
parent | 231a0fcba3b4f902a1456b8355ace46cd19c0b5c (diff) | |
download | pkgsrc-49f7f24be79ec8b7f26d8f7d99963310ecbfc977.tar.gz |
Add a patch to move active code after declarations in the altivec case.
No PKGREVISION bump, since this is a build fix only.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/SDL2/distinfo | 3 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_SDL__blit__N.c | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/devel/SDL2/distinfo b/devel/SDL2/distinfo index d7b51d9fa88..87bcce2068a 100644 --- a/devel/SDL2/distinfo +++ b/devel/SDL2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2017/01/26 03:46:20 nat Exp $ +$NetBSD: distinfo,v 1.25 2017/09/05 09:02:18 he Exp $ SHA1 (SDL2-2.0.5.tar.gz) = c4f87580630387796df4ac87c362b4f9a721457e RMD160 (SDL2-2.0.5.tar.gz) = 91283ce74bd451e83651910259cf226cae70e4bb @@ -8,5 +8,6 @@ SHA1 (patch-configure) = 5637a66f8890586026034f5324829e61c94ac5be 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 diff --git a/devel/SDL2/patches/patch-src_video_SDL__blit__N.c b/devel/SDL2/patches/patch-src_video_SDL__blit__N.c new file mode 100644 index 00000000000..92a48e585a8 --- /dev/null +++ b/devel/SDL2/patches/patch-src_video_SDL__blit__N.c @@ -0,0 +1,33 @@ +$NetBSD: patch-src_video_SDL__blit__N.c,v 1.1 2017/09/05 09:02:18 he 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 = |