diff options
Diffstat (limited to 'devel/SDL2')
-rw-r--r-- | devel/SDL2/Makefile | 4 | ||||
-rw-r--r-- | devel/SDL2/distinfo | 10 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-configure | 4 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c | 31 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_SDL__egl.c | 4 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c | 6 |
6 files changed, 43 insertions, 16 deletions
diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile index c9cf19f7e29..b7d59362994 100644 --- a/devel/SDL2/Makefile +++ b/devel/SDL2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2017/01/21 20:06:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2017/01/26 03:46:20 nat Exp $ DISTNAME= SDL2-2.0.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ diff --git a/devel/SDL2/distinfo b/devel/SDL2/distinfo index 2d2cb0dbead..d7b51d9fa88 100644 --- a/devel/SDL2/distinfo +++ b/devel/SDL2/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.23 2016/12/11 19:42:45 wiedi Exp $ +$NetBSD: distinfo,v 1.24 2017/01/26 03:46:20 nat Exp $ SHA1 (SDL2-2.0.5.tar.gz) = c4f87580630387796df4ac87c362b4f9a721457e RMD160 (SDL2-2.0.5.tar.gz) = 91283ce74bd451e83651910259cf226cae70e4bb SHA512 (SDL2-2.0.5.tar.gz) = 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 Size (SDL2-2.0.5.tar.gz) = 4209352 bytes -SHA1 (patch-configure) = 7302a4fc6172b0cb1ca95f36d1cf8516afb6383c -SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = a165f34d6ac26d7948a9c36981ea18e2b8bcfa9e +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__egl.c) = d65856e98b2e49dd364440372ce37679a6f2982b -SHA1 (patch-src_video_x11_SDL__x11opengl.c) = a435634da8b8bd5e74a281b9a26e8fb8a294e56b +SHA1 (patch-src_video_SDL__egl.c) = dc6e8044d060a134548f113602258a0155eaa4da +SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0 diff --git a/devel/SDL2/patches/patch-configure b/devel/SDL2/patches/patch-configure index c028e5c0dbf..7181b1e74dc 100644 --- a/devel/SDL2/patches/patch-configure +++ b/devel/SDL2/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.5 2016/10/30 18:10:21 wiz Exp $ +$NetBSD: patch-configure,v 1.6 2017/01/26 03:46:20 nat Exp $ Adding --enable-new-dtags breaks sdl2-config on NetBSD. ---- configure.orig 2016-10-30 17:14:52.932037095 +0000 +--- configure.orig 2016-10-20 03:56:27.000000000 +0000 +++ configure @@ -23955,7 +23955,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : diff --git a/devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c b/devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c index a9833394c8f..94df7cbbcf0 100644 --- a/devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c +++ b/devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c @@ -1,12 +1,31 @@ -$NetBSD: patch-src_audio_bsd_SDL__bsdaudio.c,v 1.4 2016/10/30 10:37:17 wiz Exp $ +$NetBSD: patch-src_audio_bsd_SDL__bsdaudio.c,v 1.5 2017/01/26 03:46:20 nat Exp $ # Remove delay as there is already an inherent delay in writing audio. https://bugzilla.libsdl.org/show_bug.cgi?id=3177 # audio_prinfo needs 'struct' on NetBSD. +# Use correct prinfo. +# Inform upper layer of blocksize. --- src/audio/bsd/SDL_bsdaudio.c.orig 2016-10-20 03:56:26.000000000 +0000 +++ src/audio/bsd/SDL_bsdaudio.c +@@ -62,14 +62,14 @@ BSDAUDIO_Status(_THIS) + #ifdef DEBUG_AUDIO + /* *INDENT-OFF* */ + audio_info_t info; +- const audio_prinfo *prinfo; ++ const struct audio_prinfo *prinfo; + + if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) { + fprintf(stderr, "AUDIO_GETINFO failed.\n"); + return; + } + +- prinfo = this->iscapture ? &info.play : &info.record; ++ prinfo = this->iscapture ? &info.record : &info.play; + + fprintf(stderr, "\n" + "[%s info]\n" @@ -190,10 +190,6 @@ BSDAUDIO_PlayDevice(_THIS) fprintf(stderr, "Wrote %d bytes of audio data\n", written); #endif @@ -23,7 +42,15 @@ https://bugzilla.libsdl.org/show_bug.cgi?id=3177 SDL_AudioFormat format = 0; audio_info_t info; - audio_prinfo *prinfo = iscapture ? &info.play : &info.record; -+ struct audio_prinfo *prinfo = iscapture ? &info.play : &info.record; ++ struct audio_prinfo *prinfo = iscapture ? &info.record : &info.play; /* We don't care what the devname is...we'll try to open anything. */ /* ...but default to first name in the list... */ +@@ -372,6 +368,7 @@ BSDAUDIO_OpenDevice(_THIS, void *handle, + (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info); + (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info); + this->spec.freq = prinfo->sample_rate; ++ this->spec.size = info.blocksize; + + if (!iscapture) { + /* Allocate mixing buffer */ diff --git a/devel/SDL2/patches/patch-src_video_SDL__egl.c b/devel/SDL2/patches/patch-src_video_SDL__egl.c index adb40d9cb9c..a6b5fcfd259 100644 --- a/devel/SDL2/patches/patch-src_video_SDL__egl.c +++ b/devel/SDL2/patches/patch-src_video_SDL__egl.c @@ -1,6 +1,6 @@ -$NetBSD: patch-src_video_SDL__egl.c,v 1.3 2016/01/03 11:15:12 wiz Exp $ +$NetBSD: patch-src_video_SDL__egl.c,v 1.4 2017/01/26 03:46:20 nat Exp $ ---- src/video/SDL_egl.c.orig 2016-01-02 19:56:31.000000000 +0000 +--- src/video/SDL_egl.c.orig 2016-10-20 03:56:26.000000000 +0000 +++ src/video/SDL_egl.c @@ -40,10 +40,10 @@ diff --git a/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c b/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c index 284917fdd12..23f27d6d1a4 100644 --- a/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c +++ b/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c @@ -1,10 +1,10 @@ -$NetBSD: patch-src_video_x11_SDL__x11opengl.c,v 1.1 2015/02/03 08:50:44 snj Exp $ +$NetBSD: patch-src_video_x11_SDL__x11opengl.c,v 1.2 2017/01/26 03:46:20 nat Exp $ NetBSD's libGL version differs between xsrc and pkgsc. All hail the mighty symlink. ---- src/video/x11/SDL_x11opengl.c.orig 2014-03-15 19:31:44.000000000 -0700 -+++ src/video/x11/SDL_x11opengl.c 2015-02-03 00:25:04.000000000 -0800 +--- src/video/x11/SDL_x11opengl.c.orig 2016-10-20 03:56:26.000000000 +0000 ++++ src/video/x11/SDL_x11opengl.c @@ -38,6 +38,8 @@ #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib" #elif defined(__QNXNTO__) |