summaryrefslogtreecommitdiffstats
path: root/source/l/SDL2
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-11-13 05:15:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-11-13 17:59:46 +0100
commit2520b90f18ab408818b967f77ef38c1be85de634 (patch)
treec07e9cf84c06eb9e4a8981d21cfc66fab58416d5 /source/l/SDL2
parentcb1323a95c7d3275677760efd96a3eb9824c8aa8 (diff)
downloadcurrent-2520b90f18ab408818b967f77ef38c1be85de634.tar.gz
current-2520b90f18ab408818b967f77ef38c1be85de634.tar.xz
Tue Nov 13 05:15:29 UTC 201820181113051529
d/python-setuptools-40.6.1-x86_64-1.txz: Upgraded. l/M2Crypto-0.31.0-x86_64-1.txz: Upgraded. l/SDL2-2.0.9-x86_64-2.txz: Rebuilt. Fixed use of SDL_syswm.h with SDL_PROTOTYPES_ONLY in C++ mode. Thanks to orbea. l/libtiff-4.0.10-x86_64-1.txz: Upgraded. This update fixes some denial of service security issues. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7456 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-8905 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10779 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10963 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-18661 (* Security fix *) l/netpbm-10.84.02-x86_64-1.txz: Upgraded. n/net-snmp-5.8-x86_64-2.txz: Rebuilt. Recompiled to link the perl modules to the new libraries. Thanks to th_r.
Diffstat (limited to 'source/l/SDL2')
-rw-r--r--source/l/SDL2/SDL2.SDL_syswm.h.diff42
-rwxr-xr-xsource/l/SDL2/SDL2.SlackBuild4
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 000000000..4f743fc47
--- /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 ed22419cb..5c57685ad 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 \) \