From 6c48df4bba06aca1446831219196117226f3b292 Mon Sep 17 00:00:00 2001
From: Mathieu Virbel <mat@kivy.org>
Date: Mon, 27 Jan 2014 18:09:31 +0100
Subject: [PATCH] windows: fix for windows / python3.3

---
 kivy/input/providers/wm_pen.py    |  4 ++--
 kivy/input/providers/wm_touch.py  |  5 +++--
 kivy/lib/gstplayer/_gstplayer.pyx |  2 +-
 setup.py                          | 28 +++++++++++++++-------------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/kivy/input/providers/wm_pen.py b/kivy/input/providers/wm_pen.py
index 293d704a4..a6c816788 100644
--- a/kivy/input/providers/wm_pen.py
+++ b/kivy/input/providers/wm_pen.py
@@ -32,9 +32,9 @@ if 'KIVY_DOC' in os.environ:
 else:
     from collections import deque
     from ctypes.wintypes import (ULONG, UINT, WPARAM, LPARAM,
-                                 HANDLE, BOOL, POINTER)
+                                 HANDLE, BOOL)
     from ctypes import (Structure, windll, byref, c_int16,
-                        c_int, WINFUNCTYPE)
+                        c_int, WINFUNCTYPE, POINTER)
     from kivy.input.provider import MotionEventProvider
     from kivy.input.factory import MotionEventFactory
 
diff --git a/kivy/input/providers/wm_touch.py b/kivy/input/providers/wm_touch.py
index a7f60fe84..e71d5a1af 100644
--- a/kivy/input/providers/wm_touch.py
+++ b/kivy/input/providers/wm_touch.py
@@ -43,8 +43,9 @@ if 'KIVY_DOC' in os.environ:
 
 else:
     from ctypes.wintypes import (ULONG, HANDLE, DWORD, LONG, UINT,
-                                 WPARAM, LPARAM, POINTER, BOOL)
-    from ctypes import windll, WINFUNCTYPE, c_int, Structure, sizeof, byref
+                                 WPARAM, LPARAM, BOOL)
+    from ctypes import (windll, WINFUNCTYPE, POINTER,
+                        c_int, Structure, sizeof, byref)
     from collections import deque
     from kivy.input.provider import MotionEventProvider
     from kivy.input.factory import MotionEventFactory
diff --git a/kivy/lib/gstplayer/_gstplayer.pyx b/kivy/lib/gstplayer/_gstplayer.pyx
index 9e58e1534..8991860c3 100644
--- a/kivy/lib/gstplayer/_gstplayer.pyx
+++ b/kivy/lib/gstplayer/_gstplayer.pyx
@@ -254,7 +254,7 @@ cdef class GstPlayer:
 
         # configure playbin
         g_object_set_int(self.pipeline, 'async-handling', 1)
-        c_uri = <bytes>self.uri.decode('utf-8')
+        c_uri = <bytes>self.uri.encode('utf-8')
         g_object_set_void(self.playbin, 'uri', c_uri)
 
         # attach the callback
diff --git a/setup.py b/setup.py
index 27923d419..fc4af24a7 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,7 @@ from os.path import join, dirname, sep, exists, basename
 from os import walk, environ
 from distutils.core import setup
 from distutils.extension import Extension
+from collections import OrderedDict
 
 if sys.version > '3':
     PY3 = True
@@ -28,10 +29,11 @@ def pkgconfig(*packages, **kw):
     flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
     cmd = 'pkg-config --libs --cflags {}'.format(' '.join(packages))
     for token in getoutput(cmd).split():
-        flag = flag_map.get(token[:2])
+        ext = token[:2].decode('utf-8')
+        flag = flag_map.get(ext)
         if not flag:
             continue
-        kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+        kw.setdefault(flag, []).append(token[2:])
     return kw
 
 
@@ -60,17 +62,17 @@ if exists('/opt/vc/include/bcm_host.h'):
 # -----------------------------------------------------------------------------
 # Detect options
 #
-c_options = {
-    'use_rpi': platform == 'rpi',
-    'use_opengl_es2': True,
-    'use_opengl_debug': False,
-    'use_glew': False,
-    'use_sdl': False,
-    'use_ios': False,
-    'use_mesagl': False,
-    'use_x11': False,
-    'use_gstreamer': False,
-    'use_avfoundation': platform == 'darwin'}
+c_options = OrderedDict()
+c_options['use_rpi'] = platform == 'rpi'
+c_options['use_opengl_es2'] = True
+c_options['use_opengl_debug'] = False
+c_options['use_glew'] = False
+c_options['use_sdl'] = False
+c_options['use_ios'] = False
+c_options['use_mesagl'] = False
+c_options['use_x11'] = False
+c_options['use_gstreamer'] = False
+c_options['use_avfoundation'] = platform == 'darwin'
 
 # now check if environ is changing the default values
 for key in list(c_options.keys()):