* [gentoo-commits] repo/gentoo:master commit in: dev-python/PySDL2/, dev-python/PySDL2/files/
@ 2020-07-12 6:37 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2020-07-12 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 79ca08da9b23aa5c1a55716f9f1ad678299e6197
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 06:22:05 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 06:37:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ca08da
dev-python/PySDL2: Bump to 0.9.7, py3.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/PySDL2/Manifest | 1 +
dev-python/PySDL2/PySDL2-0.9.7.ebuild | 61 ++++++++++++++++++++++
.../PySDL2/files/PySDL2-0.9.7-nameerror.patch | 24 +++++++++
3 files changed, 86 insertions(+)
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index f44f4f7a63a..efbcb6a7a22 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1 +1,2 @@
DIST PySDL2-0.9.6.tar.gz 1048158 BLAKE2B 70a450990dd73169489af2d5b218eea0794c9f75948d774680df4b4423855318ddc6d16a0453f62361d4f0b81e872edc067235c4f946476ea8988e16cd0de44c SHA512 676b1b3381b614122442c70fe4cbd7c210ef3d8695c2babd37938e67b5cfeb2f8acbdcb914c5f68aceb549d89f7a77bdc80c7406b340b0e38c22543df8d46739
+DIST PySDL2-0.9.7.tar.gz 1079253 BLAKE2B 986a21d8c2f4f45df683d85a8369be7b39f102e59a1b3fd37e2941065a1174d5cd6dd056f78fbc66663e2cf50228ee40abf67352e5ae75176a9c000fb6f672fb SHA512 10d40063762272eaaae1cb6290e007481887806938ba0ba17d28974a3a3c8b36570054587001d00eb9ab4aa2375c616c43a81c7e7308fbb9b61b55b3eb7da5ac
diff --git a/dev-python/PySDL2/PySDL2-0.9.7.ebuild b/dev-python/PySDL2/PySDL2-0.9.7.ebuild
new file mode 100644
index 00000000000..e35d9527702
--- /dev/null
+++ b/dev-python/PySDL2/PySDL2-0.9.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
+HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Optional deps:
+# - dev-python/numpy,
+# - dev-python/pillow,
+# - media-libs/sdl2-* (loaded dynamically via ctypes).
+#
+# If a reverse dependency needs the specific module, it should
+# explicitly depend on the optional module in question. You also
+# probably need to explicitly require some media-libs/libsdl2 flags.
+RDEPEND="media-libs/libsdl2"
+
+# Require all of SDL2 libraries and at least the most common subsystems
+# for better test coverage.
+DEPEND="
+ test? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ media-libs/libsdl2[joystick,sound,video]
+ media-libs/sdl2-gfx
+ media-libs/sdl2-image
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
+ )"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/${P}-nameerror.patch
+)
+
+src_prepare() {
+ # tarball uses DOS line endings
+ find '(' -name '*.py' -o -name '*.rst' -o -name '*.txt' ')' \
+ -type f -exec sed -i -e 's/\r$//' {} + || die
+
+ distutils-r1_src_prepare
+}
+
+src_test() {
+ # from .travis.yml
+ local -x SDL_VIDEODRIVER=dummy
+ local -x SDL_AUDIODRIVER=dummy
+ local -x SDL_RENDER_DRIVER=software
+
+ distutils-r1_src_test
+}
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch b/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
new file mode 100644
index 00000000000..c94d354c576
--- /dev/null
+++ b/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
@@ -0,0 +1,24 @@
+From 635048e81402f3dcc9719c060a67f33e6950649c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 12 Jul 2020 08:18:06 +0200
+Subject: [PATCH] Fix NameError when calling SDL_SetColorKey()
+
+---
+ sdl2/ext/image.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sdl2/ext/image.py b/sdl2/ext/image.py
+index 1a413e1..49d897d 100644
+--- a/sdl2/ext/image.py
++++ b/sdl2/ext/image.py
+@@ -154,6 +154,6 @@ def load_image(fname, enforce=None):
+ # If the image has a single transparent palette index, set
+ # that index as the color key to make blitting correct.
+ if 'transparency' in image.info and isinstance(image.info['transparency'], int):
+- sdl2.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
++ surface.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
+
+ return imgsurface
+--
+2.27.0
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/PySDL2/, dev-python/PySDL2/files/
@ 2021-10-17 7:24 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-10-17 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 2de903c3d3a1715f5a618c8a9ba3b87164dc7365
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 07:21:26 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 07:21:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de903c3
dev-python/PySDL2: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/PySDL2/Manifest | 2 -
dev-python/PySDL2/PySDL2-0.9.7.ebuild | 61 ----------------------
dev-python/PySDL2/PySDL2-0.9.8.ebuild | 55 -------------------
.../PySDL2/files/PySDL2-0.9.7-nameerror.patch | 24 ---------
4 files changed, 142 deletions(-)
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index 5dbc4f6a789..d7c14151b7f 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,3 +1 @@
-DIST PySDL2-0.9.7.tar.gz 1079253 BLAKE2B 986a21d8c2f4f45df683d85a8369be7b39f102e59a1b3fd37e2941065a1174d5cd6dd056f78fbc66663e2cf50228ee40abf67352e5ae75176a9c000fb6f672fb SHA512 10d40063762272eaaae1cb6290e007481887806938ba0ba17d28974a3a3c8b36570054587001d00eb9ab4aa2375c616c43a81c7e7308fbb9b61b55b3eb7da5ac
-DIST PySDL2-0.9.8.tar.gz 742279 BLAKE2B 403fba93f446f6eeb8c3b365f02207e5447c4fc16a08835ef81a1846491a4a3745ea1b7694f3b5ec3e7058975f33c20885065a4521f50aaf5c290728dbac9dd0 SHA512 674af175b1c5bd9b4100f94738c41b9b5517d2d536a7d6f7a356aafa81b67bce8349c74c166ae9289b8f746a9a16c785f88595bc48399d834d62af5355c59344
DIST PySDL2-0.9.9.tar.gz 743302 BLAKE2B 1e9e0eeea48b838227d3fe6ea93311d445b1d3a15588f4b83d075d18306b419ba3512826e44c5e4ecc2aec59ad44da73372ec740ebf6106271fd0b77175b88d7 SHA512 52b469735b1229392ea2f73b2dfcf1e75cedf7582a488461be9b06bc072f82a5c8c559d345a0c3668829c0f8bb2996005d538465ed7d2a45fb8480001fd0ccce
diff --git a/dev-python/PySDL2/PySDL2-0.9.7.ebuild b/dev-python/PySDL2/PySDL2-0.9.7.ebuild
deleted file mode 100644
index 8508908fc72..00000000000
--- a/dev-python/PySDL2/PySDL2-0.9.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Optional deps:
-# - dev-python/numpy,
-# - dev-python/pillow,
-# - media-libs/sdl2-* (loaded dynamically via ctypes).
-#
-# If a reverse dependency needs the specific module, it should
-# explicitly depend on the optional module in question. You also
-# probably need to explicitly require some media-libs/libsdl2 flags.
-RDEPEND="media-libs/libsdl2"
-
-# Require all of SDL2 libraries and at least the most common subsystems
-# for better test coverage.
-DEPEND="
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- media-libs/libsdl2[joystick,sound,video]
- media-libs/sdl2-gfx
- media-libs/sdl2-image
- media-libs/sdl2-mixer
- media-libs/sdl2-ttf
- )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-nameerror.patch
-)
-
-src_prepare() {
- # tarball uses DOS line endings
- find '(' -name '*.py' -o -name '*.rst' -o -name '*.txt' ')' \
- -type f -exec sed -i -e 's/\r$//' {} + || die
-
- distutils-r1_src_prepare
-}
-
-src_test() {
- # from .travis.yml
- local -x SDL_VIDEODRIVER=dummy
- local -x SDL_AUDIODRIVER=dummy
- local -x SDL_RENDER_DRIVER=software
-
- distutils-r1_src_test
-}
diff --git a/dev-python/PySDL2/PySDL2-0.9.8.ebuild b/dev-python/PySDL2/PySDL2-0.9.8.ebuild
deleted file mode 100644
index e3b42a45db2..00000000000
--- a/dev-python/PySDL2/PySDL2-0.9.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Optional deps:
-# - dev-python/numpy,
-# - dev-python/pillow,
-# - media-libs/sdl2-* (loaded dynamically via ctypes).
-#
-# If a reverse dependency needs the specific module, it should
-# explicitly depend on the optional module in question. You also
-# probably need to explicitly require some media-libs/libsdl2 flags.
-RDEPEND="media-libs/libsdl2"
-
-# Require all of SDL2 libraries and at least the most common subsystems
-# for better test coverage.
-DEPEND="
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- media-libs/libsdl2[joystick,sound,video]
- media-libs/sdl2-gfx
- media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
- || (
- media-libs/sdl2-mixer[flac]
- media-libs/sdl2-mixer[midi]
- media-libs/sdl2-mixer[mod]
- media-libs/sdl2-mixer[mp3]
- media-libs/sdl2-mixer[opus]
- )
- media-libs/sdl2-ttf
- )"
-
-distutils_enable_tests pytest
-
-src_test() {
- # from .travis.yml
- local -x SDL_VIDEODRIVER=dummy
- local -x SDL_AUDIODRIVER=dummy
- local -x SDL_RENDER_DRIVER=software
-
- distutils-r1_src_test
-}
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch b/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
deleted file mode 100644
index c94d354c576..00000000000
--- a/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 635048e81402f3dcc9719c060a67f33e6950649c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 12 Jul 2020 08:18:06 +0200
-Subject: [PATCH] Fix NameError when calling SDL_SetColorKey()
-
----
- sdl2/ext/image.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sdl2/ext/image.py b/sdl2/ext/image.py
-index 1a413e1..49d897d 100644
---- a/sdl2/ext/image.py
-+++ b/sdl2/ext/image.py
-@@ -154,6 +154,6 @@ def load_image(fname, enforce=None):
- # If the image has a single transparent palette index, set
- # that index as the color key to make blitting correct.
- if 'transparency' in image.info and isinstance(image.info['transparency'], int):
-- sdl2.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
-+ surface.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
-
- return imgsurface
---
-2.27.0
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-17 7:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-12 6:37 [gentoo-commits] repo/gentoo:master commit in: dev-python/PySDL2/, dev-python/PySDL2/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-10-17 7:24 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox