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 06f16d93eb5871c859a9cbccb6adfc36b0dc062b Author: Sven Eckelmann <[email protected]> Date: Fri Dec 13 17:25:51 2013 +0100 Synchronize Xbox360 wireless controller autoconfiguration --- debian/changelog | 3 +- .../autoconfig_nintendo_wii_remote_pro.patch | 2 +- debian/patches/autoconfig_retrolink_n64.patch | 2 +- .../autoconfig_sidewinder_gamepad_pro.patch | 2 +- debian/patches/autoconfig_xbox360_refined.patch | 57 ---------------------- debian/patches/autoconfig_xinput.patch | 44 +++++++++++++++++ debian/patches/series | 2 +- 7 files changed, 50 insertions(+), 62 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c4acfb..5d00f5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ mupen64plus-input-sdl (2.0-3) UNRELEASED; urgency=low * debian/patches: - - Add autoconfig_xbox360_refined.patch, Refine autoconfiguration for XBox360 - Add autoconfig_sidewinder_gamepad_pro.patch, Add support for Microsoft SideWinder Game Pad Pro USB version 1.0 - Add autoconfig_retrolink_n64.patch, Add support for Retrolink N64 USB @@ -10,6 +9,8 @@ mupen64plus-input-sdl (2.0-3) UNRELEASED; urgency=low Wii Remote Pro Controller - Add fallback_nomousegrab.patch, fall back to key/joy mappings for a controller with mouse=true when the mouse is not grabbed + - Add autoconfig_xinput.patch, Add support for XInput version of Xbox360 + controller * Upgraded to policy 3.9.5, no changes required -- Sven Eckelmann <[email protected]> Fri, 06 Sep 2013 15:41:35 +0200 diff --git a/debian/patches/autoconfig_nintendo_wii_remote_pro.patch b/debian/patches/autoconfig_nintendo_wii_remote_pro.patch index 8527389..8daf560 100644 --- a/debian/patches/autoconfig_nintendo_wii_remote_pro.patch +++ b/debian/patches/autoconfig_nintendo_wii_remote_pro.patch @@ -3,7 +3,7 @@ Author: Richard Goedeken<[email protected]> --- diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini -index 418db961ea650ee5a12011cafc50c913bda021ba..17dface4fa76d224b75e744084e68c88d3591829 100644 +index 6b595fc4d4c22ac17b4678a06a42c28895177ec0..7643dd170ef2cdded29e686cb097c21cac738a06 100644 --- a/data/InputAutoCfg.ini +++ b/data/InputAutoCfg.ini @@ -564,6 +564,31 @@ Rumblepak switch = button(15) diff --git a/debian/patches/autoconfig_retrolink_n64.patch b/debian/patches/autoconfig_retrolink_n64.patch index 16532bf..a0bdb79 100644 --- a/debian/patches/autoconfig_retrolink_n64.patch +++ b/debian/patches/autoconfig_retrolink_n64.patch @@ -3,7 +3,7 @@ Author: William Shipley <[email protected]> --- diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini -index d2aff64f0e5c387ee0bc5944fceb51324018699a..418db961ea650ee5a12011cafc50c913bda021ba 100644 +index fcfa506ae061b65d8119749b32822a2e013be363..6b595fc4d4c22ac17b4678a06a42c28895177ec0 100644 --- a/data/InputAutoCfg.ini +++ b/data/InputAutoCfg.ini @@ -176,6 +176,32 @@ Rumblepak switch = diff --git a/debian/patches/autoconfig_sidewinder_gamepad_pro.patch b/debian/patches/autoconfig_sidewinder_gamepad_pro.patch index d126a4b..cde26bd 100644 --- a/debian/patches/autoconfig_sidewinder_gamepad_pro.patch +++ b/debian/patches/autoconfig_sidewinder_gamepad_pro.patch @@ -3,7 +3,7 @@ Author: Gre Pronk <[email protected]> --- diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini -index 044dee11ea4a339ffd50e54e0215caf515651aa6..d2aff64f0e5c387ee0bc5944fceb51324018699a 100644 +index f73bc9818e18d48d9c32bba0fe6ea3758130c18b..fcfa506ae061b65d8119749b32822a2e013be363 100644 --- a/data/InputAutoCfg.ini +++ b/data/InputAutoCfg.ini @@ -1067,4 +1067,27 @@ Rumblepak switch= button(20) diff --git a/debian/patches/autoconfig_xbox360_refined.patch b/debian/patches/autoconfig_xbox360_refined.patch deleted file mode 100644 index eb80334..0000000 --- a/debian/patches/autoconfig_xbox360_refined.patch +++ /dev/null @@ -1,57 +0,0 @@ -Description: Refine autoconfiguration for XBox360 - * Z trigger now binds to X360's L button, and R trigger to X360's R button; as - those two are the most used, and I found X360's L/R buttons more comfortable - than triggers to this purpose. Consequence is that L trigger now binds to - X360's trigger (only when is pressed). Thoughts? - * C buttons now have the correct axes. - * I put Mempak switch as Back (or Select) button, and Rumblepak switch as - X360's Start button. Consequence is that N64's Start button is now binded to - X360's guide button. Reason I did this is because some games supports both, - and I wouldn't bother with stick buttons as they may be accidentally - clicked, so I found Back/Start buttons more suitable to this purpose. - * I added the button variables along with hat to the D-pad, so it works again. -Bug: https://code.google.com/p/mupen64plus/issues/detail?id=576 -Author: [email protected] - ---- -diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini -index f73bc9818e18d48d9c32bba0fe6ea3758130c18b..044dee11ea4a339ffd50e54e0215caf515651aa6 100644 ---- a/data/InputAutoCfg.ini -+++ b/data/InputAutoCfg.ini -@@ -469,22 +469,22 @@ 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 = axis(2+) -+DPad R = hat(0 Right) button(12) -+DPad L = hat(0 Left) button(11) -+DPad D = hat(0 Down) button(14) -+DPad U = hat(0 Up) button(13) -+Start = button(8) -+Z Trig = button(4) - 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-) --R Trig = button(5) axis(2-) --L Trig = button(4) --Mempak switch = --Rumblepak switch = -+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) -+L Trig = axis(2+) -+Mempak switch = button(6) -+Rumblepak switch = button(7) - X Axis = axis(0-,0+) - Y Axis = axis(1-,1+) - diff --git a/debian/patches/autoconfig_xinput.patch b/debian/patches/autoconfig_xinput.patch new file mode 100644 index 0000000..e4c5fd1 --- /dev/null +++ b/debian/patches/autoconfig_xinput.patch @@ -0,0 +1,44 @@ +Description: Add support for XInput version of Xbox360 controller +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini +index 7643dd170ef2cdded29e686cb097c21cac738a06..311caef50718c501b56bf75f328ca09e2b47fb7d 100644 +--- a/data/InputAutoCfg.ini ++++ b/data/InputAutoCfg.ini +@@ -514,6 +514,35 @@ Rumblepak switch = + X Axis = axis(0-,0+) + Y Axis = axis(1-,1+) + ++[XInput: Microsoft X-Box 360 pad] ++[XInput: Controller (XBOX 360 For Windows)] ++[XInput: XBOX 360 For Windows (Controller)] ++[XInput: XBOX 360 For Windows] ++[XInput: Xbox 360 Wireless Receiver] ++plugged = True ++plugin = 2 ++mouse = False ++AnalogDeadzone = 4096,4096 ++AnalogPeak = 32768,32768 ++DPad R = button(3) ++DPad L = button(2) ++DPad D = button(1) ++DPad U = button(0) ++Start = button(4) ++Z Trig = axis(4+) ++B Button = button(12) ++A Button = button(10) ++C Button R = axis(2+) ++C Button L = axis(2-) button(13) ++C Button D = axis(3+) button(11) ++C Button U = axis(3-) ++R Trig = button(9) axis(5+) ++L Trig = button(8) ++Mempak switch = ++Rumblepak switch = ++X Axis = axis(0-,0+) ++Y Axis = axis(1-,1+) ++ + [N64 controller] + plugged = True + plugin = 2 diff --git a/debian/patches/series b/debian/patches/series index d899267..29a3ef4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,8 +6,8 @@ autoconfig_jess_controller.patch autoconfig_wiimote_classic.patch autoconfig_szmy_gamepad3.patch autoconfig_twin_gamepad.patch -autoconfig_xbox360_refined.patch autoconfig_sidewinder_gamepad_pro.patch autoconfig_retrolink_n64.patch autoconfig_nintendo_wii_remote_pro.patch fallback_nomousegrab.patch +autoconfig_xinput.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
