gentoo auto-resync : 21:05:2024 - 00:05:35

4 files changed, 43 insertions, 92 deletions

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 025f172dd9b9..64e63dc3e529 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,6 +1,5 @@
 AUX pygame-2.5.2-error.patch 3723 BLAKE2B 3a3196e5eb4fa24f7246c05f016d78a94b40d620ec3d60ad48342ffb1d5c6d90e87dcb37d42f9b4987286645c92862377a1eb314bdda86a568fb4700438123c5 SHA512 63495f55322499a80e46c284a4cda52014f071652608dcbe7c45ab164ae5c1c49588da6c8bc7e61fb63852ef2aa3ca9ab22a61431b8ae932d5f811622cc484c1
-DIST pygame-2.5.1.gh.tar.gz 6854761 BLAKE2B e137f73a3bb718213ef92e938ed1b065f5568d7dd2ade6edd973bc55d06425874da0e89e3c102fad39adac25f977ac97025a0c59099702cfabeffd0d3b8f109f SHA512 d7aceb2bc6e40c5dc2d7a19fdc7af18abf021b79dd98b859975f99ec10895e1b09e11fbf17fd6ab925d3aa6c64e5b3dd56c0d857ecacc67303d92fc0efb2630c
+AUX pygame-2.5.2-gcc-14.patch 1422 BLAKE2B f633ec57ac672ebe0eb0e8404f27152ed732815296f9a06439e4385e7bae4ae55f2c13f166a954c05e19e2165da82b1ec089e1e3e2befff912fbba779c4970f3 SHA512 0dee5a832cceb65fd5ab9fae8ee81c982be5eea63e02bd3a463bd1d7f1af2877bfa68d7a53659574eed926ee54dbcc3d9cbd6c63bcadd181f0ec628ea7d63b0c
 DIST pygame-2.5.2.gh.tar.gz 5970857 BLAKE2B 523874926a8fd868f5674ed2997a44decb928fcfe246d551249ed7320a0e908ce46d00f459d187726edf74a4c1038cd56821f6466559fb7d24aa75d16769cbfe SHA512 b54e9b80951c8a9e75666621aafc26874c6dbdab27330146f7217346c76be5627a5464a0102a5968eca0dbd7cced4b2143cd2ff1b6227e3e17e5634854b27f19
-EBUILD pygame-2.5.1.ebuild 1920 BLAKE2B a2d78d5376cb4a12ba94e50a26bbc3527bd3e86375f60ee3f57c6c53bd5bce60a4ba1bb2f0caa272ca485ee3a887dea0283c56308aec829a0ac821f8cc95f9f2 SHA512 1a4de14a9b1f56adc7d85d34bf3d6b0119151f58c8cc39975346b70972043ad5a27053c52b485ed9e634ca0ddae37b4925ddf34e623366dc5e2d4a4b0dec608b
-EBUILD pygame-2.5.2-r1.ebuild 2225 BLAKE2B 4afa2ec15ed6d87f6302e5bf622995864c616d072c171f96ec72d03b26b2f07b22edcd57bf97661497e0c0c11128d0a5e0660ae5314dc2c1ae2d05b010ec8591 SHA512 08f80f225c73eb18068a3d12f5ffa24fc99701cb4b8165d52686d3a31f2e15aa2f321766323c08702f9f084d345145e8ae942285df622a3dbf87fd4c52f63d1c
+EBUILD pygame-2.5.2-r2.ebuild 2309 BLAKE2B c7e5a39aa5d59a947d51894b6968368199a5ba2618b337efaf7c565320ba3056e82c3d203c7b7a20cba9047afcfa32ced71504c9f010618fe40de7db14da816d SHA512 73c27c978a6eefab8405cc7360331e24739369b4661048f1c3df36d02ea6f3857c4939f0d798ab127a6ccabf9bbd8bdde5276efa46223892b52879174af6dc62
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/files/pygame-2.5.2-gcc-14.patch b/dev-python/pygame/files/pygame-2.5.2-gcc-14.patch
new file mode 100644
index 000000000000..0d74303bbba4
--- /dev/null
+++ b/dev-python/pygame/files/pygame-2.5.2-gcc-14.patch
@@ -0,0 +1,38 @@
+From 504a11fd4855e33ecb945af1270311aa463aae59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renesd@gmail.com>
+Date: Sun, 19 May 2024 11:12:33 +0200
+Subject: [PATCH] pypm: Fix incorrect param in Pm_OpenInput
+
+---
+ src_c/cython/pygame/pypm.pyx | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src_c/cython/pygame/pypm.pyx b/src_c/cython/pygame/pypm.pyx
+index f2c16c9e2b..54a88fd83a 100644
+--- a/src_c/cython/pygame/pypm.pyx
++++ b/src_c/cython/pygame/pypm.pyx
+@@ -106,7 +106,7 @@ cdef extern from "portmidi.h":
+                          PmDeviceID inputDevice,
+                          void *inputDriverInfo,
+                          long bufferSize,
+-                         long (*PmPtr) (), # long = PtTimestamp
++                         PmTimeProcPtr time_proc, # long = PtTimestamp
+                          void *time_info)
+ 
+     PmError Pm_OpenOutput(PortMidiStream** stream,
+@@ -538,11 +538,14 @@ cdef class Input:
+         """Instantiate MIDI input stream object."""
+ 
+         cdef PmError err
++        cdef PmTimeProcPtr PmPtr
+         self.device = input_device
+         self.debug = 0
+ 
++        PmPtr = <PmTimeProcPtr>&Pt_Time
++
+         err = Pm_OpenInput(&(self.midi), input_device, NULL, buffersize,
+-                           &Pt_Time, NULL)
++                           PmPtr, NULL)
+         if err < 0:
+             raise Exception(Pm_GetErrorText(err))
+ 
diff --git a/dev-python/pygame/pygame-2.5.1.ebuild b/dev-python/pygame/pygame-2.5.1.ebuild
deleted file mode 100644
index 487738802f20..000000000000
--- a/dev-python/pygame/pygame-2.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="
-	https://www.pygame.org/
-	https://github.com/pygame/pygame/
-	https://pypi.org/project/pygame/
-"
-SRC_URI="
-	https://github.com/pygame/pygame/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
-IUSE="examples opengl test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/portmidi
-	media-libs/sdl2-image
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
-	!X? ( media-libs/libsdl2[threads] )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
-		media-libs/sdl2-mixer[mp3,vorbis,wav]
-	)
-"
-# fontconfig used for fc-list
-RDEPEND+="
-	media-libs/fontconfig
-"
-# util-linux provides script
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		media-libs/fontconfig
-		sys-apps/util-linux
-	)
-"
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py || die
-}
-
-python_configure_all() {
-	find src_c/cython -name '*.pyx' -exec touch {} + || die
-	"${EPYTHON}" setup.py cython_only || die
-}
-
-python_test() {
-	local -x PYTHONPATH=${BUILD_DIR}/install/lib
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=disk
-	script -eqc "${EPYTHON} -m pygame.tests -v" || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygame/pygame-2.5.2-r1.ebuild b/dev-python/pygame/pygame-2.5.2-r2.ebuild
index a7e594998df9..8229c9fa5e6d 100644
--- a/dev-python/pygame/pygame-2.5.2-r1.ebuild
+++ b/dev-python/pygame/pygame-2.5.2-r2.ebuild
@@ -27,7 +27,7 @@ IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/numpy-2[${PYTHON_USEDEP}]
 	media-libs/freetype
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
@@ -62,6 +62,8 @@ src_prepare() {
 	local PATCHES=(
 		# https://github.com/pygame/pygame/pull/4035
 		"${FILESDIR}/${P}-error.patch"
+		# https://github.com/pygame/pygame/pull/4236
+		"${FILESDIR}/${P}-gcc-14.patch"
 	)
 
 	# some numpy-related crash (not a regression)