[mupen64plus-input-sdl] 192/196: Fix axis auto configuration for Playstation 4 controllers

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 9066946621d908858b73c4bdecfac04f5fea5baa
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jun 12 16:16:14 2015 +0200

    Fix axis auto configuration for Playstation 4 controllers
---
 debian/changelog                                   |  3 +-
 ...to-configuration-in-for-Playstation-4-con.patch | 57 +++++-----------------
 ...or-Sony-playstation-4-controller-and-rem.patch} | 16 +++---
 debian/patches/series                              |  1 +
 4 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41ae9c0..ccd1924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 mupen64plus-input-sdl (2.5-2) UNRELEASED; urgency=medium
 
   * debian/patches:
-    - Fix axis auto configuration in for Playstation 4 controllers
+    - Add add-config-for-Sony-playstation-4-controller-and-rem.patch,
+      Fix axis auto configuration in for Playstation 4 controllers
     - Move patches to alternative DEP-3 format and manage them with gbp pq
   * debian/control:
     - Change Vcs-Browser to new alioth CGit URL
diff --git a/debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch b/debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch
index 7b730d2..8bf098b 100644
--- a/debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch
+++ b/debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch
@@ -1,52 +1,21 @@
 From: Sven Eckelmann <sven at narfation.org>
 Date: Fri, 1 May 2015 16:56:19 +0200
-Subject: Fix axis auto configuration in for Playstation 4 controllers
+Subject: Fix axis auto configuration for Playstation 4 controllers
 
 ---
- data/InputAutoCfg.ini | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
+ data/InputAutoCfg.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 555490d..f19f7cc 100644
+index eb18c36..155c27a 100644
 --- a/data/InputAutoCfg.ini
 +++ b/data/InputAutoCfg.ini
-@@ -871,7 +871,6 @@ Y Axis = axis(1-,1+)
- 
- [PLAYSTATION(R)3 Controller]
- [Sony PLAYSTATION(R)3 Controller]
--[Sony Computer Entertainment Wireless Controller]
- [SHENGHIC 2009/0708ZXW-V1Inc. PLAYSTATION(R)3Conteroller]
- plugged = True
- plugin = 2
-@@ -897,6 +896,31 @@ Rumblepak switch =
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
- 
-+[Sony Computer Entertainment Wireless Controller]
-+plugged = True
-+plugin = 2
-+mouse = False
-+AnalogDeadzone = 4096,4096
-+AnalogPeak = 32768,32768
-+DPad R = hat(0 Right)
-+DPad L = hat(0 Left)
-+DPad D = hat(0 Down)
-+DPad U = hat(0 Up)
-+Start = button(9)
-+Z Trig = button(6)
-+B Button = button(0)
-+A Button = button(1)
-+C Button R = axis(2+)
-+C Button L = axis(2-)
-+C Button D = axis(5+)
-+C Button U = axis(5-)
-+R Trig = button(5)
-+L Trig = button(4)
-+Mempak switch = 
-+Rumblepak switch = 
-+X Axis = axis(0-,0+)
-+Y Axis = axis(1-,1+)
-+
- [SAITEK P880]
- plugged = True
- plugin = 2
+@@ -907,7 +907,7 @@ DPad L = hat(0 Left)
+ DPad D = hat(0 Down)
+ DPad U = hat(0 Up)
+ Start = button(9)
+-Z Trig = axis(3+)
++Z Trig = axis(3+) button(6)
+ B Button = button(0)
+ A Button = button(1)
+ C Button R = axis(2+)
diff --git a/debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch b/debian/patches/add-config-for-Sony-playstation-4-controller-and-rem.patch
similarity index 74%
copy from debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch
copy to debian/patches/add-config-for-Sony-playstation-4-controller-and-rem.patch
index 7b730d2..d78eb7a 100644
--- a/debian/patches/Fix-axis-auto-configuration-in-for-Playstation-4-con.patch
+++ b/debian/patches/add-config-for-Sony-playstation-4-controller-and-rem.patch
@@ -1,13 +1,15 @@
-From: Sven Eckelmann <sven at narfation.org>
-Date: Fri, 1 May 2015 16:56:19 +0200
-Subject: Fix axis auto configuration in for Playstation 4 controllers
+From: amietn <amietn at foobar>
+Date: Thu, 7 May 2015 15:22:51 +0200
+Subject: add config for Sony playstation 4 controller and remove conflicting
+ PS3 controller name
 
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/bb0ffc3f82174f371327b85750d93cd8b86f2518
 ---
  data/InputAutoCfg.ini | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 
 diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 555490d..f19f7cc 100644
+index 555490d..eb18c36 100644
 --- a/data/InputAutoCfg.ini
 +++ b/data/InputAutoCfg.ini
 @@ -871,7 +871,6 @@ Y Axis = axis(1-,1+)
@@ -33,7 +35,7 @@ index 555490d..f19f7cc 100644
 +DPad D = hat(0 Down)
 +DPad U = hat(0 Up)
 +Start = button(9)
-+Z Trig = button(6)
++Z Trig = axis(3+)
 +B Button = button(0)
 +A Button = button(1)
 +C Button R = axis(2+)
@@ -42,8 +44,8 @@ index 555490d..f19f7cc 100644
 +C Button U = axis(5-)
 +R Trig = button(5)
 +L Trig = button(4)
-+Mempak switch = 
-+Rumblepak switch = 
++Mempak switch =
++Rumblepak switch =
 +X Axis = axis(0-,0+)
 +Y Axis = axis(1-,1+)
 +
diff --git a/debian/patches/series b/debian/patches/series
index 6582c95..20fe112 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Add-workaround-for-missing-rumble-with-xboxdrv.patch
+add-config-for-Sony-playstation-4-controller-and-rem.patch
 Fix-axis-auto-configuration-in-for-Playstation-4-con.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git