proton-tkg: Add SDL joystick support patchset

Tk-Glitch · Mar 30, 2019 · 1760ad9 · 1760ad9
1 parent c16fe57
commit 1760ad9
Show file tree

Hide file tree

Showing 4 changed files with 2,598 additions and 3 deletions.
diff --git a/proton-tkg/README.md b/proton-tkg/README.md
@@ -50,8 +50,6 @@ You can also change their default values before building in your `proton-tkg.cfg
 
 - SteamVR support is missing for compatibility reasons.
 
-- Dinput SDL support is missing for lazyness reasons.
-
 - In the userpatches folder, you'll find three patches I decided against merging in the master patch for proton-tkg. You can put them in wine-tkg-git userpatches dir if you want to use them. They might not apply cleanly on older wine bases.
 
 - Proton-tkg builds will get installed in `~/.steam/root/compatibilitytools.d` directory. If you want to uninstall a build, just delete its folder there and restart Steam. **MAKE SURE NO STEAM GAME IS CURRENTLY SET TO USE THAT SPECIFIC VERSION BEFORE DELETION**
diff --git a/proton-tkg/proton-tkg.cfg b/proton-tkg/proton-tkg.cfg
@@ -5,6 +5,9 @@
 
 # PROTON-TKG OPTIONS
 
+# Proton SDL Joystick support
+_sdl_joy_support="true"
+
 # Disable nvapi and nvapi64 - Common fix for various games
 _proton_nvapi_disable="true"
 

diff --git a/wine-tkg-git/PKGBUILD b/wine-tkg-git/PKGBUILD
@@ -438,6 +438,7 @@ source=("$_winesrcdir"::"git://source.winehq.org/git/wine.git${_plain_commit}"
 		'high-core-count-fix.patch' # High core count setup fix for <=4.0
 		'msvcrt_nativebuiltin.patch' # Enforce mscvrt Dlls to native then builtin - from Proton
 		'nvidia-hate.patch' # novideo hate patch to disable nvapi, nvcuda etc.
+		'proton-sdl-joy.patch' # Proton SDL joystick support
 )
 
 if [ "$_EXTERNAL_INSTALL" == "true" ]; then
@@ -1044,6 +1045,10 @@ prepare() {
 	  if [ "$_msvcrt_nativebuiltin" == "true" ]; then
 	    _patchname='msvcrt_nativebuiltin.patch' && _patchmsg="Enforce msvcrt Dlls to native then builtin (from Proton)" && nonuser_patcher
 	  fi
+	  # SDL Joystick support - from Proton
+	  if [ "$_sdl_joy_support" == "true" ]; then
+	    _patchname='proton-sdl-joy.patch' && _patchmsg="Enable SDL Joystick support (from Proton)" && nonuser_patcher
+	  fi
 	fi
 
 	# wine user patches
@@ -1434,6 +1439,7 @@ md5sums=('SKIP'
          '498d9dea03eeedad973f7e33e11b48c0'
          'd047619c11d95c4c9bbefae564876950'
          '22d3b0b1ff7f2104312b5eb29959cb2e'
-         'bcf6dd7c16f37f20cca6ec4edfab5b34')
+         'bcf6dd7c16f37f20cca6ec4edfab5b34'
+         '52f11ca72f4ee06bd2a4bc2b0314e631')
 
 trap exit_cleanup EXIT