[mupen64plus-input-sdl] 137/196: Revert "Convert predefined SDL1.2 Keycodes to SDL2 Scancodes"
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:00:32 UTC 2015
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 9fabe6d53d79f46e6af39cf481493690432b8081
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jun 22 13:49:38 2013 +0200
Revert "Convert predefined SDL1.2 Keycodes to SDL2 Scancodes"
It is easier for the user to keep the old config. Therefore, a converter
between SDL2 and SDL1.2 will be added.
This reverts commit b66c2ee4a1bde33692b5a0f68c8b8cc376c1f409.
Conflicts:
debian/patches/series
---
debian/changelog | 2 -
debian/patches/sdl2_scancodes.patch | 172 ------------------------------------
debian/patches/series | 1 -
3 files changed, 175 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dd32246..894f5db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,6 @@ mupen64plus-input-sdl (2.0~rc2+1+9aaeab081d97-2) UNRELEASED; urgency=low
* debian/control:
- Depend on libsdl2-dev instead of libsdl1.2-dev
* debian/patches:
- - Add sdl2_scancodes.patch, Convert predefined SDL1.2 Keycodes to
- SDL2 Scancodes
- Add sdl2_forcefeedback.patch, Use SDL2 to play force feedback effects
-- Sven Eckelmann <sven at narfation.org> Sun, 09 Jun 2013 22:36:16 +0200
diff --git a/debian/patches/sdl2_scancodes.patch b/debian/patches/sdl2_scancodes.patch
deleted file mode 100644
index d29eae7..0000000
--- a/debian/patches/sdl2_scancodes.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Description: Convert predefined SDL1.2 Keycodes to SDL2 Scancodes
- SDL2 uses USB scancodes and not the old SDL keycodes. These
- values have to be changed in the InputAutoCfg.ini to automatically
- load the right values for the user when using the Keyboard.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index a33a64cf6d51b5a213abbf71f50a6b4bfc27fc52..68f1fe59c8d126efcadd1684c982dabedf4d7de2 100644
---- a/data/InputAutoCfg.ini
-+++ b/data/InputAutoCfg.ini
-@@ -4,24 +4,24 @@
- plugged = True
- plugin = 2
- mouse = False
--DPad R = key(100)
--DPad L = key(97)
--DPad D = key(115)
--DPad U = key(119)
--Start = key(13)
--Z Trig = key(122)
--B Button = key(306)
--A Button = key(304)
--C Button R = key(108)
--C Button L = key(106)
--C Button D = key(107)
--C Button U = key(105)
--R Trig = key(99)
--L Trig = key(120)
--Mempak switch = key(44)
--Rumblepak switch = key(46)
--X Axis = key(276,275)
--Y Axis = key(273,274)
-+DPad R = key(7)
-+DPad L = key(4)
-+DPad D = key(22)
-+DPad U = key(26)
-+Start = key(40)
-+Z Trig = key(29)
-+B Button = key(224)
-+A Button = key(225)
-+C Button R = key(15)
-+C Button L = key(13)
-+C Button D = key(14)
-+C Button U = key(12)
-+R Trig = key(6)
-+L Trig = key(27)
-+Mempak switch = key(54)
-+Rumblepak switch = key(55)
-+X Axis = key(80,79)
-+Y Axis = key(82,81)
-
- ; Boom Smart Joy Converter
- [HID 6666:0667]
-@@ -44,8 +44,8 @@ C Button D = button(2)
- C Button U = button(0)
- R Trig = button(7)
- L Trig = button(6)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
-@@ -80,10 +80,10 @@ plugin = 2
- mouse = False
- AnalogDeadzone = 4096,4096
- AnalogPeak = 32768,32768
--DPad R = key(275) axis(0+)
--DPad L = key(276) axis(0-)
--DPad D = key(274) axis(1+)
--DPad U = key(273) axis(1-)
-+DPad R = key(79) axis(0+)
-+DPad L = key(80) axis(0-)
-+DPad D = key(81) axis(1+)
-+DPad U = key(82) axis(1-)
- Start = button(9)
- Z Trig = button(4)
- B Button = button(3)
-@@ -131,10 +131,10 @@ plugin = 2
- mouse = False
- AnalogDeadzone = 4096,4096
- AnalogPeak = 32768,32768
--DPad R = key(275) axis(0+) hat(0 Right)
--DPad L = key(276) axis(0-)
--DPad D = key(274) axis(1+) hat(0 Down)
--DPad U = key(273) axis(1-)
-+DPad R = key(79) axis(0+) hat(0 Right)
-+DPad L = key(80) axis(0-)
-+DPad D = key(81) axis(1+) hat(0 Down)
-+DPad U = key(82) axis(1-)
- Start = button(9)
- Z Trig = button(6)
- B Button = button(3)
-@@ -483,8 +483,8 @@ C Button D = button(3)
- C Button U = button(6)
- R Trig = button(8)
- L Trig = button(7)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
-@@ -508,8 +508,8 @@ C Button D = button(2)
- C Button U = button(0)
- R Trig = button(7)
- L Trig = button(6)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
-@@ -814,8 +814,8 @@ C Button D = axis(0+)
- C Button U = axis(0-)
- R Trig = button(7)
- L Trig = button(6)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(2-,2+)
- Y Axis = axis(3-,3+)
- __NextController:
-@@ -838,8 +838,8 @@ C Button D = axis(4+)
- C Button U = axis(4-)
- R Trig = button(23)
- L Trig = button(22)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(6-,6+)
- Y Axis = axis(7-,7+)
-
-@@ -863,8 +863,8 @@ C Button D = axis(2+)
- C Button U = axis(2-)
- R Trig = button(7)
- L Trig = button(6)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
- __NextController:
-@@ -887,8 +887,8 @@ C Button D = axis(6+)
- C Button U = axis(6-)
- R Trig = button(23)
- L Trig = button(22)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- X Axis = axis(4-,4+)
- Y Axis = axis(5-,5+)
-
-@@ -914,8 +914,8 @@ C Button D = axis(2+)
- C Button U = axis(2-)
- R Trig = button(7)
- L Trig = button(6)
--Mempak switch = key(109)
--Rumblepak switch = key(114)
-+Mempak switch = key(16)
-+Rumblepak switch = key(21)
- Y Axis = axis(1-,1+)
- X Axis = axis(0-,0+)
-
diff --git a/debian/patches/series b/debian/patches/series
index cb89e5b..e5e4f37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-sdl2_scancodes.patch
sdl2_forcefeedback.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