[mupen64plus-core] 243/310: Remove SDL unicode keycode compat code

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 39bae0fa1eb633a2f4dd11eca3c336b0e110f624
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Aug 17 12:03:25 2013 +0200

    Remove SDL unicode keycode compat code
    
    SDL 2.0 cannot store unicode anymore. Pre-2.0 versions provided this
    field but it was removed right before the 2.0 release. Still using it
    makes the compile fail.
---
 debian/changelog                     |  7 +++++++
 debian/patches/sdl2_no_unicode.patch | 37 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1a7c4d..c174de0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-core (2.0-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add sdl2_no_unicode.patch, Remove SDL unicode keycode compat code
+
+ -- Sven Eckelmann <sven at narfation.org>  Sat, 17 Aug 2013 12:02:58 +0200
+
 mupen64plus-core (2.0-2) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/patches/sdl2_no_unicode.patch b/debian/patches/sdl2_no_unicode.patch
new file mode 100644
index 0000000..043ab63
--- /dev/null
+++ b/debian/patches/sdl2_no_unicode.patch
@@ -0,0 +1,37 @@
+Description: Remove SDL unicode keycode compat code
+ SDL 2.0 cannot store unicode anymore. Pre-2.0 versions provided this
+ field but it was removed right before the 2.0 release. Still using it
+ makes the compile fail.
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/api/vidext_sdl2_compat.h b/src/api/vidext_sdl2_compat.h
+index 7c6ad8b4d74122f9d4f206d007bc9770c64f1dcb..9c6804082796c250651a94c60cacf7d44e381339 100644
+--- a/src/api/vidext_sdl2_compat.h
++++ b/src/api/vidext_sdl2_compat.h
+@@ -529,25 +529,6 @@ SDL_CompatEventFilter(void *userdata, SDL_Event * event)
+             SDL_PushEvent(&fake);
+             break;
+         }
+-    case SDL_KEYDOWN:
+-    case SDL_KEYUP:
+-        {
+-            Uint32 unicode = 0;
+-            if (event->key.type == SDL_KEYDOWN && event->key.keysym.sym < 256) {
+-                unicode = event->key.keysym.sym;
+-                if (unicode >= 'a' && unicode <= 'z') {
+-                    int shifted = !!(event->key.keysym.mod & KMOD_SHIFT);
+-                    int capslock = !!(event->key.keysym.mod & KMOD_CAPS);
+-                    if ((shifted ^ capslock) != 0) {
+-                        unicode = SDL_toupper(unicode);
+-                    }
+-                }
+-            }
+-            if (unicode) {
+-                event->key.keysym.unicode = unicode;
+-            }
+-            break;
+-        }
+     case SDL_TEXTINPUT:
+         {
+             /* FIXME: Generate an old style key repeat event if needed */
diff --git a/debian/patches/series b/debian/patches/series
index 474f9c0..fb1a7bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ sdl2_keysym.patch
 multiple_main.patch
 n64_cic_nus_6105_reset.patch
 sdl2_select_saveslot.patch
+sdl2_no_unicode.patch

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