Skip to content

Commit ebf5dd4

Browse files
committed
prepare release
1 parent 0ca8f8a commit ebf5dd4

File tree

8 files changed

+25
-19
lines changed

8 files changed

+25
-19
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1+
v0.2.3 May 04, 2015:
2+
3+
* Migrated to Qt5
4+
* Python3 support
5+
* Toggle video extension without restart
6+
* Add windows portable build
7+
18
v0.2.2 Oct 18, 2014:
9+
210
* Initial Python3 support
311
* Add special SDL2 joystick event system for input config
412
* Add support for non-native rom files in romlist
513
* Many bug fixes, full log http://git.io/yRePKw
614

715
v0.2.1 Mar 09, 2014:
16+
817
* Greatly speed up reading ROM list
918
* Check if core supports DelaySI/CountPerOp options
1019
* Add support for OpenBSD plugin paths

dist/debian/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
apt-get -y install build-essential debhelper pyqt5-dev-tools dh-python python python-pyqt5 python-pyqt5.qtopengl
2+
apt-get -y install build-essential debhelper pyqt5-dev-tools dh-python python python3-pyqt5 python3-pyqt5.qtopengl
33
rm -rf ../../debian/
44
cp -fr ../debian/ ../../
55
cd ../../

dist/debian/control

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,22 @@ Homepage: http://m64py.sourceforge.net/
77
Build-Depends:
88
debhelper (>= 9),
99
dh-python,
10-
python,
11-
python-pyqt5,
10+
python3,
11+
python3-pyqt5,
1212
pyqt5-dev-tools,
13-
X-Python-Version: >= 2.5
13+
X-Python3-Version: >= 3.4
1414

1515
Package: m64py
1616
Architecture: all
1717
Depends:
1818
${misc:Depends},
19-
python,
20-
libsdl1.2-dev,
21-
python-pyqt5,
22-
python-pyqt5.qtopengl,
23-
python-pyqt5.qtsvg,
19+
python3,
20+
libsdl2-dev,
21+
python3-pyqt5,
22+
python3-pyqt5.qtopengl,
23+
python3-pyqt5.qtsvg,
2424
Recommends:
25-
libmupen64plus2,
26-
mupen64plus-audio-all | mupen64plus-audio,
27-
mupen64plus-input-all | mupen64plus-input,
28-
mupen64plus-rsp-all | mupen64plus-rsp,
29-
mupen64plus-video-all | mupen64plus-video,
25+
mupen64plus,
3026
python-lzma | p7zip,
3127
python-opengl,
3228
unrar,

dist/debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
export PYBUILD_DESTDIR=debian/m64py
55
export PYBUILD_CONFIGURE_ARGS=config
6-
export PYBUILD_BUILD_ARGS_python2=build_ext
6+
export PYBUILD_BUILD_ARGS_python3=build_ext
77
export PYBUILD_INSTALL_ARGS=--install-layout=deb \
88
--install-scripts=/usr/share/m64py \
99
--install-lib=/usr/share/m64py
@@ -14,7 +14,7 @@ VERSION = $(shell cat src/m64py/core/defs.py | grep FRONTEND_VERSION | awk -F' =
1414
RELEASE = 0
1515

1616
binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
17-
dh $@ --with=python2 --parallel --list-missing --buildsystem=pybuild
17+
dh $@ --with=python3 --parallel --list-missing --buildsystem=pybuild
1818

1919
override_dh_auto_install:
2020
dh_auto_install

dist/macosx/m64py.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DIST_DIR = os.environ["DIST_DIR"]
55
BASE_DIR = os.environ["BASE_DIR"]
66

77
a = Analysis([join(BASE_DIR, 'm64py')], pathex=[join(BASE_DIR, 'src')],
8-
hiddenimports=[],
8+
hiddenimports=['pickle', 'PyQt5.Qt'],
99
hookspath=None,
1010
runtime_hooks=None)
1111

dist/windows/m64py.iss.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Source: "m64py\README.md"; DestDir: "{app}";
3636
Source: "m64py\ChangeLog"; DestDir: "{app}";
3737
Source: "m64py\*.v64"; DestDir: "{app}";
3838
Source: "m64py\qt5_plugins\platforms\qwindows.dll"; DestDir: "{app}\qt5_plugins\platforms";
39+
Source: "m64py\qt5_plugins\imageformats\qjpeg.dll"; DestDir: "{app}\qt5_plugins\imageformats";
3940
Source: "m64py\qt5_plugins\imageformats\qsvg.dll"; DestDir: "{app}\qt5_plugins\imageformats";
4041
Source: "m64py\doc\*"; DestDir: "{app}\doc";
4142

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def run_build(self):
264264
spec_file = join(self.dist_dir, "m64py.spec")
265265
os.environ["BASE_DIR"] = BASE_DIR
266266
os.environ["DIST_DIR"] = self.dist_dir
267-
opts = {"distpath": self.dist_dir, "workpath": work_path, "clean_build": True, "upx_dir": None}
267+
opts = {"distpath": self.dist_dir, "workpath": work_path, "clean_build": True, "upx_dir": None, "debug": False}
268268
PyInstaller.build.main(None, spec_file, True, **opts)
269269

270270
def run(self):

src/m64py/core/defs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
CORE_API_VERSION = 0x20001
2323
CONFIG_API_VERSION = 0x20000
2424
MINIMUM_CORE_VERSION = 0x016300
25-
FRONTEND_VERSION = "0.2.2"
25+
FRONTEND_VERSION = "0.2.3"
2626

2727
SIZE_1X = (320, 240)
2828
SIZE_2X = (640, 480)

0 commit comments

Comments
 (0)