use cython instead of pyrex in mysticmine

pyrex is used for a single .pyx file. Since development on this game seems
to have stopped we could pre-generate a static copy of ai.c so we can drop
the pyrex dependency. However, it turns out that the pyrex code is similar
enough to modern cython, that we can just swap pyrex for cython. This seems
to work...

While here:
- remove pyrex as an RDEP, not sure why that was ever needed
- fix the locale-related crasher so the game doesn't just bail at startup
- update to what looks like the final github commit (from July 2016)
- s/koonsolo/dewitters/ as requested by kmos@
- regenerate PLIST

Tested by myself on amd64

ok kmos@
This commit is contained in:
daniel 2020-10-17 18:20:34 +00:00
parent fc1e35463a
commit a7ab354828
5 changed files with 46 additions and 11 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.3 2019/07/12 20:46:21 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2020/10/17 18:20:34 daniel Exp $
COMMENT = one-button treasure collecting game
MODPY_EGG_VERSION = 1.2.0
DISTNAME = mysticmine-${MODPY_EGG_VERSION}
GH_ACCOUNT = koonsolo
GH_ACCOUNT = dewitters
GH_PROJECT = MysticMine
GH_COMMIT = f8354135984e83071d17396d846d7fa91fef1631
REVISION = 0
GH_COMMIT = 2fc0a5eaa0ab299c3a23ce17ae1c56a98055a44c
REVISION = 1
CATEGORIES = games
@ -18,9 +18,8 @@ PERMIT_PACKAGE = Yes
WANTLIB = pthread ${MODPY_WANTLIB}
MODULES = lang/python
BUILD_DEPENDS = devel/pyrex
RUN_DEPENDS = devel/pygame \
devel/pyrex
BUILD_DEPNDS = lang/cython
RUN_DEPENDS = devel/pygame
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (mysticmine-1.2.0-f8354135.tar.gz) = J/uEyoJZpgwFr629QwnVBEiR+37aXmVD6oUEmEFXMVo=
SIZE (mysticmine-1.2.0-f8354135.tar.gz) = 19285995
SHA256 (mysticmine-1.2.0-2fc0a5ea.tar.gz) = tlpvuSWWvzcgW8f+Z8vfE8aEOMJplDw0RTxpnS40wg8=
SIZE (mysticmine-1.2.0-2fc0a5ea.tar.gz) = 19286277

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-monorail_monorail_py,v 1.1 2020/10/17 18:20:34 daniel Exp $
Fix for https://github.com/dewitters/MysticMine/issues/16
Index: monorail/monorail.py
--- monorail/monorail.py.orig
+++ monorail/monorail.py
@@ -41,6 +41,8 @@ DEFAULT_LANGUAGES += ['en_US']
lc, encoding = locale.getdefaultlocale()
if lc:
languages = [lc]
+else:
+ languages = []
languages += DEFAULT_LANGUAGES
mo_location = LOCALE_DIR

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-setup_py,v 1.1 2020/10/17 18:20:34 daniel Exp $
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -1,6 +1,6 @@
from distutils.core import Extension, setup
from distutils.command.install import INSTALL_SCHEMES
-from Pyrex.Distutils import build_ext
+from Cython.Distutils import build_ext
import os
# http://stackoverflow.com/questions/1612733/including-non-python-files-with-setup-py
@@ -52,6 +52,5 @@ setup( name='MysticMine',
requires=[
"pygame",
"numpy",
- "pyrex",
],
)

View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/06/02 11:33:07 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/10/17 18:20:35 daniel Exp $
bin/MysticMine
lib/python${MODPY_VERSION}/site-packages/MysticMine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/monorail/
lib/python${MODPY_VERSION}/site-packages/monorail/__init__.py
lib/python${MODPY_VERSION}/site-packages/monorail/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/monorail/ai.so
@so lib/python${MODPY_VERSION}/site-packages/monorail/ai.so
lib/python${MODPY_VERSION}/site-packages/monorail/control.py
lib/python${MODPY_VERSION}/site-packages/monorail/control.pyc
lib/python${MODPY_VERSION}/site-packages/monorail/controlview.py