CVS commit: pkgsrc/devel/SDL2

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Sun Dec 11 19:42:46 UTC 2016

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

Log Message:
add patch to work around -Werror=declaration-after-statement on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.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/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.19 pkgsrc/devel/SDL2/Makefile:1.20
--- pkgsrc/devel/SDL2/Makefile:1.19     Sun Oct 30 18:10:21 2016
+++ pkgsrc/devel/SDL2/Makefile  Sun Dec 11 19:42:45 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/10/30 18:10:21 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/12/11 19:42:45 wiedi Exp $
 
 DISTNAME=      SDL2-2.0.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://www.libsdl.org/release/
 

Index: pkgsrc/devel/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.22 pkgsrc/devel/SDL2/distinfo:1.23
--- pkgsrc/devel/SDL2/distinfo:1.22     Sun Oct 30 18:10:21 2016
+++ pkgsrc/devel/SDL2/distinfo  Sun Dec 11 19:42:45 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/10/30 18:10:21 wiz Exp $
+$NetBSD: distinfo,v 1.23 2016/12/11 19:42:45 wiedi Exp $
 
 SHA1 (SDL2-2.0.5.tar.gz) = c4f87580630387796df4ac87c362b4f9a721457e
 RMD160 (SDL2-2.0.5.tar.gz) = 91283ce74bd451e83651910259cf226cae70e4bb
@@ -6,6 +6,7 @@ SHA512 (SDL2-2.0.5.tar.gz) = 6401f5df08c
 Size (SDL2-2.0.5.tar.gz) = 4209352 bytes
 SHA1 (patch-configure) = 7302a4fc6172b0cb1ca95f36d1cf8516afb6383c
 SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = a165f34d6ac26d7948a9c36981ea18e2b8bcfa9e
+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

Added files:

Index: pkgsrc/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.c
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.c:1.1
--- /dev/null   Sun Dec 11 19:42:46 2016
+++ pkgsrc/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.c       Sun Dec 11 19:42:46 2016
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_audio_sun_SDL__sunaudio.c,v 1.1 2016/12/11 19:42:46 wiedi Exp $
+
+move decleration up because SDL wants to use -Werror=declaration-after-statement
+
+--- src/audio/sun/SDL_sunaudio.c.orig  2016-10-20 03:56:26.000000000 +0000
++++ src/audio/sun/SDL_sunaudio.c
+@@ -193,6 +193,10 @@ SUNAUDIO_CloseDevice(_THIS)
+ static int
+ SUNAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
+ {
++#ifdef AUDIO_SETINFO
++    int enc;
++#endif
++    int desired_freq = 0;
+     const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
+     SDL_AudioFormat format = 0;
+     audio_info_t info;
+@@ -220,10 +224,7 @@ SUNAUDIO_OpenDevice(_THIS, void *handle,
+         return SDL_SetError("Couldn't open %s: %s", devname, strerror(errno));
+     }
+ 
+-#ifdef AUDIO_SETINFO
+-    int enc;
+-#endif
+-    int desired_freq = this->spec.freq;
++    desired_freq = this->spec.freq;
+ 
+     /* Determine the audio parameters from the AudioSpec */
+     switch (SDL_AUDIO_BITSIZE(this->spec.format)) {