Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A799E84D4C for ; Thu, 23 Nov 2023 15:39:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pK_Scqme8kvg for ; Thu, 23 Nov 2023 15:39:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7C47E84D3C for ; Thu, 23 Nov 2023 15:39:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 75AEAFA3F; Thu, 23 Nov 2023 15:39:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1700753945264500" MIME-Version: 1.0 Date: Thu, 23 Nov 2023 15:39:05 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/devel/py-game_sdl2 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20231123153905.75AEAFA3F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1700753945264500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Thu Nov 23 15:39:05 UTC 2023 Modified Files: pkgsrc/devel/py-game_sdl2: Makefile distinfo Added Files: pkgsrc/devel/py-game_sdl2/patches: patch-src_pygame__sdl2_image.pyx patch-src_pygame__sdl2_mixer.pyx patch-src_pygame__sdl2_mixer__music.pyx patch-src_pygame__sdl2_rwobject.pyx Log Message: py-game_sdl2: Update to 2.1.0.8.1.3 * Support Cython 3. No considereation for performance. * Python 3.12 is not supported. Changelog: * Sync with RenPy 8.1.3. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-game_sdl2/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-game_sdl2/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_image.pyx \ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer.pyx \ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer__music.pyx \ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_rwobject.pyx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1700753945264500 Content-Disposition: inline Content-Length: 10798 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-game_sdl2/Makefile diff -u pkgsrc/devel/py-game_sdl2/Makefile:1.4 pkgsrc/devel/py-game_sdl2/Makefile:1.5 --- pkgsrc/devel/py-game_sdl2/Makefile:1.4 Sun Nov 12 13:21:10 2023 +++ pkgsrc/devel/py-game_sdl2/Makefile Thu Nov 23 15:39:05 2023 @@ -1,23 +1,22 @@ -# $NetBSD: Makefile,v 1.4 2023/11/12 13:21:10 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/11/23 15:39:05 ryoon Exp $ -DISTNAME= pygame_sdl2-2.1.0-for-renpy-8.0.3 -PKGNAME= ${PYPKGPREFIX}-game_sdl2-2.1.0 -PKGREVISION= 2 +DISTNAME= pygame_sdl2-2.1.0+renpy8.1.3 +PKGNAME= ${PYPKGPREFIX}-game_sdl2-2.1.0.8.1.3 CATEGORIES= devel games python -MASTER_SITES= https://www.renpy.org/dl/8.0.3/ +MASTER_SITES= https://www.renpy.org/dl/8.1.3/ MAINTAINER= ryoon@NetBSD.org HOMEPAGE= https://github.com/renpy/pygame_sdl2 COMMENT= Set of Python modules designed for writing games for RenPy LICENSE= gnu-lgpl-v2.1 -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 27 312 TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython USE_TOOLS+= pkg-config -EGG_NAME= pygame_sdl2-${PKGVERSION_NOREV} +EGG_NAME= pygame_sdl2-2.1.0 REPLACE_PYTHON+= examples/*.py REPLACE_PYTHON+= setup.py @@ -40,8 +39,9 @@ PLIST.unix= yes post-extract: # Do not use pre-generated cython results. # *_api.h is missing and it faild in install stage. - # These requires correct cython_dommand. + # These requires correct cython_command. ${RM} -f ${WRKSRC}/gen/* + ${RM} -f ${WRKSRC}/gen-static/* ${RM} -f ${WRKSRC}/gen3/* # Do not use invalid version number. ${RM} -f ${WRKSRC}/setup.cfg Index: pkgsrc/devel/py-game_sdl2/distinfo diff -u pkgsrc/devel/py-game_sdl2/distinfo:1.1 pkgsrc/devel/py-game_sdl2/distinfo:1.2 --- pkgsrc/devel/py-game_sdl2/distinfo:1.1 Fri Mar 10 21:06:07 2023 +++ pkgsrc/devel/py-game_sdl2/distinfo Thu Nov 23 15:39:05 2023 @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.1 2023/03/10 21:06:07 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2023/11/23 15:39:05 ryoon Exp $ -BLAKE2s (pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz) = cb25ff76ea4555e8156c92064f8749454b96c0213274aea5bbf438bfbbe851e2 -SHA512 (pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz) = 135779d4de6e2bc8ade069c11d521dd0dc2bebae6dc63a374d478785fe7534626e9dc3c7f8f50c3291f4a60b26eb474c14e3971f0b9487215125bbcd5af6782c -Size (pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz) = 4053740 bytes +BLAKE2s (pygame_sdl2-2.1.0+renpy8.1.3.tar.gz) = da635704fee0885d0b29e6930479e05a581a41563d1f1f73e108072f5b69e248 +SHA512 (pygame_sdl2-2.1.0+renpy8.1.3.tar.gz) = 3754a29996aa1992748d49b3d178d18e0cefdf17a63c7181027a3210f7360ac01b3a1d90691bb9789085cb8b61331118e6db93be24ea81b2e24e77e3b0de556c +Size (pygame_sdl2-2.1.0+renpy8.1.3.tar.gz) = 4252499 bytes +SHA1 (patch-src_pygame__sdl2_image.pyx) = 91bd8fb9da47d4e70837d78fabb9adeb3e2ea25b +SHA1 (patch-src_pygame__sdl2_mixer.pyx) = 71bd73d47360a7e384fcc3db4767e1808d21d280 +SHA1 (patch-src_pygame__sdl2_mixer__music.pyx) = 098415b8235d9da74933651e472852125661b02d +SHA1 (patch-src_pygame__sdl2_rwobject.pyx) = a87e264d3f512264ac91508d30a8083294e45341 Added files: Index: pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_image.pyx diff -u /dev/null pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_image.pyx:1.1 --- /dev/null Thu Nov 23 15:39:05 2023 +++ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_image.pyx Thu Nov 23 15:39:05 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_pygame__sdl2_image.pyx,v 1.1 2023/11/23 15:39:05 ryoon Exp $ + +--- src/pygame_sdl2/image.pyx.orig 2023-11-21 05:06:52.531403700 +0000 ++++ src/pygame_sdl2/image.pyx +@@ -147,10 +147,10 @@ def load(fi, namehint="", size=None): + return surf + + cdef extern from "write_jpeg.h": +- int Pygame_SDL2_SaveJPEG(SDL_Surface *, char *, int) nogil ++ int Pygame_SDL2_SaveJPEG(SDL_Surface *, char *, int) noexcept nogil + + cdef extern from "write_png.h": +- int Pygame_SDL2_SavePNG(const char *, SDL_Surface *, int) nogil ++ int Pygame_SDL2_SavePNG(const char *, SDL_Surface *, int) noexcept nogil + + def save(Surface surface not None, filename, compression=-1): + Index: pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer.pyx diff -u /dev/null pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer.pyx:1.1 --- /dev/null Thu Nov 23 15:39:05 2023 +++ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer.pyx Thu Nov 23 15:39:05 2023 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_pygame__sdl2_mixer.pyx,v 1.1 2023/11/23 15:39:05 ryoon Exp $ + +--- src/pygame_sdl2/mixer.pyx.orig 2023-11-21 07:03:05.449771728 +0000 ++++ src/pygame_sdl2/mixer.pyx +@@ -57,7 +57,7 @@ def _play_current(int channel): + Mix_PlayChannelTimed(channel, next_sound.chunk, 0, -1) + + +-cdef void channel_callback(int channel) with gil: ++cdef void channel_callback(int channel) noexcept with gil: + + cdef int etype = 0 + cdef SDL_Event e Index: pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer__music.pyx diff -u /dev/null pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer__music.pyx:1.1 --- /dev/null Thu Nov 23 15:39:05 2023 +++ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_mixer__music.pyx Thu Nov 23 15:39:05 2023 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_pygame__sdl2_mixer__music.pyx,v 1.1 2023/11/23 15:39:05 ryoon Exp $ + +--- src/pygame_sdl2/mixer_music.pyx.orig 2023-11-21 07:03:36.136395079 +0000 ++++ src/pygame_sdl2/mixer_music.pyx +@@ -27,7 +27,7 @@ cdef Mix_Music *current_music = NULL + cdef object queued_music = None + cdef int endevent = 0 + +-cdef void music_finished(): ++cdef void music_finished() noexcept: + global queued_music + if queued_music: + load(queued_music) Index: pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_rwobject.pyx diff -u /dev/null pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_rwobject.pyx:1.1 --- /dev/null Thu Nov 23 15:39:05 2023 +++ pkgsrc/devel/py-game_sdl2/patches/patch-src_pygame__sdl2_rwobject.pyx Thu Nov 23 15:39:05 2023 @@ -0,0 +1,123 @@ +$NetBSD: patch-src_pygame__sdl2_rwobject.pyx,v 1.1 2023/11/23 15:39:05 ryoon Exp $ + +--- src/pygame_sdl2/rwobject.pyx.orig 2023-01-22 00:20:52.000000000 +0000 ++++ src/pygame_sdl2/rwobject.pyx +@@ -64,7 +64,7 @@ cdef set_error(e): + msg = e + SDL_SetError("%s", msg) + +-cdef Sint64 python_size(SDL_RWops *context) with gil: ++cdef Sint64 python_size(SDL_RWops *context) noexcept with gil: + f = context.hidden.unknown.data1 + + try: +@@ -77,7 +77,7 @@ cdef Sint64 python_size(SDL_RWops *conte + + return rv + +-cdef Sint64 python_seek(SDL_RWops *context, Sint64 seek, int whence) with gil: ++cdef Sint64 python_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept with gil: + f = context.hidden.unknown.data1 + + try: +@@ -89,7 +89,7 @@ cdef Sint64 python_seek(SDL_RWops *conte + + return rv + +-cdef size_t python_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) with gil: ++cdef size_t python_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept with gil: + f = context.hidden.unknown.data1 + + try: +@@ -101,7 +101,7 @@ cdef size_t python_read(SDL_RWops *conte + memcpy(ptr, data, len(data)) + return len(data) + +-cdef size_t python_write(SDL_RWops *context, const void *ptr, size_t size, size_t maxnum) with gil: ++cdef size_t python_write(SDL_RWops *context, const void *ptr, size_t size, size_t maxnum) noexcept with gil: + f = context.hidden.unknown.data1 + data = ( ptr)[:size * maxnum] + +@@ -113,7 +113,7 @@ cdef size_t python_write(SDL_RWops *cont + + return len(data) + +-cdef int python_close(SDL_RWops *context) with gil: ++cdef int python_close(SDL_RWops *context) noexcept with gil: + if context != NULL: + if context.hidden.unknown.data1 != NULL: + f = context.hidden.unknown.data1 +@@ -136,11 +136,11 @@ cdef struct SubFile: + Sint64 length + Sint64 tell + +-cdef Sint64 subfile_size(SDL_RWops *context) nogil: ++cdef Sint64 subfile_size(SDL_RWops *context) noexcept nogil: + cdef SubFile *sf = context.hidden.unknown.data1 + return sf.length + +-cdef Sint64 subfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil: ++cdef Sint64 subfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil: + cdef SubFile *sf = context.hidden.unknown.data1 + + if whence == RW_SEEK_SET: +@@ -152,7 +152,7 @@ cdef Sint64 subfile_seek(SDL_RWops *cont + + return sf.tell + +-cdef size_t subfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil: ++cdef size_t subfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil: + cdef SubFile *sf = context.hidden.unknown.data1 + + cdef Sint64 left = sf.length - sf.tell +@@ -171,7 +171,7 @@ cdef size_t subfile_read(SDL_RWops *cont + + return rv + +-cdef int subfile_close(SDL_RWops *context) nogil: ++cdef int subfile_close(SDL_RWops *context) noexcept nogil: + cdef SubFile *sf + + if context != NULL: +@@ -191,12 +191,12 @@ cdef struct BufFile: + Uint8 *here + Uint8 *stop + +-cdef Sint64 buffile_size(SDL_RWops *context) nogil: ++cdef Sint64 buffile_size(SDL_RWops *context) noexcept nogil: + cdef BufFile *bf = context.hidden.unknown.data1 + + return bf.stop - bf.base + +-cdef Sint64 buffile_seek(SDL_RWops *context, Sint64 offset, int whence) nogil: ++cdef Sint64 buffile_seek(SDL_RWops *context, Sint64 offset, int whence) noexcept nogil: + cdef BufFile *bf = context.hidden.unknown.data1 + + cdef Uint8 *newpos +@@ -219,7 +219,7 @@ cdef Sint64 buffile_seek(SDL_RWops *cont + + return bf.here - bf.base + +-cdef size_t buffile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil: ++cdef size_t buffile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil: + cdef BufFile *bf = context.hidden.unknown.data1 + cdef size_t total_bytes = 0 + cdef size_t mem_available = 0 +@@ -237,7 +237,7 @@ cdef size_t buffile_read(SDL_RWops *cont + + return (total_bytes // size) + +-cdef size_t buffile_write(SDL_RWops *context, const void *ptr, size_t size, size_t num) nogil: ++cdef size_t buffile_write(SDL_RWops *context, const void *ptr, size_t size, size_t num) noexcept nogil: + cdef BufFile *bf = context.hidden.unknown.data1 + + if bf.view.readonly != 0: +@@ -250,7 +250,7 @@ cdef size_t buffile_write(SDL_RWops *con + + return num + +-cdef int buffile_close(SDL_RWops *context) with gil: ++cdef int buffile_close(SDL_RWops *context) noexcept with gil: + cdef BufFile *bf + + if context != NULL: --_----------=_1700753945264500--