Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/, dev-python/pygame_sdl2/files/
Date: Sun, 17 Oct 2021 09:20:55
Message-Id: 1634462432.c3c482496c66f18c4d964cc93fb5e50f6aaa2fb1.mgorny@gentoo
1 commit: c3c482496c66f18c4d964cc93fb5e50f6aaa2fb1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 17 09:15:23 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 17 09:20:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c48249
7
8 dev-python/pygame_sdl2: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pygame_sdl2/Manifest | 1 -
13 .../files/pygame_sdl2-6.99.12.4-mixer.patch | 43 --------------------
14 .../pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild | 46 ----------------------
15 dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild | 44 ---------------------
16 4 files changed, 134 deletions(-)
17
18 diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
19 index 4b8f875fd5c..2c1ae61b091 100644
20 --- a/dev-python/pygame_sdl2/Manifest
21 +++ b/dev-python/pygame_sdl2/Manifest
22 @@ -1,2 +1 @@
23 -DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
24 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
25
26 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
27 deleted file mode 100644
28 index 1c3964afaa9..00000000000
29 --- a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
30 +++ /dev/null
31 @@ -1,43 +0,0 @@
32 -From ced6051f4a4559a725804cc58c079e1efea0a573 Mon Sep 17 00:00:00 2001
33 -From: Markus Koschany <apo@××××××.org>
34 -Date: Sat, 11 Nov 2017 23:00:25 +0100
35 -Subject: [PATCH] Fix build failure due to the removal of MIX_INIT_MODPLUG and
36 - the replacement of
37 -
38 -MIX_INIT_FLUIDSYNTH with MIX_INIT_MID.
39 ----
40 - include/sdl2_mixer.pxd | 3 +--
41 - src/pygame_sdl2/mixer.pyx | 4 ++--
42 - 2 files changed, 3 insertions(+), 4 deletions(-)
43 -
44 -diff --git a/include/sdl2_mixer.pxd b/include/sdl2_mixer.pxd
45 -index 0cea395..4bb0187 100644
46 ---- a/include/sdl2_mixer.pxd
47 -+++ b/include/sdl2_mixer.pxd
48 -@@ -18,10 +18,9 @@ cdef extern from "SDL_mixer.h" nogil:
49 - ctypedef enum MIX_InitFlags:
50 - MIX_INIT_FLAC
51 - MIX_INIT_MOD
52 -- MIX_INIT_MODPLUG
53 - MIX_INIT_MP3
54 - MIX_INIT_OGG
55 -- MIX_INIT_FLUIDSYNTH
56 -+ MIX_INIT_MID
57 -
58 - int Mix_Init(int flags)
59 - void Mix_Quit()
60 -diff --git a/src/pygame_sdl2/mixer.pyx b/src/pygame_sdl2/mixer.pyx
61 -index 3c5e185..bea5cbf 100644
62 ---- a/src/pygame_sdl2/mixer.pyx
63 -+++ b/src/pygame_sdl2/mixer.pyx
64 -@@ -81,8 +81,8 @@ def init(frequency=22050, size=MIX_DEFAULT_FORMAT, channels=2, buffer=4096):
65 - if get_init() is not None:
66 - return
67 -
68 -- for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, MIX_INIT_MODPLUG,
69 -- MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_FLUIDSYNTH):
70 -+ for flag in (MIX_INIT_FLAC, MIX_INIT_MOD,
71 -+ MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_MID):
72 -
73 - if Mix_Init(flag) != flag:
74 - errors.append("{}\n".format(SDL_GetError()))
75
76 diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
77 deleted file mode 100644
78 index 8040d7a0a1f..00000000000
79 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
80 +++ /dev/null
81 @@ -1,46 +0,0 @@
82 -# Copyright 1999-2021 Gentoo Authors
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=7
86 -
87 -PYTHON_COMPAT=( python{3_7,3_8} )
88 -inherit distutils-r1
89 -
90 -PYSDL="${PN}-2.1.0"
91 -
92 -DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
93 -HOMEPAGE="https://github.com/renpy/pygame_sdl2"
94 -SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
95 -
96 -LICENSE="LGPL-2.1 ZLIB"
97 -SLOT="0"
98 -KEYWORDS="~amd64 ~x86"
99 -IUSE=""
100 -
101 -BDEPEND="
102 - dev-python/cython[${PYTHON_USEDEP}]"
103 -DEPEND="
104 - $(python_gen_cond_dep '
105 - dev-python/numpy[${PYTHON_USEDEP}]
106 - ' -3)
107 - $(python_gen_cond_dep '
108 - dev-python/numpy-python2[${PYTHON_USEDEP}]
109 - ' -2)
110 - media-libs/libpng:0=
111 - media-libs/libsdl2:=[video]
112 - media-libs/sdl2-image:=[png,jpeg]
113 - >=media-libs/sdl2-mixer-2.0.2:=
114 - media-libs/sdl2-ttf:=
115 - virtual/jpeg:0"
116 -RDEPEND="${DEPEND}"
117 -
118 -S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
119 -
120 -PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
121 -
122 -# PyGame distribution for this version has some pregenerated files;
123 -# we need to remove them
124 -python_prepare_all() {
125 - rm -r gen{,3} || die
126 - distutils-r1_python_prepare_all
127 -}
128
129 diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
130 deleted file mode 100644
131 index 4c3cac2456c..00000000000
132 --- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
133 +++ /dev/null
134 @@ -1,44 +0,0 @@
135 -# Copyright 1999-2021 Gentoo Authors
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=7
139 -
140 -PYTHON_COMPAT=( python3_{7,8,9} )
141 -inherit distutils-r1
142 -
143 -PYSDL="${PN}-2.1.0"
144 -
145 -DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
146 -HOMEPAGE="https://github.com/renpy/pygame_sdl2"
147 -SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
148 -
149 -LICENSE="LGPL-2.1 ZLIB"
150 -SLOT="0"
151 -KEYWORDS="amd64 x86"
152 -IUSE=""
153 -
154 -BDEPEND="
155 - dev-python/cython[${PYTHON_USEDEP}]"
156 -DEPEND="
157 - $(python_gen_cond_dep '
158 - dev-python/numpy[${PYTHON_USEDEP}]
159 - ' -3)
160 - $(python_gen_cond_dep '
161 - dev-python/numpy-python2[${PYTHON_USEDEP}]
162 - ' -2)
163 - media-libs/libpng:0=
164 - media-libs/libsdl2:=[video]
165 - media-libs/sdl2-image:=[png,jpeg]
166 - >=media-libs/sdl2-mixer-2.0.2:=
167 - media-libs/sdl2-ttf:=
168 - virtual/jpeg:0"
169 -RDEPEND="${DEPEND}"
170 -
171 -S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
172 -
173 -# PyGame distribution for this version has some pregenerated files;
174 -# we need to remove them
175 -python_prepare_all() {
176 - rm -r gen{,3} || die
177 - distutils-r1_python_prepare_all
178 -}