[pkgsrc/trunk]: pkgsrc/devel/py-game py-game: updated to 1.9.6

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/447dd7a20ae8
branches:  trunk
changeset: 334843:447dd7a20ae8
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jun 06 21:46:11 2019 +0000

description:
py-game: updated to 1.9.6

1.9.6:
Whilst we focus like a shark-lazer on pygame 2, here is a bonus pygame 1.9.6 with a couple of small regression bug fixes.
- mp3 via smpeg was missing in manylinux builds.
- mixer thread deadlock issue when controlling it from different threads.
- pygame.version.vernum now has major, minor, and patch attributes.

1.9.5:
Every single source file has been heavily modified and moved in this release. Initial (source code only) support for SDL2 has been merged in. We also support compiling with SDL1 in the same code 
base, so the migration to pygame 2 is easier. pygame 2 will be released with SDL2 being the default backend when some remaining issues are ironed out. The 1.9.x releases will continue with SDL1 until 
then. Also, the C API of pygame is undergoing a transformation with lots of cleanups. Then there have been plenty of other cleanups all throughout the python code as well. There's still lots to clean 
up, but things should be significantly easier for people to contribute (?? hello and thanks new contributors!). The documentation has been improved with better examples links, search functionality, 
and improved navigation. Support for older Macs, and newer Macs has been improved. The mask, midi, draw, and math modules have gotten lots of polish with rough edges removed.

diffstat:

 devel/py-game/Makefile                                    |  25 ++++--
 devel/py-game/PLIST                                       |  51 +++++++++---
 devel/py-game/distinfo                                    |  18 ++--
 devel/py-game/patches/patch-Setup.in                      |  28 -------
 devel/py-game/patches/patch-Setup__Unix.in                |  10 --
 devel/py-game/patches/patch-buildconfig_Setup.SDL1.in     |  23 +++++
 devel/py-game/patches/patch-buildconfig_Setup.SDL2.in     |  21 +++++
 devel/py-game/patches/patch-buildconfig_config__darwin.py |  15 +++
 devel/py-game/patches/patch-buildconfig_config__unix.py   |  46 +++++++++++
 devel/py-game/patches/patch-config__darwin.py             |  15 ---
 devel/py-game/patches/patch-config__unix.py               |  60 ---------------
 11 files changed, 167 insertions(+), 145 deletions(-)

diffs (truncated from 477 to 300 lines):

diff -r ffe3e9b49bbb -r 447dd7a20ae8 devel/py-game/Makefile
--- a/devel/py-game/Makefile    Thu Jun 06 21:25:11 2019 +0000
+++ b/devel/py-game/Makefile    Thu Jun 06 21:46:11 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2018/05/10 21:53:32 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2019/06/06 21:46:11 adam Exp $
 
-DISTNAME=      pygame-1.9.3
-PKGREVISION=   1
+DISTNAME=      pygame-1.9.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-CATEGORIES=    games
+CATEGORIES=    games python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/Pygame/}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
@@ -23,21 +22,29 @@
 SUBST_CLASSES+=                fixpath
 SUBST_STAGE.fixpath=   pre-configure
 SUBST_MESSAGE.fixpath= Fixing paths.
-SUBST_FILES.fixpath=   config_darwin.py config_unix.py
+SUBST_FILES.fixpath=   buildconfig/config_darwin.py
+SUBST_FILES.fixpath+=  buildconfig/config_unix.py
 SUBST_SED.fixpath=     -e 's,/usr/local,${PREFIX},g'
 
 .include "../../mk/bsd.prefs.mk"
-PLIST_VARS+=           darwin
-.if ${OPSYS} != "Darwin"
+PLIST_VARS+=           darwin unix
+.if ${OPSYS} == "Darwin"
+PLIST.darwin=          yes
+.else
 .  include "../../x11/libX11/buildlink3.mk"
-.else
-PLIST.darwin=          yes
+PLIST.unix=            yes
 .endif
 
+# Disable video4linux
+pre-configure:
+       ${RM} ${WRKSRC}/buildconfig/Setup_Unix.in
+       ${TOUCH} ${WRKSRC}/buildconfig/Setup_Unix.in
+
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff -r ffe3e9b49bbb -r 447dd7a20ae8 devel/py-game/PLIST
--- a/devel/py-game/PLIST       Thu Jun 06 21:25:11 2019 +0000
+++ b/devel/py-game/PLIST       Thu Jun 06 21:46:11 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/06/20 17:00:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/06/06 21:46:11 adam Exp $
 ${PYINC}/pygame/_camera.h
 ${PYINC}/pygame/_pygame.h
 ${PYINC}/pygame/_surface.h
@@ -9,6 +9,7 @@
 ${PYINC}/pygame/freetype.h
 ${PYINC}/pygame/mask.h
 ${PYINC}/pygame/mixer.h
+${PYINC}/pygame/palette.h
 ${PYINC}/pygame/pgarrinter.h
 ${PYINC}/pygame/pgbufferproxy.h
 ${PYINC}/pygame/pgcompat.h
@@ -19,8 +20,8 @@
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/pygame/LGPL
 ${PYSITELIB}/pygame/__init__.py
 ${PYSITELIB}/pygame/__init__.pyc
 ${PYSITELIB}/pygame/__init__.pyo
@@ -71,6 +72,9 @@
 ${PYSITELIB}/pygame/docs/pygame_tiny.gif
 ${PYSITELIB}/pygame/docs/ref/docscomments.json
 ${PYSITELIB}/pygame/draw.so
+${PYSITELIB}/pygame/draw_py.py
+${PYSITELIB}/pygame/draw_py.pyc
+${PYSITELIB}/pygame/draw_py.pyo
 ${PYSITELIB}/pygame/event.so
 ${PYSITELIB}/pygame/examples/__init__.py
 ${PYSITELIB}/pygame/examples/__init__.pyc
@@ -84,6 +88,9 @@
 ${PYSITELIB}/pygame/examples/arraydemo.py
 ${PYSITELIB}/pygame/examples/arraydemo.pyc
 ${PYSITELIB}/pygame/examples/arraydemo.pyo
+${PYSITELIB}/pygame/examples/audiocapture.py
+${PYSITELIB}/pygame/examples/audiocapture.pyc
+${PYSITELIB}/pygame/examples/audiocapture.pyo
 ${PYSITELIB}/pygame/examples/blend_fill.py
 ${PYSITELIB}/pygame/examples/blend_fill.pyc
 ${PYSITELIB}/pygame/examples/blend_fill.pyo
@@ -133,6 +140,9 @@
 ${PYSITELIB}/pygame/examples/data/static.png
 ${PYSITELIB}/pygame/examples/data/whiff.wav
 ${PYSITELIB}/pygame/examples/data/yuv_1.pgm
+${PYSITELIB}/pygame/examples/dropevent.py
+${PYSITELIB}/pygame/examples/dropevent.pyc
+${PYSITELIB}/pygame/examples/dropevent.pyo
 ${PYSITELIB}/pygame/examples/eventlist.py
 ${PYSITELIB}/pygame/examples/eventlist.pyc
 ${PYSITELIB}/pygame/examples/eventlist.pyo
@@ -209,9 +219,15 @@
 ${PYSITELIB}/pygame/examples/testsprite.py
 ${PYSITELIB}/pygame/examples/testsprite.pyc
 ${PYSITELIB}/pygame/examples/testsprite.pyo
+${PYSITELIB}/pygame/examples/textinput.py
+${PYSITELIB}/pygame/examples/textinput.pyc
+${PYSITELIB}/pygame/examples/textinput.pyo
 ${PYSITELIB}/pygame/examples/vgrade.py
 ${PYSITELIB}/pygame/examples/vgrade.pyc
 ${PYSITELIB}/pygame/examples/vgrade.pyo
+${PYSITELIB}/pygame/examples/video.py
+${PYSITELIB}/pygame/examples/video.pyc
+${PYSITELIB}/pygame/examples/video.pyo
 ${PYSITELIB}/pygame/fastevent.so
 ${PYSITELIB}/pygame/font.so
 ${PYSITELIB}/pygame/freesansbold.ttf
@@ -222,18 +238,8 @@
 ${PYSITELIB}/pygame/ftfont.pyc
 ${PYSITELIB}/pygame/ftfont.pyo
 ${PYSITELIB}/pygame/gfxdraw.so
-${PYSITELIB}/pygame/gp2x/__init__.py
-${PYSITELIB}/pygame/gp2x/__init__.pyc
-${PYSITELIB}/pygame/gp2x/__init__.pyo
-${PYSITELIB}/pygame/gp2x/constants.py
-${PYSITELIB}/pygame/gp2x/constants.pyc
-${PYSITELIB}/pygame/gp2x/constants.pyo
-${PYSITELIB}/pygame/gp2x/locals.py
-${PYSITELIB}/pygame/gp2x/locals.pyc
-${PYSITELIB}/pygame/gp2x/locals.pyo
 ${PYSITELIB}/pygame/image.so
 ${PYSITELIB}/pygame/imageext.so
-${PYSITELIB}/pygame/install.html
 ${PYSITELIB}/pygame/joystick.so
 ${PYSITELIB}/pygame/key.so
 ${PYSITELIB}/pygame/locals.py
@@ -262,10 +268,9 @@
 ${PYSITELIB}/pygame/pygame_icon.icns
 ${PYSITELIB}/pygame/pygame_icon.svg
 ${PYSITELIB}/pygame/pygame_icon.tiff
-${PYSITELIB}/pygame/readme.html
 ${PYSITELIB}/pygame/rect.so
 ${PYSITELIB}/pygame/rwobject.so
-${PYSITELIB}/pygame/scrap.so
+${PLIST.unix}${PYSITELIB}/pygame/scrap.so
 ${PLIST.darwin}${PYSITELIB}/pygame/sdlmain_osx.so
 ${PYSITELIB}/pygame/sndarray.py
 ${PYSITELIB}/pygame/sndarray.pyc
@@ -311,6 +316,9 @@
 ${PYSITELIB}/pygame/tests/compat_test.py
 ${PYSITELIB}/pygame/tests/compat_test.pyc
 ${PYSITELIB}/pygame/tests/compat_test.pyo
+${PYSITELIB}/pygame/tests/constants_test.py
+${PYSITELIB}/pygame/tests/constants_test.pyc
+${PYSITELIB}/pygame/tests/constants_test.pyo
 ${PYSITELIB}/pygame/tests/cursors_test.py
 ${PYSITELIB}/pygame/tests/cursors_test.pyc
 ${PYSITELIB}/pygame/tests/cursors_test.pyo
@@ -323,6 +331,9 @@
 ${PYSITELIB}/pygame/tests/event_test.py
 ${PYSITELIB}/pygame/tests/event_test.pyc
 ${PYSITELIB}/pygame/tests/event_test.pyo
+${PYSITELIB}/pygame/tests/fastevent_tags.py
+${PYSITELIB}/pygame/tests/fastevent_tags.pyc
+${PYSITELIB}/pygame/tests/fastevent_tags.pyo
 ${PYSITELIB}/pygame/tests/fastevent_test.py
 ${PYSITELIB}/pygame/tests/fastevent_test.pyc
 ${PYSITELIB}/pygame/tests/fastevent_test.pyo
@@ -405,6 +416,9 @@
 ${PYSITELIB}/pygame/tests/mouse_test.py
 ${PYSITELIB}/pygame/tests/mouse_test.pyc
 ${PYSITELIB}/pygame/tests/mouse_test.pyo
+${PYSITELIB}/pygame/tests/overlay_tags.py
+${PYSITELIB}/pygame/tests/overlay_tags.pyc
+${PYSITELIB}/pygame/tests/overlay_tags.pyo
 ${PYSITELIB}/pygame/tests/overlay_test.py
 ${PYSITELIB}/pygame/tests/overlay_test.pyc
 ${PYSITELIB}/pygame/tests/overlay_test.pyo
@@ -615,9 +629,18 @@
 ${PYSITELIB}/pygame/tests/time_test.py
 ${PYSITELIB}/pygame/tests/time_test.pyc
 ${PYSITELIB}/pygame/tests/time_test.pyo
+${PYSITELIB}/pygame/tests/touch_tags.py
+${PYSITELIB}/pygame/tests/touch_tags.pyc
+${PYSITELIB}/pygame/tests/touch_tags.pyo
+${PYSITELIB}/pygame/tests/touch_test.py
+${PYSITELIB}/pygame/tests/touch_test.pyc
+${PYSITELIB}/pygame/tests/touch_test.pyo
 ${PYSITELIB}/pygame/tests/transform_test.py
 ${PYSITELIB}/pygame/tests/transform_test.pyc
 ${PYSITELIB}/pygame/tests/transform_test.pyo
+${PYSITELIB}/pygame/tests/version_test.py
+${PYSITELIB}/pygame/tests/version_test.pyc
+${PYSITELIB}/pygame/tests/version_test.pyo
 ${PYSITELIB}/pygame/threads/Py25Queue.py
 ${PYSITELIB}/pygame/threads/Py25Queue.pyc
 ${PYSITELIB}/pygame/threads/Py25Queue.pyo
diff -r ffe3e9b49bbb -r 447dd7a20ae8 devel/py-game/distinfo
--- a/devel/py-game/distinfo    Thu Jun 06 21:25:11 2019 +0000
+++ b/devel/py-game/distinfo    Thu Jun 06 21:46:11 2019 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2018/05/10 21:52:51 wiz Exp $
+$NetBSD: distinfo,v 1.10 2019/06/06 21:46:11 adam Exp $
 
-SHA1 (pygame-1.9.3.tar.gz) = b3ef126f0baea3bd0986fddebba82b6b13f6f282
-RMD160 (pygame-1.9.3.tar.gz) = ac95b8c2afa5076746227a6d1ae9c200d14d5757
-SHA512 (pygame-1.9.3.tar.gz) = 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
-Size (pygame-1.9.3.tar.gz) = 2974541 bytes
-SHA1 (patch-Setup.in) = 71659c0150ec53b063cd47531b8b0a93ea671ceb
-SHA1 (patch-Setup__Unix.in) = 03fb45137f018761e6b9f19de056c0fdff5d153d
-SHA1 (patch-config__darwin.py) = c39c00b3252195dcf4476574e9b8439acf66c0ab
-SHA1 (patch-config__unix.py) = 0572bf12ce06ffd7d9a762a7718d1330715af9ec
+SHA1 (pygame-1.9.6.tar.gz) = d055cf1e37d8c340579e2d745e8ca4c9397767da
+RMD160 (pygame-1.9.6.tar.gz) = abe4dc7b5e350617048474a3d168d9d1d09eae2b
+SHA512 (pygame-1.9.6.tar.gz) = d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
+Size (pygame-1.9.6.tar.gz) = 3223131 bytes
+SHA1 (patch-buildconfig_Setup.SDL1.in) = 2f4b60f933952b67092fabfe4c84d7525b9d0338
+SHA1 (patch-buildconfig_Setup.SDL2.in) = 9b33e714df4319622aac66ced2b3ce36f879dc8c
+SHA1 (patch-buildconfig_config__darwin.py) = c1e8ac90619fce59e250a33175a546cd235c0fe1
+SHA1 (patch-buildconfig_config__unix.py) = 31185536cbc25550df3441607ec278c533a28f1f
diff -r ffe3e9b49bbb -r 447dd7a20ae8 devel/py-game/patches/patch-Setup.in
--- a/devel/py-game/patches/patch-Setup.in      Thu Jun 06 21:25:11 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-Setup.in,v 1.2 2017/06/20 17:00:07 adam Exp $
-
-Use correct lib for PNG.
-Disable portmidi/porttime.
-
---- Setup.in.orig      2016-05-06 15:05:22.000000000 +0000
-+++ Setup.in
-@@ -11,11 +11,9 @@ SDL = -I/usr/include/SDL -D_REENTRANT -l
- FONT = -lSDL_ttf
- IMAGE = -lSDL_image
- MIXER = -lSDL_mixer
--PNG = -lpng
-+PNG = -lpng16
- JPEG = -ljpeg
- SCRAP = -lX11
--PORTMIDI = -lportmidi
--PORTTIME = -lporttime
- FREETYPE = -lfreetype
- #--EndConfig
- 
-@@ -30,7 +28,6 @@ font src/font.c $(SDL) $(FONT) $(DEBUG)
- mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
- mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
- scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
--pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
- 
- GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
- #GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c 
diff -r ffe3e9b49bbb -r 447dd7a20ae8 devel/py-game/patches/patch-Setup__Unix.in
--- a/devel/py-game/patches/patch-Setup__Unix.in        Thu Jun 06 21:25:11 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: patch-Setup__Unix.in,v 1.1 2017/06/20 17:00:07 adam Exp $
-
-Disable video4linux.
-
---- Setup_Unix.in.orig 2017-06-20 16:07:34.000000000 +0000
-+++ Setup_Unix.in
-@@ -1,2 +1,2 @@
- #This file defines platform specific modules for linux
--_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
-+#_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
diff -r ffe3e9b49bbb -r 447dd7a20ae8 devel/py-game/patches/patch-buildconfig_Setup.SDL1.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in     Thu Jun 06 21:46:11 2019 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-buildconfig_Setup.SDL1.in,v 1.1 2019/06/06 21:46:12 adam Exp $
+
+Disable portmidi/porttime
+
+--- buildconfig/Setup.SDL1.in.orig     2019-06-06 17:51:10.000000000 +0000
++++ buildconfig/Setup.SDL1.in
+@@ -7,15 +7,13 @@
+ 
+ 
+ #--StartConfig
+-SDL = -I/usr/include/SDL -D_REENTRANT -lSDL
++SDL = -D_REENTRANT -lSDL
+ FONT = -lSDL_ttf
+ IMAGE = -lSDL_image
+ MIXER = -lSDL_mixer
+ PNG = -lpng
+ JPEG = -ljpeg
+ SCRAP = -lX11
+-PORTMIDI = -lportmidi
+-PORTTIME = -lporttime
+ FREETYPE = -lfreetype
+ #--EndConfig
+