Skip to content

Commit 68e6f39

Browse files
committed
Drop support for SDL1
1 parent 0efcbd7 commit 68e6f39

36 files changed

+46
-8379
lines changed

LICENSES

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
- Included SDL ctypes code is Copyright: Alex Holkner
2-
3-
This code is licensed under the LGPL license, as found here:
4-
5-
http://www.gnu.org/licenses/lgpl.html
6-
71
- Included SDL2 ctypes code is Copyright: Marcus von Appen
82

93
This software is distributed under the Public Domain.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
About
1212
-----
1313

14-
M64Py is a Qt5 front-end (GUI) for Mupen64Plus 2.0, a cross-platform
14+
M64Py is a Qt5 front-end (GUI) for Mupen64Plus, a cross-platform
1515
plugin-based Nintendo 64 emulator. Front-end is written in Python and it
1616
provides a user-friendly interface over Mupen64Plus shared library.
1717

@@ -28,7 +28,7 @@ Dependencies
2828
------------
2929

3030
* PyQt5
31-
* SDL-1.2 or SDL-2.0
31+
* SDL-2.0
3232

3333
Install
3434
-------

dist/debian/m64py.6

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,13 @@ m64py \- Mupen64plus 2.0 frontend
2828
.B m64py [\fIoptions\fP]
2929
.br
3030
.SH DESCRIPTION
31-
m64py is a graphical Qt5 frontend for the Nintendo64 emulator mupen64plus 2.0
31+
m64py is a graphical Qt5 frontend for the Nintendo64 emulator mupen64plus
3232
.PP
3333
.PP
3434
.SH OPTIONS
3535
.TP
3636
\fB\-v\fP, \fB\-\-verbose\fP
3737
Show verbose output.
38-
.TP
39-
\fB\-\-sdl2\fP
40-
Use SDL2 instead of auto-detecting the libmupen64plus2 build type.
4138
.
4239
.SH SEE ALSO
4340
.BR mupen64plus (6),

dist/redhat/m64py.spec.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Url: http://m64py.sourceforge.net
1818
Requires: PyQt5 SDL
1919

2020
%description
21-
M64Py is a Qt5 front-end (GUI) for Mupen64Plus 2.0, a cross-platform plugin-based Nintendo 64 emulator.
21+
M64Py is a Qt5 front-end (GUI) for Mupen64Plus, a cross-platform plugin-based Nintendo 64 emulator.
2222

2323
%prep
2424
%setup -n %{name}-%{unmangled_version}

setup.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ def run_build(self):
154154

155155
def run(self):
156156
self.run_command("build_qt")
157-
set_sdl2()
158157
set_rthook()
159158
self.run_build()
160159
self.copy_emulator()
@@ -194,7 +193,6 @@ def set_config_path(self):
194193

195194
def run(self):
196195
self.run_command("build_qt")
197-
set_sdl2()
198196
set_rthook()
199197
self.set_config_path()
200198
self.run_build()
@@ -269,7 +267,6 @@ def run_build(self):
269267

270268
def run(self):
271269
self.run_command("build_qt")
272-
set_sdl2()
273270
set_rthook()
274271
self.run_build()
275272
self.copy_files()
@@ -279,18 +276,6 @@ def run(self):
279276
self.run_build_dmg()
280277

281278

282-
def set_sdl2():
283-
opts_file = ""
284-
opts_path = join(BASE_DIR, "src", "m64py", "opts.py")
285-
with open(opts_path, "r") as opts: data = opts.read()
286-
lines = data.split("\n")
287-
for line in lines:
288-
if "sdl2" in line:
289-
line = line.replace("default=False", "default=True")
290-
opts_file += line + "\n"
291-
with open(opts_path, "w") as opts: opts.write(opts_file)
292-
293-
294279
def set_rthook():
295280
import PyInstaller
296281
hook_file = ""
@@ -364,12 +349,12 @@ def run(self):
364349
name = "m64py",
365350
version = FRONTEND_VERSION,
366351
description = "M64Py - A frontend for Mupen64Plus",
367-
long_description = "M64Py is a Qt5 front-end (GUI) for Mupen64Plus 2.0, a cross-platform plugin-based Nintendo 64 emulator.",
352+
long_description = "M64Py is a Qt5 front-end (GUI) for Mupen64Plus, a cross-platform plugin-based Nintendo 64 emulator.",
368353
author = "Milan Nikolic",
369354
author_email = "[email protected]",
370355
license = "GNU GPLv3",
371356
url = "http://m64py.sourceforge.net",
372-
packages = ["m64py", "m64py.core", "m64py.frontend", "m64py.ui", "m64py.SDL", "m64py.SDL2"],
357+
packages = ["m64py", "m64py.core", "m64py.frontend", "m64py.ui", "m64py.SDL2"],
373358
package_dir = {"": "src"},
374359
scripts = ["m64py"],
375360
requires = ["PyQt5"],

src/m64py/SDL/__init__.py

Lines changed: 0 additions & 139 deletions
This file was deleted.

src/m64py/SDL/active.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)