Here's an update of pygame from 1.9.3 to 1.9.6. The main benefits are some
improvements to python3 support and initial support for SDL2. For now,
the port continues to use SDL1 though.
There is some churn on the patches, but mostly because of a source tree
reorg that pygame did so each of the existing patches had to be reapplied
to different file.
Th update was tested on amd64 where everything compiles.
I also tried running most of the consumers to confirm they work and it all
seemed fine except for fretsonfire which crashes my box every time I try
to run it. This may be unrelated to pygame though as my box has been
fairly unstable under X ever since the drm update was done.
p.s. I've not checked if fretsonfire crashes with pygame 1.9.3 as this
game is pretty much on life support at this point...
ok?
Makefile | 9 ++----
distinfo | 4 +-
patches/patch-Setup_in | 13 ---------
patches/patch-buildconfig_Setup_SDL1_in | 13 +++++++++
patches/patch-buildconfig_config_unix_py | 21 +++++++++++++++
patches/patch-config_unix_py | 21 ---------------
patches/patch-src_c_camera_h | 31 ++++++++++++++++++++++
patches/patch-src_c_camera_v4l2_c | 17 ++++++++++++
patches/patch-src_camera_h | 30 ----------------------
patches/patch-src_camera_v4l2_c | 16 -----------
pkg/PLIST | 42 ++++++++++++++++++++++---------
11 files changed, 118 insertions(+), 99 deletions(-)
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pygame/Makefile,v
retrieving revision 1.39
diff -u -p -u -r1.39 Makefile
--- Makefile 15 Nov 2020 03:31:52 -0000 1.39
+++ Makefile 15 Nov 2020 05:37:09 -0000
@@ -2,11 +2,10 @@
COMMENT= set of Python modules designed for writing games
-MODPY_EGG_VERSION = 1.9.3
+MODPY_EGG_VERSION = 1.9.6
DISTNAME= pygame-${MODPY_EGG_VERSION}
PKGNAME = py-game-${MODPY_EGG_VERSION}
CATEGORIES= devel games
-REVISION = 4
HOMEPAGE= https://www.pygame.org/
@@ -41,8 +40,8 @@ TEST_IS_INTERACTIVE= x11
TEST_ENV = PYTHONPATH=${WRKSRC}
do-configure:
- ${SUBST_CMD} ${WRKSRC}/Setup.in
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} config.py
+ ${SUBST_CMD} ${WRKSRC}/buildconfig/Setup.SDL1.in
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} buildconfig/config.py
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
@@ -51,7 +50,7 @@ post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}/data
${INSTALL_SCRIPT} ${WRKSRC}/examples/data/* ${EXAMPLESDIR}/data
${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/readme.rst ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.rst ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs/*.{gif,html} ${DOCDIR}
.for i in ref tut
${INSTALL_DATA_DIR} ${DOCDIR}/$i
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pygame/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo 1 Apr 2018 09:27:43 -0000 1.9
+++ distinfo 15 Nov 2020 05:37:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (pygame-1.9.3.tar.gz) = dRAhgZvcDL5cvVGQSrtv+emu5bDolVrwIoTQ531snsI=
-SIZE (pygame-1.9.3.tar.gz) = 2974541
+SHA256 (pygame-1.9.6.tar.gz) = MBxkKMCIDs1KnjlRuA5TnDOGO2/zVqRD2xdY3k8peVc=
+SIZE (pygame-1.9.6.tar.gz) = 3223131
Index: patches/patch-Setup_in
===================================================================
RCS file: patches/patch-Setup_in
diff -N patches/patch-Setup_in
--- patches/patch-Setup_in 15 Nov 2020 03:31:52 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Setup_in,v 1.5 2020/11/15 03:31:52 daniel Exp $
-Index: Setup.in
---- Setup.in.orig
-+++ Setup.in
-@@ -47,7 +47,7 @@ base src/base.c $(SDL) $(DEBUG)
- cdrom src/cdrom.c $(SDL) $(DEBUG)
- color src/color.c $(SDL) $(DEBUG)
- constants src/constants.c $(SDL) $(DEBUG)
--display src/display.c $(SDL) $(DEBUG)
-+display src/display.c $(SDL) $(DEBUG) -I${X11BASE}/include
- event src/event.c $(SDL) $(DEBUG)
- fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
- key src/key.c $(SDL) $(DEBUG)
Index: patches/patch-buildconfig_Setup_SDL1_in
===================================================================
RCS file: patches/patch-buildconfig_Setup_SDL1_in
diff -N patches/patch-buildconfig_Setup_SDL1_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-buildconfig_Setup_SDL1_in 15 Nov 2020 05:37:09 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: buildconfig/Setup.SDL1.in
+--- buildconfig/Setup.SDL1.in.orig
++++ buildconfig/Setup.SDL1.in
+@@ -48,6 +48,7 @@ cdrom src_c/cdrom.c $(SDL) $(DEBUG)
+ color src_c/color.c $(SDL) $(DEBUG)
+ constants src_c/constants.c $(SDL) $(DEBUG)
+ display src_c/display.c $(SDL) $(DEBUG)
++display src_c/display.c $(SDL) $(DEBUG) -I${X11BASE}/include
+ event src_c/event.c $(SDL) $(DEBUG)
+ fastevent src_c/fastevent.c src_c/fastevents.c $(SDL) $(DEBUG)
+ key src_c/key.c $(SDL) $(DEBUG)
Index: patches/patch-buildconfig_config_unix_py
===================================================================
RCS file: patches/patch-buildconfig_config_unix_py
diff -N patches/patch-buildconfig_config_unix_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-buildconfig_config_unix_py 15 Nov 2020 05:37:09 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: buildconfig/config_unix.py
+--- buildconfig/config_unix.py.orig
++++ buildconfig/config_unix.py
+@@ -254,15 +254,6 @@ def main(sdl2=False):
+ for d in DEPS:
+ d.configure(incdirs, libdirs)
+
+- for d in DEPS[1:]:
+- if not d.found:
+- if "-auto" not in sys.argv and not confirm("""
+-Warning, some of the pygame dependencies were not found. Pygame can still
+-compile and install, but games that depend on those missing dependencies
+-will not run. Would you like to continue the configuration?"""):
+- raise SystemExit("Missing dependencies")
+- break
+-
+ return DEPS
+
+ if __name__ == '__main__':
Index: patches/patch-config_unix_py
===================================================================
RCS file: patches/patch-config_unix_py
diff -N patches/patch-config_unix_py
--- patches/patch-config_unix_py 1 Apr 2018 09:27:43 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-config_unix_py,v 1.6 2018/04/01 09:27:43 landry Exp $
-
-Index: config_unix.py
---- config_unix.py.orig
-+++ config_unix.py
-@@ -206,15 +206,6 @@ def main():
- for d in DEPS:
- d.configure(incdirs, libdirs)
-
-- for d in DEPS[1:]:
-- if not d.found:
-- if "-auto" not in sys.argv and not confirm("""
--Warning, some of the pygame dependencies were not found. Pygame can still
--compile and install, but games that depend on those missing dependencies
--will not run. Would you like to continue the configuration?"""):
-- raise SystemExit("Missing dependencies")
-- break
--
- return DEPS
-
- if __name__ == '__main__':
Index: patches/patch-src_c_camera_h
===================================================================
RCS file: patches/patch-src_c_camera_h
diff -N patches/patch-src_c_camera_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_c_camera_h 15 Nov 2020 05:37:09 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+Index: src_c/camera.h
+--- src_c/camera.h.orig
++++ src_c/camera.h
+@@ -39,9 +39,12 @@
+ /* on freebsd there is no asm/types */
+ #ifdef linux
+ #include <asm/types.h> /* for videodev2.h */
++ #include <linux/videodev2.h>
+
No comments:
Post a Comment