CVS commit: pkgsrc/devel/py-game

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/py-game
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 29 Oct 2023 19:05:50 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Oct 29 19:05:49 UTC 2023

Modified Files:
        pkgsrc/devel/py-game: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/py-game/patches: patch-buildconfig_Setup.SDL2.in
            patch-buildconfig_config__darwin.py
            patch-buildconfig_config__unix.py

Log Message:
py-game: fix build and PLIST


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/py-game/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-game/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-game/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL2.in
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-game/Makefile
diff -u pkgsrc/devel/py-game/Makefile:1.43 pkgsrc/devel/py-game/Makefile:1.44
--- pkgsrc/devel/py-game/Makefile:1.43  Sun Oct 29 17:59:35 2023
+++ pkgsrc/devel/py-game/Makefile       Sun Oct 29 19:05:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2023/10/29 17:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2023/10/29 19:05:49 adam Exp $
 
 DISTNAME=      pygame-2.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -28,12 +28,11 @@ SUBST_FILES.fixpath+=       buildconfig/config
 SUBST_SED.fixpath=     -e 's,/usr/local,${PREFIX},g'
 
 .include "../../mk/bsd.prefs.mk"
-PLIST_VARS+=           darwin unix
+PLIST_VARS+=           darwin
 .if ${OPSYS} == "Darwin"
 PLIST.darwin=          yes
 .else
 .  include "../../x11/libX11/buildlink3.mk"
-PLIST.unix=            yes
 .endif
 
 # Disable video4linux

Index: pkgsrc/devel/py-game/PLIST
diff -u pkgsrc/devel/py-game/PLIST:1.11 pkgsrc/devel/py-game/PLIST:1.12
--- pkgsrc/devel/py-game/PLIST:1.11     Sun Oct 29 17:59:35 2023
+++ pkgsrc/devel/py-game/PLIST  Sun Oct 29 19:05:49 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2023/10/29 17:59:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2023/10/29 19:05:49 adam Exp $
 ${PYINC}/pygame/_blit_info.h
 ${PYINC}/pygame/_camera.h
 ${PYINC}/pygame/_pygame.h
@@ -45,6 +45,7 @@ ${PYSITELIB}/pygame/__pyinstaller/__init
 ${PYSITELIB}/pygame/__pyinstaller/hook-pygame.py
 ${PYSITELIB}/pygame/__pyinstaller/hook-pygame.pyc
 ${PYSITELIB}/pygame/__pyinstaller/hook-pygame.pyo
+${PLIST.darwin}${PYSITELIB}/pygame/_camera.so
 ${PYSITELIB}/pygame/_camera_opencv.py
 ${PYSITELIB}/pygame/_camera_opencv.pyc
 ${PYSITELIB}/pygame/_camera_opencv.pyo
@@ -554,7 +555,7 @@ ${PYSITELIB}/pygame/rect.so
 ${PYSITELIB}/pygame/rwobject.pyi
 ${PYSITELIB}/pygame/rwobject.so
 ${PYSITELIB}/pygame/scrap.pyi
-${PLIST.unix}${PYSITELIB}/pygame/scrap.so
+${PYSITELIB}/pygame/scrap.so
 ${PLIST.darwin}${PYSITELIB}/pygame/sdlmain_osx.so
 ${PYSITELIB}/pygame/sndarray.py
 ${PYSITELIB}/pygame/sndarray.pyc

Index: pkgsrc/devel/py-game/distinfo
diff -u pkgsrc/devel/py-game/distinfo:1.15 pkgsrc/devel/py-game/distinfo:1.16
--- pkgsrc/devel/py-game/distinfo:1.15  Sun Oct 29 17:59:35 2023
+++ pkgsrc/devel/py-game/distinfo       Sun Oct 29 19:05:49 2023
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.15 2023/10/29 17:59:35 wiz Exp $
+$NetBSD: distinfo,v 1.16 2023/10/29 19:05:49 adam Exp $
 
 BLAKE2s (pygame-2.5.2.tar.gz) = 6e187cab6d2058fdd1345741ac5a8a408f5e2ab0ef321418cae8d630c45d23e6
 SHA512 (pygame-2.5.2.tar.gz) = 4cff4a36b53608b7fa0e6694f8130817077471e76143db7c3a83427c9269b1618b8cd053ff3c3c1872e10c2be42b991b98836c6fae253051c9a912597fdcc845
 Size (pygame-2.5.2.tar.gz) = 15788328 bytes
+SHA1 (patch-buildconfig_Setup.SDL2.in) = 300e7ce4d5442955edc724c3d052c7738780e038
+SHA1 (patch-buildconfig_config__darwin.py) = 6ab81ce5cc5c9ce1923f4c4702a0faff9f22e184
+SHA1 (patch-buildconfig_config__unix.py) = 738d41c9e3137192da21a81441a47b0603f55e14

Added files:

Index: pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL2.in
diff -u /dev/null pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL2.in:1.3
--- /dev/null   Sun Oct 29 19:05:49 2023
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL2.in        Sun Oct 29 19:05:49 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-buildconfig_Setup.SDL2.in,v 1.3 2023/10/29 19:05:49 adam Exp $
+
+Disable portmidi/porttime
+
+--- buildconfig/Setup.SDL2.in.orig     2020-12-24 13:41:52.000000000 +0000
++++ buildconfig/Setup.SDL2.in
+@@ -7,15 +7,13 @@
+ 
+ 
+ #--StartConfig
+-SDL = -I/usr/include -D_REENTRANT -DSDL2 -lSDL2
++SDL = -D_REENTRANT -DSDL2 -lSDL2
+ FONT = -lSDL2_ttf
+ IMAGE = -lSDL2_image
+ MIXER = -lSDL2_mixer
+ PNG = -lpng
+ JPEG = -ljpeg
+ SCRAP = -lX11
+-PORTMIDI = -lportmidi
+-PORTTIME = -lporttime
+ FREETYPE = -lfreetype
+ #--EndConfig
+ 

Index: pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py
diff -u /dev/null pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py:1.4
--- /dev/null   Sun Oct 29 19:05:50 2023
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py    Sun Oct 29 19:05:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-buildconfig_config__darwin.py,v 1.4 2023/10/29 19:05:49 adam Exp $
+
+Use correct libpng.
+
+--- buildconfig/config_darwin.py.orig  2023-08-14 07:36:16.000000000 +0000
++++ buildconfig/config_darwin.py
+@@ -130,7 +130,7 @@ def main(auto_config=False):
+     ]
+ 
+     DEPS.extend([
+-        Dependency('PNG', 'png.h', 'libpng', ['png']),
++        Dependency('PNG', 'png.h', 'libpng16', ['png']),
+         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+         Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
+         Dependency('PORTTIME', 'porttime.h', '', []),

Index: pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py
diff -u /dev/null pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.5
--- /dev/null   Sun Oct 29 19:05:50 2023
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py      Sun Oct 29 19:05:49 2023
@@ -0,0 +1,36 @@
+$NetBSD: patch-buildconfig_config__unix.py,v 1.5 2023/10/29 19:05:49 adam Exp $
+
+Detect X11R6 or X11R7; avoid localbase overriding search.
+Use correct libpng.
+Disable portmidi and porttime; porttime is a part of portmidi.
+
+--- buildconfig/config_unix.py.orig    2023-08-14 07:36:16.000000000 +0000
++++ buildconfig/config_unix.py
+@@ -138,8 +138,8 @@ def main(auto_config=False):
+     global origincdirs, origlibdirs
+ 
+     #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
+-    origincdirs = ['/include', '/include/SDL2']
+-    origlibdirs = ['/lib', '/lib64', '/X11R6/lib']
++    origincdirs = ['/include', '/include/SDL2', '/X11R6/include', '/X11R7/include']
++    origlibdirs = ['/lib', '/lib64', '/X11R6/lib', '/X11R7/lib']
+ 
+     # If we are on a debian based system, we also need to handle 
+     # /lib/<multiarch-tuple>
+@@ -222,14 +222,12 @@ def main(auto_config=False):
+         #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL2_gfx.so', ['SDL2_gfx']),
+     ]
+     DEPS.extend([
+-        Dependency('PNG', 'png.h', 'libpng', ['png']),
++        Dependency('PNG', 'png.h', 'libpng16', ['png']),
+         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+         Dependency('SCRAP', '', 'libX11', ['X11']),
+         #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
+     ])
+-    is_freebsd = 'FreeBSD' in platform.system()
+-    is_hurd = platform.system() == 'GNU'
+-    if not is_freebsd and not is_hurd:
++    if False:
+         porttime_dep = get_porttime_dep()
+         DEPS.append(
+             Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi'])

Prev by Date: CVS commit: pkgsrc/math/hs-mwc-random
Next by Date: CVS commit: pkgsrc/x11/py-qt5
Previous by Thread: CVS commit: pkgsrc/math/hs-mwc-random
Next by Thread: CVS commit: pkgsrc/x11/py-qt5
Indexes:

Home | Main Index | Thread Index | Old Index