Unbundle PySDL2 but keep a copy in src dir

Author: gen2brain

README.md

@@ -33,14 +33,15 @@ Depends:
  python3-pyqt5,
  python3-pyqt5.qtopengl,
  python3-pyqt5.qtsvg,
+ python3-sdl2,
 Provides:
  mupen64plus-ui,
 Recommends:
  python3-dbus,
  python3-lzma | p7zip,
  unrar,
 Description: Python based graphical frontend for mupen64plus
- M64Py is a Qt5 front-end (GUI) for Mupen64Plus 2.0, a cross-platform
+ M64Py is a Qt5 front-end (GUI) for Mupen64Plus, a cross-platform
  plugin-based Nintendo 64 emulator. M64Py is written in Python and it
  provides a user-friendly interface over Mupen64Plus shared library.
  .

dist/debian/control

@@ -23,7 +23,7 @@
 .\" --------------------------------------------------------------------------
 .ad l
 .SH NAME
-m64py \- Mupen64plus 2.0 frontend
+m64py \- Mupen64plus frontend
 .SH SYNOPSIS
 .B m64py [\fIoptions\fP]
 .br

dist/debian/m64py.6

@@ -354,7 +354,7 @@ def run(self):
     author_email = "[email protected]",
     license = "GNU GPLv3",
     url = "http://m64py.sourceforge.net",
-    packages = ["m64py", "m64py.core", "m64py.frontend", "m64py.ui", "m64py.SDL2"],
+    packages = ["m64py", "m64py.core", "m64py.frontend", "m64py.ui"],
     package_dir = {"": "src"},
     scripts = ["m64py"],
     requires = ["PyQt5"],

setup.py

@@ -18,6 +18,9 @@
 
 from PyQt5.QtOpenGL import QGLFormat
 
+from sdl2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO
+from sdl2 import SDL_GetNumDisplayModes, SDL_DisplayMode, SDL_GetDisplayMode
+
 try:
     # nvidia hack
     from OpenGL import GL
@@ -28,9 +31,6 @@
 from m64py.core.defs import *
 from m64py.frontend.log import log
 
-from m64py.SDL2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO
-from m64py.SDL2 import SDL_GetNumDisplayModes, SDL_DisplayMode, SDL_GetDisplayMode
-
 try:
     if not SDL_WasInit(SDL_INIT_VIDEO):
         SDL_InitSubSystem(SDL_INIT_VIDEO)

src/m64py/core/vidext.py

@@ -19,8 +19,8 @@
 from PyQt5.QtWidgets import QDialog
 from PyQt5.QtGui import QKeySequence
 
-from m64py.SDL2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO
-from m64py.SDL2.keyboard import SDL_GetScancodeFromName
+from sdl2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO
+from sdl2.keyboard import SDL_GetScancodeFromName
 
 from m64py.core.defs import *
 from m64py.utils import format_tooltip

src/m64py/frontend/input.py

@@ -19,16 +19,16 @@
 
 from PyQt5.QtCore import QObject, pyqtSignal, QTime, QTimer
 
+from sdl2 import SDL_WasInit, SDL_InitSubSystem, SDL_INIT_JOYSTICK
+from sdl2 import SDL_JoystickOpen, SDL_JoystickClose, SDL_NumJoysticks, SDL_JoystickNameForIndex
+from sdl2 import SDL_JoystickNumAxes, SDL_JoystickNumButtons, SDL_JoystickNumHats, SDL_JoystickNumBalls
+from sdl2 import SDL_JoystickGetAxis, SDL_JoystickGetButton, SDL_JoystickGetHat, SDL_JoystickUpdate, SDL_JoystickInstanceID
+from sdl2 import SDL_Event, SDL_PollEvent
+from sdl2 import SDL_JOYAXISMOTION, SDL_JOYHATMOTION, SDL_JOYBALLMOTION, SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP
+
 from m64py.frontend.log import log
 import ctypes
 
-from m64py.SDL2 import SDL_WasInit, SDL_InitSubSystem, SDL_INIT_JOYSTICK
-from m64py.SDL2 import SDL_JoystickOpen, SDL_JoystickClose, SDL_NumJoysticks, SDL_JoystickNameForIndex
-from m64py.SDL2 import SDL_JoystickNumAxes, SDL_JoystickNumButtons, SDL_JoystickNumHats, SDL_JoystickNumBalls
-from m64py.SDL2 import SDL_JoystickGetAxis, SDL_JoystickGetButton, SDL_JoystickGetHat, SDL_JoystickUpdate, SDL_JoystickInstanceID
-from m64py.SDL2 import SDL_Event, SDL_PollEvent
-from m64py.SDL2 import SDL_JOYAXISMOTION, SDL_JOYHATMOTION, SDL_JOYBALLMOTION, SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP
-
 JOYSTICK_DEADZONE = 0
 JOYSTICK_SENSITIVITY = 0
 

src/m64py/frontend/joystick.py

@@ -18,106 +18,10 @@
 
 from m64py.frontend.keycodes import *
 
-QT2SDL = {}
 QT2SDL2 = {}
 SCANCODE2KEYCODE = {}
 KEYCODE2SCANCODE = {}
 
-QT2SDL[Qt.Key_A] = SDLK_a
-QT2SDL[Qt.Key_B] = SDLK_b
-QT2SDL[Qt.Key_C] = SDLK_c
-QT2SDL[Qt.Key_D] = SDLK_d
-QT2SDL[Qt.Key_E] = SDLK_e
-QT2SDL[Qt.Key_F] = SDLK_f
-QT2SDL[Qt.Key_G] = SDLK_g
-QT2SDL[Qt.Key_H] = SDLK_h
-QT2SDL[Qt.Key_I] = SDLK_i
-QT2SDL[Qt.Key_J] = SDLK_j
-QT2SDL[Qt.Key_K] = SDLK_k
-QT2SDL[Qt.Key_L] = SDLK_l
-QT2SDL[Qt.Key_M] = SDLK_m
-QT2SDL[Qt.Key_N] = SDLK_n
-QT2SDL[Qt.Key_O] = SDLK_o
-QT2SDL[Qt.Key_P] = SDLK_p
-QT2SDL[Qt.Key_Q] = SDLK_q
-QT2SDL[Qt.Key_R] = SDLK_r
-QT2SDL[Qt.Key_S] = SDLK_s
-QT2SDL[Qt.Key_T] = SDLK_t
-QT2SDL[Qt.Key_U] = SDLK_u
-QT2SDL[Qt.Key_V] = SDLK_v
-QT2SDL[Qt.Key_W] = SDLK_w
-QT2SDL[Qt.Key_X] = SDLK_x
-QT2SDL[Qt.Key_Y] = SDLK_y
-QT2SDL[Qt.Key_Z] = SDLK_z
-QT2SDL[Qt.Key_0] = SDLK_0
-QT2SDL[Qt.Key_1] = SDLK_1
-QT2SDL[Qt.Key_2] = SDLK_2
-QT2SDL[Qt.Key_3] = SDLK_3
-QT2SDL[Qt.Key_4] = SDLK_4
-QT2SDL[Qt.Key_5] = SDLK_5
-QT2SDL[Qt.Key_6] = SDLK_6
-QT2SDL[Qt.Key_7] = SDLK_7
-QT2SDL[Qt.Key_8] = SDLK_8
-QT2SDL[Qt.Key_9] = SDLK_9
-QT2SDL[Qt.Key_F1] = SDLK_F1
-QT2SDL[Qt.Key_F2] = SDLK_F2
-QT2SDL[Qt.Key_F3] = SDLK_F3
-QT2SDL[Qt.Key_F4] = SDLK_F4
-QT2SDL[Qt.Key_F5] = SDLK_F5
-QT2SDL[Qt.Key_F6] = SDLK_F6
-QT2SDL[Qt.Key_F7] = SDLK_F7
-QT2SDL[Qt.Key_F8] = SDLK_F8
-QT2SDL[Qt.Key_F9] = SDLK_F9
-QT2SDL[Qt.Key_F10] = SDLK_F10
-QT2SDL[Qt.Key_F11] = SDLK_F11
-QT2SDL[Qt.Key_F12] = SDLK_F12
-QT2SDL[Qt.Key_F13] = SDLK_F13
-QT2SDL[Qt.Key_F14] = SDLK_F14
-QT2SDL[Qt.Key_F15] = SDLK_F15
-QT2SDL[Qt.Key_Insert] = SDLK_INSERT
-QT2SDL[Qt.Key_Delete] = SDLK_DELETE
-QT2SDL[Qt.Key_Home] = SDLK_HOME
-QT2SDL[Qt.Key_End] = SDLK_END
-QT2SDL[Qt.Key_PageUp] = SDLK_PAGEUP
-QT2SDL[Qt.Key_PageDown] = SDLK_PAGEDOWN
-QT2SDL[Qt.Key_Up] = SDLK_UP
-QT2SDL[Qt.Key_Down] = SDLK_DOWN
-QT2SDL[Qt.Key_Left] = SDLK_LEFT
-QT2SDL[Qt.Key_Right] = SDLK_RIGHT
-QT2SDL[Qt.Key_Enter] = SDLK_KP_ENTER
-QT2SDL[Qt.Key_Return] = SDLK_RETURN
-QT2SDL[Qt.Key_Escape] = SDLK_ESCAPE
-QT2SDL[Qt.Key_Pause] = SDLK_PAUSE
-QT2SDL[Qt.Key_QuoteLeft] = SDLK_BACKQUOTE
-QT2SDL[Qt.Key_Backspace] = SDLK_BACKSPACE
-QT2SDL[Qt.Key_Tab] = SDLK_TAB
-QT2SDL[Qt.Key_CapsLock] = SDLK_CAPSLOCK
-QT2SDL[Qt.Key_Space] = SDLK_SPACE
-QT2SDL[Qt.Key_Slash] = SDLK_SLASH
-QT2SDL[Qt.Key_Backslash] = SDLK_BACKSLASH
-QT2SDL[Qt.Key_Minus] = SDLK_MINUS
-QT2SDL[Qt.Key_Plus] = SDLK_PLUS
-QT2SDL[Qt.Key_Equal] = SDLK_EQUALS
-QT2SDL[Qt.Key_BracketLeft] = SDLK_LEFTBRACKET
-QT2SDL[Qt.Key_BracketRight] = SDLK_RIGHTBRACKET
-QT2SDL[Qt.Key_Semicolon] = SDLK_SEMICOLON
-QT2SDL[Qt.Key_Apostrophe] = SDLK_QUOTE
-QT2SDL[Qt.Key_Comma] = SDLK_COMMA
-QT2SDL[Qt.Key_Period] = SDLK_PERIOD
-QT2SDL[Qt.Key_Alt] = SDLK_LALT
-QT2SDL[Qt.Key_Control] = SDLK_LCTRL
-QT2SDL[Qt.Key_Shift] = SDLK_LSHIFT
-QT2SDL[Qt.AltModifier.__int__()] = SDLK_LALT
-QT2SDL[Qt.ControlModifier.__int__()] = SDLK_LCTRL
-QT2SDL[Qt.ShiftModifier.__int__()] = SDLK_LSHIFT
-QT2SDL[Qt.Key_Print] = SDLK_PRINT
-QT2SDL[Qt.Key_ScrollLock] = SDLK_SCROLLOCK
-QT2SDL[Qt.Key_Meta] = SDLK_LMETA
-QT2SDL[Qt.MetaModifier.__int__()] = SDLK_LMETA
-QT2SDL[Qt.Key_Super_L] = SDLK_LSUPER
-QT2SDL[Qt.Key_Super_R] = SDLK_RSUPER
-QT2SDL[Qt.Key_unknown] = SDLK_UNKNOWN
-
 QT2SDL2[Qt.Key_A] = SDL_SCANCODE_A
 QT2SDL2[Qt.Key_B] = SDL_SCANCODE_B
 QT2SDL2[Qt.Key_C] = SDL_SCANCODE_C

src/m64py/frontend/keymap.py

@@ -17,7 +17,7 @@
 from PyQt5.QtWidgets import QPushButton
 from PyQt5.QtCore import Qt
 
-from m64py.SDL2.keyboard import SDL_GetScancodeName
+from sdl2.keyboard import SDL_GetScancodeName
 
 from m64py.frontend.keymap import QT2SDL2