* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/files/, dev-python/pygame_sdl2/
@ 2019-01-10 14:50 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2019-01-10 14:50 UTC (permalink / raw
To: gentoo-commits
commit: ce9cbff3c8210a0b96dc0b1317e747b6f136914e
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 14:49:44 2019 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 14:50:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce9cbff3
dev-python/pygame_sdl2: fix bug 635442
Add support for the latest sdl2-mixer API.
Closes: https://bugs.gentoo.org/635442
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
.../files/pygame_sdl2-6.99.12.4-mixer.patch | 43 +++++++++++++++++++++
.../pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild | 44 ++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
new file mode 100644
index 00000000000..1c3964afaa9
--- /dev/null
+++ b/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
@@ -0,0 +1,43 @@
+From ced6051f4a4559a725804cc58c079e1efea0a573 Mon Sep 17 00:00:00 2001
+From: Markus Koschany <apo@debian.org>
+Date: Sat, 11 Nov 2017 23:00:25 +0100
+Subject: [PATCH] Fix build failure due to the removal of MIX_INIT_MODPLUG and
+ the replacement of
+
+MIX_INIT_FLUIDSYNTH with MIX_INIT_MID.
+---
+ include/sdl2_mixer.pxd | 3 +--
+ src/pygame_sdl2/mixer.pyx | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/include/sdl2_mixer.pxd b/include/sdl2_mixer.pxd
+index 0cea395..4bb0187 100644
+--- a/include/sdl2_mixer.pxd
++++ b/include/sdl2_mixer.pxd
+@@ -18,10 +18,9 @@ cdef extern from "SDL_mixer.h" nogil:
+ ctypedef enum MIX_InitFlags:
+ MIX_INIT_FLAC
+ MIX_INIT_MOD
+- MIX_INIT_MODPLUG
+ MIX_INIT_MP3
+ MIX_INIT_OGG
+- MIX_INIT_FLUIDSYNTH
++ MIX_INIT_MID
+
+ int Mix_Init(int flags)
+ void Mix_Quit()
+diff --git a/src/pygame_sdl2/mixer.pyx b/src/pygame_sdl2/mixer.pyx
+index 3c5e185..bea5cbf 100644
+--- a/src/pygame_sdl2/mixer.pyx
++++ b/src/pygame_sdl2/mixer.pyx
+@@ -81,8 +81,8 @@ def init(frequency=22050, size=MIX_DEFAULT_FORMAT, channels=2, buffer=4096):
+ if get_init() is not None:
+ return
+
+- for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, MIX_INIT_MODPLUG,
+- MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_FLUIDSYNTH):
++ for flag in (MIX_INIT_FLAC, MIX_INIT_MOD,
++ MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_MID):
+
+ if Mix_Init(flag) != flag:
+ errors.append("{}\n".format(SDL_GetError()))
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
new file mode 100644
index 00000000000..2f5df88d368
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+PYSDL="${PN}-2.1.0"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+ dev-python/cython[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libpng:0
+ media-libs/libsdl2[video]
+ media-libs/sdl2-image[png,jpeg]
+ >=media-libs/sdl2-mixer-2.0.2
+ media-libs/sdl2-ttf
+ virtual/jpeg:62
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
+
+PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
+
+# PyGame distribution for this version has some pregenerated files;
+# we need to remove them
+python_prepare_all()
+{
+ rm -r "${S}"/gen{,3} || die
+ distutils-r1_python_prepare_all
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/files/, dev-python/pygame_sdl2/
@ 2024-08-20 21:39 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2024-08-20 21:39 UTC (permalink / raw
To: gentoo-commits
commit: b647e3d005c57a3eb511572001fa3a135ef1bacf
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 21:34:37 2024 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 21:36:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b647e3d0
dev-python/pygame_sdl2: restore package
- Update to 8.2.3
- Test and update PYTHON_COMPAT
- Fix build with cython-3 (#911781)
Closes: https://bugs.gentoo.org/911781
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
dev-python/pygame_sdl2/Manifest | 1 +
.../files/pygame_sdl2-8.2.3-cython-3.patch | 204 +++++++++++++++++++++
dev-python/pygame_sdl2/metadata.xml | 12 ++
dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild | 47 +++++
4 files changed, 264 insertions(+)
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
new file mode 100644
index 000000000000..5ed7217741c1
--- /dev/null
+++ b/dev-python/pygame_sdl2/Manifest
@@ -0,0 +1 @@
+DIST pygame_sdl2-2.1.0+renpy8.2.3.tar.gz 4270114 BLAKE2B ae70253fc717334e65c438d36bd2991c909ee64c6b47f9c175fd53c1567ea54d2a42ea65cda85560387e744ff792b34658d393f3018d2941e5111efba064236a SHA512 9b3ae71a648511f243d235ba5e81661dde5d0871a4517494f2789c20f95e110305e42bdb635308165cf3985d1096b296a16140c03cbd446db17997c05025b8e3
diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch
new file mode 100644
index 000000000000..2011eadfbffb
--- /dev/null
+++ b/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch
@@ -0,0 +1,204 @@
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx 2015-04-04 18:05:58.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx 2024-08-20 23:31:04.313616957 +0300
+@@ -27,7 +27,7 @@
+ 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)
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx 2019-04-03 08:15:40.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx 2024-08-20 23:27:49.115394156 +0300
+@@ -57,7 +57,7 @@
+ 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
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx 2024-01-29 06:06:06.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx 2024-08-20 23:22:53.081539270 +0300
+@@ -63,7 +63,7 @@
+ msg = <char *> 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 = <object> context.hidden.unknown.data1
+
+ try:
+@@ -76,7 +76,7 @@
+
+ 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 = <object> context.hidden.unknown.data1
+
+ try:
+@@ -88,7 +88,7 @@
+
+ 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 = <object> context.hidden.unknown.data1
+
+ try:
+@@ -100,7 +100,7 @@
+ memcpy(ptr, <void *><char *> 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 = <object> context.hidden.unknown.data1
+ data = (<char *> ptr)[:size * maxnum]
+
+@@ -112,7 +112,7 @@
+
+ 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 = <object> context.hidden.unknown.data1
+@@ -135,11 +135,11 @@
+ Sint64 length
+ Sint64 tell
+
+-cdef Sint64 subfile_size(SDL_RWops *context) nogil:
++cdef Sint64 subfile_size(SDL_RWops *context) noexcept nogil:
+ cdef SubFile *sf = <SubFile *> 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 = <SubFile *> context.hidden.unknown.data1
+
+ if whence == RW_SEEK_SET:
+@@ -151,7 +151,7 @@
+
+ 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 = <SubFile *> context.hidden.unknown.data1
+
+ cdef Sint64 left = sf.length - sf.tell
+@@ -170,7 +170,7 @@
+
+ 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,13 +191,13 @@
+ Sint64 split
+ Sint64 tell
+
+-cdef Sint64 splitfile_size(SDL_RWops *context) nogil:
++cdef Sint64 splitfile_size(SDL_RWops *context) noexcept nogil:
+ cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
+ cdef Sint64 rv
+
+ return SDL_RWsize(sf.a) + SDL_RWsize(sf.b)
+
+-cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil:
++cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil:
+ cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
+ cdef Sint64 rv
+
+@@ -220,7 +220,7 @@
+ else:
+ return sf.tell
+
+-cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil:
++cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil:
+ cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
+ cdef Sint64 left = splitfile_size(context) - sf.tell
+ cdef size_t rv
+@@ -251,7 +251,7 @@
+
+ return (left_read + right_read) // size
+
+-cdef int splitfile_close(SDL_RWops *context) nogil:
++cdef int splitfile_close(SDL_RWops *context) noexcept nogil:
+ cdef SplitFile *sf
+
+ if context != NULL:
+@@ -274,12 +274,12 @@
+ Uint8 *here
+ Uint8 *stop
+
+-cdef Sint64 buffile_size(SDL_RWops *context) nogil:
++cdef Sint64 buffile_size(SDL_RWops *context) noexcept nogil:
+ cdef BufFile *bf = <BufFile *> 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 = <BufFile *> context.hidden.unknown.data1
+
+ cdef Uint8 *newpos
+@@ -302,7 +302,7 @@
+
+ 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 = <BufFile *> context.hidden.unknown.data1
+ cdef size_t total_bytes = 0
+ cdef size_t mem_available = 0
+@@ -320,7 +320,7 @@
+
+ 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 = <BufFile *> context.hidden.unknown.data1
+
+ if bf.view.readonly != 0:
+@@ -333,7 +333,7 @@
+
+ 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:
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx 2023-03-30 06:10:16.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx 2024-08-20 23:23:41.720844257 +0300
+@@ -34,7 +34,7 @@
+ int pygame_Blit (SDL_Surface * src, SDL_Rect * srcrect,
+ SDL_Surface * dst, SDL_Rect * dstrect, int the_args);
+
+-cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) nogil:
++cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) noexcept nogil:
+ if src < dst:
+ src += (h - 1) * srcpitch;
+ dst += (h - 1) * dstpitch;
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx 2015-08-13 03:31:25.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx 2024-08-20 23:24:30.513150042 +0300
+@@ -119,7 +119,7 @@
+ p += x
+ return p[0]
+
+-cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) nogil:
++cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) noexcept nogil:
+ cdef uint32_t *p = <uint32_t*>surf.pixels
+ p += y * (surf.pitch // sizeof(uint32_t))
+ p += x
diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml
new file mode 100644
index 000000000000..ca10416f8e59
--- /dev/null
+++ b/dev-python/pygame_sdl2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">renpy/pygame_sdl2</remote-id>
+ <remote-id type="pypi">pygame_sdl2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild
new file mode 100644
index 000000000000..44da5ea76b34
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+MY_P="${PN}-2.1.0+renpy${PV}"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="https://www.renpy.org/dl/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-8.2.3-cython-3.patch" )
+
+# <wheel-0.41.0 wasn't installing headers correctly
+# https://github.com/pypa/setuptools/issues/3997
+BDEPEND="
+ dev-python/cython[${PYTHON_USEDEP}]
+ >=dev-python/wheel-0.41.0
+"
+DEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ media-libs/libsdl2:=[video]
+ media-libs/sdl2-image:=[png,jpeg]
+ >=media-libs/sdl2-mixer-2.0.2:=
+ media-libs/sdl2-ttf:=
+"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+ # PyGame distribution for this version has some pregenerated files;
+ # we need to remove them
+ rm -r gen{,3,-static} || die
+
+ distutils-r1_python_prepare_all
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/files/, dev-python/pygame_sdl2/
@ 2024-08-22 14:21 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-08-22 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 3101c91d58e2f0b6d25404fb160b7147904e6f44
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 14:19:44 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 14:19:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3101c91d
dev-python/pygame_sdl2: Revert "restore package"
The package has been added a few hours prior to retirement deadline
for the developer. It does not feature working tests. Reverting
as it does not assure sufficient future maintenance perspectives.
Reverts: b647e3d005c57a3eb511572001fa3a135ef1bacf
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pygame_sdl2/Manifest | 1 -
.../files/pygame_sdl2-8.2.3-cython-3.patch | 204 ---------------------
dev-python/pygame_sdl2/metadata.xml | 12 --
dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild | 47 -----
4 files changed, 264 deletions(-)
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
deleted file mode 100644
index 5ed7217741c1..000000000000
--- a/dev-python/pygame_sdl2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pygame_sdl2-2.1.0+renpy8.2.3.tar.gz 4270114 BLAKE2B ae70253fc717334e65c438d36bd2991c909ee64c6b47f9c175fd53c1567ea54d2a42ea65cda85560387e744ff792b34658d393f3018d2941e5111efba064236a SHA512 9b3ae71a648511f243d235ba5e81661dde5d0871a4517494f2789c20f95e110305e42bdb635308165cf3985d1096b296a16140c03cbd446db17997c05025b8e3
diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch
deleted file mode 100644
index 2011eadfbffb..000000000000
--- a/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx
---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx 2015-04-04 18:05:58.000000000 +0300
-+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx 2024-08-20 23:31:04.313616957 +0300
-@@ -27,7 +27,7 @@
- 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)
-diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx
---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx 2019-04-03 08:15:40.000000000 +0300
-+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx 2024-08-20 23:27:49.115394156 +0300
-@@ -57,7 +57,7 @@
- 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
-diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx
---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx 2024-01-29 06:06:06.000000000 +0300
-+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx 2024-08-20 23:22:53.081539270 +0300
-@@ -63,7 +63,7 @@
- msg = <char *> 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 = <object> context.hidden.unknown.data1
-
- try:
-@@ -76,7 +76,7 @@
-
- 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 = <object> context.hidden.unknown.data1
-
- try:
-@@ -88,7 +88,7 @@
-
- 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 = <object> context.hidden.unknown.data1
-
- try:
-@@ -100,7 +100,7 @@
- memcpy(ptr, <void *><char *> 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 = <object> context.hidden.unknown.data1
- data = (<char *> ptr)[:size * maxnum]
-
-@@ -112,7 +112,7 @@
-
- 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 = <object> context.hidden.unknown.data1
-@@ -135,11 +135,11 @@
- Sint64 length
- Sint64 tell
-
--cdef Sint64 subfile_size(SDL_RWops *context) nogil:
-+cdef Sint64 subfile_size(SDL_RWops *context) noexcept nogil:
- cdef SubFile *sf = <SubFile *> 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 = <SubFile *> context.hidden.unknown.data1
-
- if whence == RW_SEEK_SET:
-@@ -151,7 +151,7 @@
-
- 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 = <SubFile *> context.hidden.unknown.data1
-
- cdef Sint64 left = sf.length - sf.tell
-@@ -170,7 +170,7 @@
-
- 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,13 +191,13 @@
- Sint64 split
- Sint64 tell
-
--cdef Sint64 splitfile_size(SDL_RWops *context) nogil:
-+cdef Sint64 splitfile_size(SDL_RWops *context) noexcept nogil:
- cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
- cdef Sint64 rv
-
- return SDL_RWsize(sf.a) + SDL_RWsize(sf.b)
-
--cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil:
-+cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil:
- cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
- cdef Sint64 rv
-
-@@ -220,7 +220,7 @@
- else:
- return sf.tell
-
--cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil:
-+cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil:
- cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
- cdef Sint64 left = splitfile_size(context) - sf.tell
- cdef size_t rv
-@@ -251,7 +251,7 @@
-
- return (left_read + right_read) // size
-
--cdef int splitfile_close(SDL_RWops *context) nogil:
-+cdef int splitfile_close(SDL_RWops *context) noexcept nogil:
- cdef SplitFile *sf
-
- if context != NULL:
-@@ -274,12 +274,12 @@
- Uint8 *here
- Uint8 *stop
-
--cdef Sint64 buffile_size(SDL_RWops *context) nogil:
-+cdef Sint64 buffile_size(SDL_RWops *context) noexcept nogil:
- cdef BufFile *bf = <BufFile *> 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 = <BufFile *> context.hidden.unknown.data1
-
- cdef Uint8 *newpos
-@@ -302,7 +302,7 @@
-
- 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 = <BufFile *> context.hidden.unknown.data1
- cdef size_t total_bytes = 0
- cdef size_t mem_available = 0
-@@ -320,7 +320,7 @@
-
- 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 = <BufFile *> context.hidden.unknown.data1
-
- if bf.view.readonly != 0:
-@@ -333,7 +333,7 @@
-
- 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:
-diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx
---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx 2023-03-30 06:10:16.000000000 +0300
-+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx 2024-08-20 23:23:41.720844257 +0300
-@@ -34,7 +34,7 @@
- int pygame_Blit (SDL_Surface * src, SDL_Rect * srcrect,
- SDL_Surface * dst, SDL_Rect * dstrect, int the_args);
-
--cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) nogil:
-+cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) noexcept nogil:
- if src < dst:
- src += (h - 1) * srcpitch;
- dst += (h - 1) * dstpitch;
-diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx
---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx 2015-08-13 03:31:25.000000000 +0300
-+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx 2024-08-20 23:24:30.513150042 +0300
-@@ -119,7 +119,7 @@
- p += x
- return p[0]
-
--cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) nogil:
-+cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) noexcept nogil:
- cdef uint32_t *p = <uint32_t*>surf.pixels
- p += y * (surf.pitch // sizeof(uint32_t))
- p += x
diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml
deleted file mode 100644
index ca10416f8e59..000000000000
--- a/dev-python/pygame_sdl2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="github">renpy/pygame_sdl2</remote-id>
- <remote-id type="pypi">pygame_sdl2</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild
deleted file mode 100644
index 44da5ea76b34..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-MY_P="${PN}-2.1.0+renpy${PV}"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="https://www.renpy.org/dl/${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}/${PN}-8.2.3-cython-3.patch" )
-
-# <wheel-0.41.0 wasn't installing headers correctly
-# https://github.com/pypa/setuptools/issues/3997
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/wheel-0.41.0
-"
-DEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- media-libs/libsdl2:=[video]
- media-libs/sdl2-image:=[png,jpeg]
- >=media-libs/sdl2-mixer-2.0.2:=
- media-libs/sdl2-ttf:=
-"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
- # PyGame distribution for this version has some pregenerated files;
- # we need to remove them
- rm -r gen{,3,-static} || die
-
- distutils-r1_python_prepare_all
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-22 14:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-20 21:39 [gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/files/, dev-python/pygame_sdl2/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2024-08-22 14:21 Michał Górny
2019-01-10 14:50 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox