3 files changed, 2 insertions, 67 deletions
diff --git a/source/l/SDL2/SDL2.SDL_syswm.h.diff b/source/l/SDL2/SDL2.SDL_syswm.h.diff
deleted file mode 100644
index 4f743fc4..00000000
--- a/source/l/SDL2/SDL2.SDL_syswm.h.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# 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 0599ad64..5ec36ad9 100755
--- a/source/l/SDL2/SDL2.SlackBuild
+++ b/source/l/SDL2/SDL2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,9 +78,6 @@ 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
-zcat $CWD/SDL2.periodic.magnitude.patch.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 \) \
diff --git a/source/l/SDL2/SDL2.periodic.magnitude.patch b/source/l/SDL2/SDL2.periodic.magnitude.patch
deleted file mode 100644
index 2ac8756c..00000000
--- a/source/l/SDL2/SDL2.periodic.magnitude.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Ethan Lee <flibitijibibo@flibitijibibo.com>
-# Date 1544124378 18000
-# Node ID 1f8d0b1afe07d1cef54d05b46770ac2c5c8f0c09
-# Parent  99d8b18acf8a2a5f8344150ca55c3b3f382bab2f
-Linux Haptic: Fix periodic.magnitude value
-
-diff -r 99d8b18acf8a -r 1f8d0b1afe07 src/haptic/linux/SDL_syshaptic.c
---- a/src/haptic/linux/SDL_syshaptic.c	Sat Dec 08 11:22:50 2018 -0800
-+++ b/src/haptic/linux/SDL_syshaptic.c	Thu Dec 06 14:26:18 2018 -0500
-@@ -801,8 +801,7 @@
-         else if (periodic->type == SDL_HAPTIC_SAWTOOTHDOWN)
-             dest->u.periodic.waveform = FF_SAW_DOWN;
-         dest->u.periodic.period = CLAMP(periodic->period);
--        /* Linux expects 0-65535, so multiply by 2 */
--        dest->u.periodic.magnitude = CLAMP(periodic->magnitude) * 2;
-+        dest->u.periodic.magnitude = periodic->magnitude;
-         dest->u.periodic.offset = periodic->offset;
-         /* Linux phase is defined in interval "[0x0000, 0x10000[", corresponds with "[0deg, 360deg[" phase shift. */
-         dest->u.periodic.phase = ((Uint32)periodic->phase * 0x10000U) / 36000;