[mupen64plus-input-sdl] 02/03: Import new gamepad layouts from upstream

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Fri Jan 1 11:49:27 UTC 2016


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 299c9ed09c0b12ac58576d1c927cf358fd541714
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jan 1 12:47:30 2016 +0100

    Import new gamepad layouts from upstream
---
 debian/changelog                                   | 25 ++++++++++
 debian/patches/Add-USB-Gamepad.patch               | 21 ++++++++
 .../Fixed-Xbox-360-Wireless-Receiver-section.patch | 30 ++++++++++++
 ...ixed-a-small-error-in-the-changed-section.patch | 23 +++++++++
 ...eneric-X-Box-pad-to-conform-to-the-README.patch | 47 ++++++++++++++++++
 ...48-adapter-auto-config-from-Brandon-Bundy.patch | 47 ++++++++++++++++++
 ...s-controller-auto-config-from-github-tick.patch | 43 +++++++++++++++++
 ...autoconfig-from-Marco-on-google-group-lis.patch | 46 ++++++++++++++++++
 ...ia-auto-config-from-alecjw-on-github-tick.patch | 44 +++++++++++++++++
 ...fig-section-for-Rock-Candy-gamepad-and-ne.patch | 54 +++++++++++++++++++++
 ...onfig-for-Logitech-F310-from-Marcus-Dean-.patch | 56 ++++++++++++++++++++++
 ...PS-Gamepad-from-Marcus-Dean-Adams-on-goog.patch | 26 ++++++++++
 ...yborg-Force-Rumble-Pad-auto-config-from-P.patch | 46 ++++++++++++++++++
 debian/patches/series                              | 12 +++++
 14 files changed, 520 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f07f77..19c24f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,31 @@ mupen64plus-input-sdl (2.5-3) UNRELEASED; urgency=medium
   * debian/control, debian/rules:
      - Drop mupen64plus-input-sdl-dbg in favor of -dbgsym package
   * Update copyright years in debian/copyright
+  * debian/patches:
+    - add-MayFlash-PC048-adapter-auto-config-from-Brandon-Bundy.patch
+      Add auto-config for MayFlash PC048 adapter
+    - new-Saitek-PLC-Cyborg-Force-Rumble-Pad-auto-config-from-P.patch
+      Add auto-config for Saitek PLC Cyborg Force Rumble Pad controller
+    - add-new-auto-config-section-for-Rock-Candy-gamepad-and-ne.patch
+      Add auto-config for Rock Candy controller
+    - add-OUYA-wireless-controller-auto-config-from-github-tick.patch
+      Add auto-config for OUYA Game controller
+    - add-another-huijia-auto-config-from-alecjw-on-github-tick.patch
+      Add auto-config for HuiJia controller
+    - added-specific-config-for-Logitech-F310-from-Marcus-Dean-.patch
+      Add auto-config for Logitech F310 controller
+    - Add-USB-Gamepad.patch,
+      Add auto-config for USB Gamepad controller
+    - fixes-for-Gasia-PS-Gamepad-from-Marcus-Dean-Adams-on-goog.patch,
+      Fix auto-configuration for Gasia PS Gamepad
+    - add-ShanWan-USB-autoconfig-from-Marco-on-google-group-lis.patch
+      Add auto-config for ShanWan USB WirelessGamepad controller
+    - Updated-Generic-X-Box-pad-to-conform-to-the-README.patch,
+      Fix Generic XBox gamepad layout
+    - Fixed-a-small-error-in-the-changed-section.patch,
+      Fix newline in XBox gamepad layout
+    - Fixed-Xbox-360-Wireless-Receiver-section.patch,
+      Fix Xbox 360 Wireless Receiver layout
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 30 Dec 2015 21:25:17 +0100
 
diff --git a/debian/patches/Add-USB-Gamepad.patch b/debian/patches/Add-USB-Gamepad.patch
new file mode 100644
index 0000000..55945f2
--- /dev/null
+++ b/debian/patches/Add-USB-Gamepad.patch
@@ -0,0 +1,21 @@
+From: Stefan <gizmo98 at users.noreply.github.com>
+Date: Wed, 7 Oct 2015 20:32:35 -0700
+Subject: Add "USB Gamepad "
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/dc33cef8360018782d6228836ce74d401f421059
+---
+ data/InputAutoCfg.ini | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 3111c97..7496f62 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -1704,6 +1704,7 @@ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
+ [USB,2-axis 8-button gamepad]
++[USB Gamepad ]
+ plugged = True
+ plugin = 2
+ mouse = False
diff --git a/debian/patches/Fixed-Xbox-360-Wireless-Receiver-section.patch b/debian/patches/Fixed-Xbox-360-Wireless-Receiver-section.patch
new file mode 100644
index 0000000..f46dbc5
--- /dev/null
+++ b/debian/patches/Fixed-Xbox-360-Wireless-Receiver-section.patch
@@ -0,0 +1,30 @@
+From: Eric Duhamel <ericxdu23 at gmail.com>
+Date: Wed, 21 Oct 2015 20:32:35 -0700
+Subject: Fixed "Xbox 360 Wireless Receiver" section
+
+Axes 3 and 4 were swapped
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/78d3a430657a64fcebda4edb47ba9fbc2c7eb75b
+---
+ data/InputAutoCfg.ini | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 6a191c2..4759f1a 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -751,10 +751,10 @@ Start = button(7)
+ Z Trig = axis(2+)
+ B Button = button(2)
+ A Button = button(0)
+-C Button R = axis(4+)
+-C Button L = axis(4-) button(3)
+-C Button D = axis(3+) button(1)
+-C Button U = axis(3-)
++C Button R = axis(3+)
++C Button L = axis(3-) button(3)
++C Button D = axis(4+) button(1)
++C Button U = axis(4-)
+ R Trig = button(5) axis(5+)
+ L Trig = button(4)
+ Mempak switch = 
diff --git a/debian/patches/Fixed-a-small-error-in-the-changed-section.patch b/debian/patches/Fixed-a-small-error-in-the-changed-section.patch
new file mode 100644
index 0000000..e9495c3
--- /dev/null
+++ b/debian/patches/Fixed-a-small-error-in-the-changed-section.patch
@@ -0,0 +1,23 @@
+From: Eric Duhamel <ericxdu23 at gmail.com>
+Date: Wed, 21 Oct 2015 20:32:35 -0700
+Subject: Fixed a small error in the changed section
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/2586367d2bb2b006ce6296898bc5f3b5db14a1a1
+---
+ data/InputAutoCfg.ini | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 8e00ded..6a191c2 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -1498,7 +1498,8 @@ C Button U = axis(4-)
+ R Trig = button(5) axis(5+)
+ L Trig = button(4)
+ Mempak switch = button(9)
+-Rumblepak switch = button(10)X Axis = axis(0-,0+)
++Rumblepak switch = button(10)
++X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
+ [OSX: USB GamePad]
diff --git a/debian/patches/Updated-Generic-X-Box-pad-to-conform-to-the-README.patch b/debian/patches/Updated-Generic-X-Box-pad-to-conform-to-the-README.patch
new file mode 100644
index 0000000..565f355
--- /dev/null
+++ b/debian/patches/Updated-Generic-X-Box-pad-to-conform-to-the-README.patch
@@ -0,0 +1,47 @@
+From: Eric Duhamel <ericxdu23 at gmail.com>
+Date: Wed, 21 Oct 2015 20:32:35 -0700
+Subject: Updated "Generic X-Box pad" to conform to the README
+
+The [Generic X-Box pad] section was misconfigured so I updated it
+to conform to the README. R-button, L-button, Z-trigger, B-button,
+and START are now properly mapped. I tested this config by playing
+Ocarina Of Time and the controller layout works well.
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/77229317d0cb50b28e10486465cb71d3837d4220
+---
+ data/InputAutoCfg.ini | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index e3ee62a..8e00ded 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -1487,19 +1487,18 @@ DPad R = hat(0 Right)
+ DPad L = hat(0 Left)
+ DPad D = hat(0 Down)
+ DPad U = hat(0 Up)
+-Start = button(6)
+-Z Trig = button(7)
+-B Button = button(1)
++Start = button(7)
++Z Trig = axis(2+)
++B Button = button(2)
+ A Button = button(0)
+ C Button R = axis(3+)
+-C Button L = axis(3-)
+-C Button D = axis(4+)
++C Button L = axis(3-) button(3)
++C Button D = axis(4+) button(1)
+ C Button U = axis(4-)
+-R Trig = axis(5+)
+-L Trig = axis(2+)
+-Mempak switch = button(5)
+-Rumblepak switch = button(2)
+-X Axis = axis(0-,0+)
++R Trig = button(5) axis(5+)
++L Trig = button(4)
++Mempak switch = button(9)
++Rumblepak switch = button(10)X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
+ [OSX: USB GamePad]
diff --git a/debian/patches/add-MayFlash-PC048-adapter-auto-config-from-Brandon-Bundy.patch b/debian/patches/add-MayFlash-PC048-adapter-auto-config-from-Brandon-Bundy.patch
new file mode 100644
index 0000000..550c35c
--- /dev/null
+++ b/debian/patches/add-MayFlash-PC048-adapter-auto-config-from-Brandon-Bundy.patch
@@ -0,0 +1,47 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Fri, 12 Jun 2015 21:30:05 -0700
+Subject: add MayFlash PC048 adapter auto-config from Brandon Bundy via the
+ google group
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/198b8a7f03d4ecc3fd941ce2cf08066324771fab
+---
+ data/InputAutoCfg.ini | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index f128e3b..2569f89 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -1483,6 +1483,32 @@ Rumblepak switch = key(114)
+ Y Axis = axis(1-,1+)
+ X Axis = axis(0-,0+)
+ 
++; MayFlash PC048 adapter
++[PS/SS/N64 Joypad to USB BOX]
++plugged = True
++plugin = 2
++mouse = False
++AnalogDeadzone = 1024,1024
++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(8)
++Z Trig = button(9)
++B Button = button(2)
++A Button = button(1)
++C Button R = axis(2-)
++C Button L = axis(2+)
++C Button D = axis(3+)
++C Button U = axis(3-)
++R Trig = button(7)
++L Trig = button(5)
++Mempak switch =
++Rumblepak switch =
++Y Axis = axis(1-,1+)
++X Axis = axis(0-,0+)
++
+ ; Asikgame - Super Dual Box (with two PS2 gamepads connected)
+ ; this is a 2-port USB device. The Right port is controller #1, the Left port is #2
+ [USB Human(2p) Interface Device]
diff --git a/debian/patches/add-OUYA-wireless-controller-auto-config-from-github-tick.patch b/debian/patches/add-OUYA-wireless-controller-auto-config-from-github-tick.patch
new file mode 100644
index 0000000..d57256a
--- /dev/null
+++ b/debian/patches/add-OUYA-wireless-controller-auto-config-from-github-tick.patch
@@ -0,0 +1,43 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Wed, 12 Aug 2015 14:26:57 -0700
+Subject: add OUYA wireless controller auto-config from github ticket #600
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/67b4aa7a33421c3bb6645c5e3e221efc1d392e00
+---
+ data/InputAutoCfg.ini | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 99a913e..9b410b4 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -922,6 +922,29 @@ Rumblepak switch =
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[OUYA Game Controller]
++plugged = True
++plugin = 2
++mouse = False
++Mempak switch =
++Rumblepak switch =
++DPad U = button(8)
++DPad D = button(9)
++DPad L = button(10)
++DPad R = button(11)
++Start = button(7)
++Z Trig = button(12)
++A Button = button(0)
++B Button = button(1)
++C Button U = axis(4-)
++C Button D = axis(4+)
++C Button L = axis(3-)
++C Button R = axis(3+)
++L Trig = button(4)
++R Trig = button(5)
++X Axis = axis(0-,0+)
++Y Axis = axis(1-,1+)
++
+ [PC Game Controller]
+ plugged = True
+ plugin = 2
diff --git a/debian/patches/add-ShanWan-USB-autoconfig-from-Marco-on-google-group-lis.patch b/debian/patches/add-ShanWan-USB-autoconfig-from-Marco-on-google-group-lis.patch
new file mode 100644
index 0000000..35e9a2d
--- /dev/null
+++ b/debian/patches/add-ShanWan-USB-autoconfig-from-Marco-on-google-group-lis.patch
@@ -0,0 +1,46 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Sun, 4 Oct 2015 20:32:35 -0700
+Subject: add ShanWan USB autoconfig from Marco on google group list: A
+ Playstation Clone, Rumble Trigger Incorrect
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/d8e1b5b0ad8404cfbcf496cb6c7beacc30dd032b
+---
+ data/InputAutoCfg.ini | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index ea90a69..e3ee62a 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -1196,6 +1196,31 @@ Rumblepak switch = axis(10+)
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[ShanWan USB WirelessGamepad]
++plugged = True
++plugin = 2
++mouse = False
++AnalogDeadzone = 4096,4096
++AnalogPeak = 32768,32768
++DPad R = axis(0+)
++DPad L = axis(0-)
++DPad D = axis(1+)
++DPad U = axis(1-)
++Start = button(9)
++Z Trig = button(8)
++B Button = button(3)
++A Button = button(2)
++C Button R = button(7)
++C Button L = button(6)
++C Button D = button(1)
++C Button U = button(0)
++R Trig = button(5)
++L Trig = button(4)
++Mempak switch = key(109)
++Rumblepak switch = key(114)
++Y Axis = axis(1-,1+)
++X Axis = axis(0-,0+)
++
+ [SZMY-POWER CO.,LTD. GAMEPAD 3 TURBO]
+ plugged = True
+ plugin = 2
diff --git a/debian/patches/add-another-huijia-auto-config-from-alecjw-on-github-tick.patch b/debian/patches/add-another-huijia-auto-config-from-alecjw-on-github-tick.patch
new file mode 100644
index 0000000..2f88a14
--- /dev/null
+++ b/debian/patches/add-another-huijia-auto-config-from-alecjw-on-github-tick.patch
@@ -0,0 +1,44 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Wed, 12 Aug 2015 14:26:57 -0700
+Subject: add another huijia auto-config from alecjw on github ticket #628
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/24cc611bdb2d031c1ec01cf6cc49f1fe99f04c28
+---
+ data/InputAutoCfg.ini | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 9b410b4..5efd57f 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -970,6 +970,30 @@ Rumblepak switch = key(114)
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++; this is also the MayFlash / HuiJia adapter
++[PS/SS/N64 Joypad to USB BOX]
++plugged=True
++plugin=2
++mouse=False
++AnalogDeadzone=1024,1024
++AnalogPeak=11000,11000
++DPad R=hat(0 right)
++DPad L=hat(0 left)
++DPad U=hat(0 up)
++DPad D=hat(0 down)
++Start=button(8)
++Z Trig=button(9)
++B Button=button(2)
++A Button=button(1)
++C Button R=axis(2-)
++C Button L=axis(2+)
++C Button U=axis(3-)
++C Button D=axis(3+)
++R Trig=button(7)
++L Trig=button(5)
++X Axis=axis(0-,0+)
++Y Axis=axis(1-,1+)
++
+ [Rock Candy Gamepad for PS3]
+ plugged = True
+ plugin = 2
diff --git a/debian/patches/add-new-auto-config-section-for-Rock-Candy-gamepad-and-ne.patch b/debian/patches/add-new-auto-config-section-for-Rock-Candy-gamepad-and-ne.patch
new file mode 100644
index 0000000..4d04eee
--- /dev/null
+++ b/debian/patches/add-new-auto-config-section-for-Rock-Candy-gamepad-and-ne.patch
@@ -0,0 +1,54 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Sun, 2 Aug 2015 14:26:57 -0700
+Subject: add new auto-config section for Rock Candy gamepad and new name for
+ GC/N64 to USB (Raphnet technologies USB converter)
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/b6486455a23313b488e8ab5b6e1a3939f5272fcd
+---
+ data/InputAutoCfg.ini | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 934ef8c..99a913e 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -228,6 +228,7 @@ Y Axis = axis(1-,1+)
+ 
+ ; raphnet technologies USB converter (http://www.raphnet-tech.com/)
+ [GC/N64_USB]
++[GC/N64 to USB, v2.9]
+ plugged = True
+ plugin = 2
+ mouse = False
+@@ -946,6 +947,31 @@ Rumblepak switch = key(114)
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[Rock Candy Gamepad for PS3]
++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(7)
++B Button = button(0)
++A Button = button(2)
++C Button R = axis(3+)
++C Button L = axis(3-)
++C Button D = axis(2+)
++C Button U = axis(2-)
++R Trig = button(6)
++L Trig = button(4)
++Mempak switch =
++Rumblepak switch =
++X Axis = axis(0-,0+)
++Y Axis = axis(1-,1+)
++
+ [PLAYSTATION(R)3 Controller]
+ [Sony PLAYSTATION(R)3 Controller]
+ [SHENGHIC 2009/0708ZXW-V1Inc. PLAYSTATION(R)3Conteroller]
diff --git a/debian/patches/added-specific-config-for-Logitech-F310-from-Marcus-Dean-.patch b/debian/patches/added-specific-config-for-Logitech-F310-from-Marcus-Dean-.patch
new file mode 100644
index 0000000..5617e35
--- /dev/null
+++ b/debian/patches/added-specific-config-for-Logitech-F310-from-Marcus-Dean-.patch
@@ -0,0 +1,56 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Thu, 1 Oct 2015 20:32:35 -0700
+Subject: added specific config for Logitech F310 from Marcus Dean Adams on
+ google group,
+ who suggested that this config is better than the old mapping which used the
+ same config as other XBox Clones
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/bcf6892ca613ae6471ddb01c15792878f30bad67
+---
+ data/InputAutoCfg.ini | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 5efd57f..3111c97 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -530,6 +530,31 @@ Rumblepak switch = button(7)
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[Logitech Gamepad F310]
++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(7)
++Z Trig = button(5)
++B Button = button(2)
++A Button = button(0)
++C Button R = axis(3+)
++C Button L = axis(3-)
++C Button D = axis(4+)
++C Button U = axis(4-)
++R Trig = axis(5-)
++L Trig = axis(2-)
++Mempak switch = button(1)
++Rumblepak switch = button(3)
++X Axis = axis(0-,0+)
++Y Axis = axis(1-,1+)
++
+ [Logitech Gamepad F710]
+ plugged = True
+ plugin = 2
+@@ -1407,7 +1432,6 @@ Y Axis = axis(1-,1+)
+ [Thrustmaster, Inc. Controller]
+ [Logitech Xbox Cordless Controller]
+ [Logitech Compact Controller for Xbox]
+-[Logitech Gamepad F310]
+ [Mad Catz Controller (unverified)]
+ [InterAct 'PowerPad Pro' X-Box pad (Germany)]
+ [Mad Catz Control Pad]
diff --git a/debian/patches/fixes-for-Gasia-PS-Gamepad-from-Marcus-Dean-Adams-on-goog.patch b/debian/patches/fixes-for-Gasia-PS-Gamepad-from-Marcus-Dean-Adams-on-goog.patch
new file mode 100644
index 0000000..7da3e2a
--- /dev/null
+++ b/debian/patches/fixes-for-Gasia-PS-Gamepad-from-Marcus-Dean-Adams-on-goog.patch
@@ -0,0 +1,26 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Sun, 18 Oct 2015 20:32:35 -0700
+Subject: fixes for Gasia PS Gamepad from Marcus Dean Adams on google group
+ email list
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/493b3a6b10d66e86375ef9a1c860593cdc3b8abf
+---
+ data/InputAutoCfg.ini | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 7496f62..ea90a69 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -208,9 +208,9 @@ mouse = False
+ AnalogDeadzone = 4096,4096
+ AnalogPeak = 32768,32768
+ DPad R = key(275) axis(0+) hat(0 Right)
+-DPad L = key(276) axis(0-)
++DPad L = key(276) axis(0-) hat(0 Left)
+ DPad D = key(274) axis(1+) hat(0 Down)
+-DPad U = key(273) axis(1-)
++DPad U = key(273) axis(1-) hat(0 Up)
+ Start = button(9)
+ Z Trig = button(6)
+ B Button = button(3)
diff --git a/debian/patches/new-Saitek-PLC-Cyborg-Force-Rumble-Pad-auto-config-from-P.patch b/debian/patches/new-Saitek-PLC-Cyborg-Force-Rumble-Pad-auto-config-from-P.patch
new file mode 100644
index 0000000..75c3c92
--- /dev/null
+++ b/debian/patches/new-Saitek-PLC-Cyborg-Force-Rumble-Pad-auto-config-from-P.patch
@@ -0,0 +1,46 @@
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Tue, 7 Jul 2015 22:33:14 -0700
+Subject: new Saitek PLC Cyborg Force Rumble Pad auto-config from Pierre
+ Neidhardt on the GG list
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-input-sdl/commit/681068aa0038d4c9684532e9ac0bcdd32427094a
+---
+ data/InputAutoCfg.ini | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
+index 2569f89..934ef8c 100644
+--- a/data/InputAutoCfg.ini
++++ b/data/InputAutoCfg.ini
+@@ -1073,6 +1073,31 @@ Rumblepak switch = axis(10+)
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[Saitek PLC Cyborg Force Rumble Pad]
++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(8)
++B Button = button(0)
++A Button = button(2)
++C Button R = button(5) axis(3+)
++C Button L = button(1) axis(3-)
++C Button D = button(3) axis(2+)
++C Button U = button(4) axis(2-)
++R Trig = button(7)
++L Trig = button(6)
++Mempak switch = button(11)
++Rumblepak switch = axis(10+)
++X Axis = axis(0-,0+)
++Y Axis = axis(1-,1+)
++
+ [SZMY-POWER CO.,LTD. GAMEPAD 3 TURBO]
+ plugged = True
+ plugin = 2
diff --git a/debian/patches/series b/debian/patches/series
index 6e0f989..6ff45b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,15 @@ add-auto-config-for-Snakebyte-PS3-style-USB-controll.patch
 add-auto-config-for-Super-Joy-Box-13-Gamecube-USB-ad.patch
 add-auto-config-for-Xiaomi-Bluetooth-Controller-from.patch
 add-auto-config-for-Logitech-F710-gamepad-by-me.patch
+add-MayFlash-PC048-adapter-auto-config-from-Brandon-Bundy.patch
+new-Saitek-PLC-Cyborg-Force-Rumble-Pad-auto-config-from-P.patch
+add-new-auto-config-section-for-Rock-Candy-gamepad-and-ne.patch
+add-OUYA-wireless-controller-auto-config-from-github-tick.patch
+add-another-huijia-auto-config-from-alecjw-on-github-tick.patch
+added-specific-config-for-Logitech-F310-from-Marcus-Dean-.patch
+Add-USB-Gamepad.patch
+fixes-for-Gasia-PS-Gamepad-from-Marcus-Dean-Adams-on-goog.patch
+add-ShanWan-USB-autoconfig-from-Marco-on-google-group-lis.patch
+Updated-Generic-X-Box-pad-to-conform-to-the-README.patch
+Fixed-a-small-error-in-the-changed-section.patch
+Fixed-Xbox-360-Wireless-Receiver-section.patch

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



More information about the Pkg-games-commits mailing list