diff options
Diffstat (limited to 'source/l/SDL2')
-rw-r--r-- | source/l/SDL2/SDL2.SDL_syswm.h.diff | 42 | ||||
-rwxr-xr-x | source/l/SDL2/SDL2.SlackBuild | 4 |
2 files changed, 45 insertions, 1 deletions
diff --git a/source/l/SDL2/SDL2.SDL_syswm.h.diff b/source/l/SDL2/SDL2.SDL_syswm.h.diff new file mode 100644 index 00000000..4f743fc4 --- /dev/null +++ b/source/l/SDL2/SDL2.SDL_syswm.h.diff @@ -0,0 +1,42 @@ + +# HG changeset patch +# User Ozkan Sezer <sezeroz@gmail.com> +# Date 1541526624 -10800 +# Node ID 244cdac21bcdd0e4a6152ad7c28756bcb39c4aa9 +# Parent 50b071ef40ab427420dbe91212473e88c7d42155 +fix bug #4362 - SDL_syswm.h with SDL_PROTOTYPES_ONLY broken in C++ mode + +diff -r 50b071ef40ab -r 244cdac21bcd include/SDL_syswm.h +--- a/include/SDL_syswm.h Sun Nov 04 21:11:07 2018 -0500 ++++ b/include/SDL_syswm.h Tue Nov 06 20:50:24 2018 +0300 +@@ -41,9 +41,9 @@ + * an unhandled window event occurs. This event is ignored by default, but + * you can enable it with SDL_EventState(). + */ +-#ifdef SDL_PROTOTYPES_ONLY + struct SDL_SysWMinfo; +-#else ++ ++#if !defined(SDL_PROTOTYPES_ONLY) + + #if defined(SDL_VIDEO_DRIVER_WINDOWS) + #ifndef WIN32_LEAN_AND_MEAN +@@ -103,6 +103,8 @@ + #if defined(SDL_VIDEO_DRIVER_VIVANTE) + #include "SDL_egl.h" + #endif ++#endif /* SDL_PROTOTYPES_ONLY */ ++ + + #include "begin_code.h" + /* Set up for C function definitions, even when using C++ */ +@@ -110,6 +112,7 @@ + extern "C" { + #endif + ++#if !defined(SDL_PROTOTYPES_ONLY) + /** + * These are the various supported windowing subsystems + */ + + diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild index ed22419c..5c57685a 100755 --- a/source/l/SDL2/SDL2.SlackBuild +++ b/source/l/SDL2/SDL2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=SDL2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,6 +78,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +zcat $CWD/SDL2.SDL_syswm.h.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |