gentoo auto-resync : 18:09:2024 - 12:11:36

3 files changed, 94 insertions, 0 deletions

diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 4d911a837f44..20dbb6d5acef 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,8 @@
 AUX pyopengl-3.1.7-py312.patch 829 BLAKE2B a00bbf0bf0a2766ae798222a0b70ed86b1446171251b7c12e2690b8ba9a36f0b2303cabb0000d423753ab3c25215a474bf97d64cac68ba0900f7fbb3e7de6466 SHA512 366ae4070a9be37a8da960619d31a0f7a7d4915081d82d84b85904e52cf011114d804fe228c9794319e400f1ba75f9e1cc4e0be7fa2709de1c88824cc8f29ece
 AUX pyopengl-3.1.7-pypy3.patch 836 BLAKE2B 1ebae535d8ffc73b38c55d47ac43ca1345023af119b8622559af76edd5be3eafade93346abf4d8df282350835a0dd0580879c3cd5da32a60473acc041eac4cf0 SHA512 f45853577b05802152d5bb2019bc389c04b51de51d85275370754f4d5c76277d09ae33e158e194a6fb188d78fa72f87046cfef4be886942600311f94420c2a4b
+AUX pyopengl-3.1.8-fix-version.patch 613 BLAKE2B 6f86f24d991629b63e04178be8baa45e431f360e9b54305799f85f4bd8fd11e298a883a4c2006189a3c4719febf312181a399e08b2af9c60170893449929e661 SHA512 d6b9aba76252f9e2cc3a0c09a128a56df0bacc2b2e36e64f672ca92ff06e7e2c674076f008f692fe4d4165e3b7991b225f65919b035306bcd7819afa5c91ad8e
 DIST PyOpenGL-3.1.7.tar.gz 1896446 BLAKE2B 3fd4c84bb59157b4a6ee09c2a5ecd0e4f548bf03a84d735acfd92453eafb92102677a2b9c98831a92be33e873630c815dee453745d630a4d6b044771a13c945c SHA512 add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
+DIST pyopengl-3.1.8.gh.tar.gz 3599436 BLAKE2B 7f33345d68d66d3cc81278eaa5f54298694f41f40583ee08a1f9f677705fb4414b6b2afbcd7b9345199b5f573478bfeba050e185b6534cbb19b45cb25c241b47 SHA512 d95014a36bd889fa014043e4640ba7f319bb996cb56e5f7086ee05d39c53d3928512d52b0ce181d7c144775a4da7eff7403cada0f91f23f56a699a1b023e00e6
 EBUILD pyopengl-3.1.7-r1.ebuild 1542 BLAKE2B 35ad54837b4efcba3aefba54f5fa0e56ebb87dd8e3bb7fbe0838a9280d4aafe8043296d5725312c56d33d167d1f87672ceae9e921ebf7048d37cc0eeca1f1094 SHA512 3bb3acfdd24be80a229e85b7a607b2598ffa8b5f2fd5456fd84fbbb99169a04a3a9f3d7780bdee40412f237239df7b32993896b7d812a9a499b3d96e397d10d0
+EBUILD pyopengl-3.1.8.ebuild 1736 BLAKE2B 944dd73b189f695efc612bf00cd52e100ca4d36972f176665e88ef9ac43748c3d8bab8e7b7603685fbc76092e5e13c77dd694b2f9a7b30b26f6ef7053f400f3c SHA512 892139b37b12a9332279c5ced7c3bb512402b59892c62d995d4647f50b32d2985dd715b2e3412c166d85ff6ba78a25d227ad350be975128d039e6893cc8ffe24
 MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/files/pyopengl-3.1.8-fix-version.patch b/dev-python/pyopengl/files/pyopengl-3.1.8-fix-version.patch
new file mode 100644
index 000000000000..7017dd79a451
--- /dev/null
+++ b/dev-python/pyopengl/files/pyopengl-3.1.8-fix-version.patch
@@ -0,0 +1,17 @@
+https://github.com/mcfletch/pyopengl/issues/123
+--- a/OpenGL/version.py
++++ b/OpenGL/version.py
+@@ -1,2 +1,2 @@
+ """Declares the current version for use in setuptools and the like"""
+-__version__ = "3.1.7"
++__version__ = "3.1.8"
+--- a/accelerate/OpenGL_accelerate/__init__.py
++++ b/accelerate/OpenGL_accelerate/__init__.py
+@@ -6,5 +6,5 @@ wrapper mechanism.  The source code is part of the
+ PyOpenGL package and is built via the setupaccel.py
+ script in the top level of the PyOpenGL source package.
+ """
+-__version__ = "3.1.7"
+-__version_tuple__ = (3, 1, 7)
++__version__ = "3.1.8"
++__version_tuple__ = (3, 1, 8)
diff --git a/dev-python/pyopengl/pyopengl-3.1.8.ebuild b/dev-python/pyopengl/pyopengl-3.1.8.ebuild
new file mode 100644
index 000000000000..955bd7218309
--- /dev/null
+++ b/dev-python/pyopengl/pyopengl-3.1.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=PyOpenGL
+PYTHON_REQ_USE="tk?"
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python OpenGL bindings"
+HOMEPAGE="
+	https://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL/
+"
+# 3.1.8 is missing from pypi: https://github.com/mcfletch/pyopengl/issues/123
+SRC_URI="https://github.com/mcfletch/pyopengl/archive/refs/tags/release-${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-release-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="tk"
+
+RDEPEND="
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	tk? ( dev-tcltk/togl )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# The tests need an X server with the GLX extension. Software rendering
+# under Xvfb works but only with llvmpipe, not softpipe or swr.
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
+		!prefix? (
+			media-libs/mesa[llvm]
+			x11-base/xorg-server[-minimal,xorg]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/mcfletch/pyopengl/pull/109
+	"${FILESDIR}/${PN}-3.1.7-pypy3.patch"
+	# https://github.com/mcfletch/pyopengl/issues/123
+	"${FILESDIR}/${P}-fix-version.patch"
+)
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# unreliable memory counting test
+		tests/test_vbo_memusage.py::test_sf_2980896
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	nonfatal epytest tests || die "Tests failed with ${EPYTHON}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}