gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-31 23:08:09 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/PySDL2: New package, needed for games-emu/m64py

Browse Source 
Bug: https://bugs.gentoo.org/626488
This commit is contained in:
Michał Górny
2018-01-01 14:13:43 +01:00
parent fa85d5355b
commit b5bfe230bd
5 changed files with 153 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch Normal file
View File

@@ -0,0 +1,47 @@
From d34a898bb8d8bfd9cb4a85ff880826e4c7f2b0f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 1 Jan 2018 12:31:52 +0100
Subject: [PATCH 1/2] test: Always allow greater patch-version of SDL2
Similarly to sdlimage_test, allow newer patch-version of other SDL2
libraries. There is no technical reason to prevent people from upgrading
libsdl2 while having old PySDL2 installed, and there is no reason to
make tests fail every time libsdl2 happens to be upgraded.
(backported for 0.9.6)
Closes: https://github.com/marcusva/py-sdl2/issues/115
---
sdl2/test/sdlmixer_test.py | 2 +-
sdl2/test/version_test.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdl2/test/sdlmixer_test.py b/sdl2/test/sdlmixer_test.py
index 00c2ca6..1cebe55 100644
--- a/sdl2/test/sdlmixer_test.py
+++ b/sdl2/test/sdlmixer_test.py
@@ -27,7 +27,7 @@ class SDLMixerTest(unittest.TestCase):
self.assertIsInstance(v.contents, version.SDL_version)
self.assertEqual(v.contents.major, 2)
self.assertEqual(v.contents.minor, 0)
- self.assertEqual(v.contents.patch, 1)
+ self.assertGreaterEqual(v.contents.patch, 1)
if __name__ == '__main__':
sys.exit(unittest.main())
diff --git a/sdl2/test/version_test.py b/sdl2/test/version_test.py
index 51b5065..60e5bcf 100644
--- a/sdl2/test/version_test.py
+++ b/sdl2/test/version_test.py
@@ -25,7 +25,7 @@ class SDLVersionTest(unittest.TestCase):
self.assertEqual(type(v), version.SDL_version)
self.assertEqual(v.major, 2)
self.assertEqual(v.minor, 0)
- self.assertEqual(v.patch, 6)
+ self.assertGreaterEqual(v.patch, 6)
def test_SDL_VERSIONNUM(self):
self.assertEqual(version.SDL_VERSIONNUM(1, 2, 3), 1203)
--
2.16.0.rc0

26
dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch Normal file
View File

@@ -0,0 +1,26 @@
From 4a38a0ef4c13ec3c518b78c0e56550fb8af43119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 1 Jan 2018 13:29:16 +0100
Subject: [PATCH 2/2] test: Handle missing haptic support gracefully
---
sdl2/test/sdl_test.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sdl2/test/sdl_test.py b/sdl2/test/sdl_test.py
index 70c2e98..402e549 100644
--- a/sdl2/test/sdl_test.py
+++ b/sdl2/test/sdl_test.py
@@ -47,7 +47,8 @@ class SDLTest(unittest.TestCase):
"FreeBSD des not support haptic input yet")
def test_SDL_INIT_HAPTIC(self):
ret = SDL_Init(SDL_INIT_HAPTIC)
- self.assertEqual(ret, 0, SDL_GetError())
+ if ret != 0:
+ self.skipTest('Haptic subsystem not supported')
ret = SDL_WasInit(SDL_INIT_HAPTIC)
self.assertEqual(ret, SDL_INIT_HAPTIC)
SDL_QuitSubSystem(SDL_INIT_HAPTIC)
--
2.16.0.rc0