mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
101 lines
4.0 KiB
Diff
101 lines
4.0 KiB
Diff
diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py
|
|
--- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100
|
|
+++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200
|
|
@@ -94,15 +94,16 @@
|
|
"""Function wrapper around the different DLL functions. Do not use or
|
|
instantiate this one directly from your user code.
|
|
"""
|
|
- def __init__(self, libinfo, libnames, path=None):
|
|
+ def __init__(self, libinfo, libfile):
|
|
self._dll = None
|
|
self._libname = libinfo
|
|
self._version = None
|
|
- foundlibs = _findlib(libnames, path)
|
|
- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
|
|
- if len(foundlibs) == 0:
|
|
- raise RuntimeError("could not find any library for %s (%s)" %
|
|
- (libinfo, dllmsg))
|
|
+ #foundlibs = _findlib(libnames, path)
|
|
+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
|
|
+ #if len(foundlibs) == 0:
|
|
+ # raise RuntimeError("could not find any library for %s (%s)" %
|
|
+ # (libinfo, dllmsg))
|
|
+ foundlibs = [ libfile ]
|
|
for libfile in foundlibs:
|
|
try:
|
|
self._dll = CDLL(libfile)
|
|
@@ -117,9 +118,9 @@
|
|
if self._dll is None:
|
|
raise RuntimeError("found %s, but it's not usable for the library %s" %
|
|
(foundlibs, libinfo))
|
|
- if path is not None and sys.platform in ("win32",) and \
|
|
- path in self._libfile:
|
|
- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
|
|
+ #if path is not None and sys.platform in ("win32",) and \
|
|
+ # path in self._libfile:
|
|
+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
|
|
|
|
def bind_function(self, funcname, args=None, returns=None, added=None):
|
|
"""Binds the passed argument and return value types to the specified
|
|
@@ -220,7 +221,7 @@
|
|
return
|
|
|
|
try:
|
|
- dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))
|
|
+ dll = DLL("SDL2", "@sdl2@")
|
|
except RuntimeError as exc:
|
|
raise ImportError(exc)
|
|
|
|
diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py
|
|
--- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100
|
|
+++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200
|
|
@@ -39,8 +39,7 @@
|
|
]
|
|
|
|
try:
|
|
- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
|
|
- os.getenv("PYSDL2_DLL_PATH"))
|
|
+ dll = DLL("SDL2_gfx", "@sdl2_gfx@")
|
|
except RuntimeError as exc:
|
|
raise ImportError(exc)
|
|
|
|
diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py
|
|
--- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100
|
|
+++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200
|
|
@@ -27,8 +27,7 @@
|
|
]
|
|
|
|
try:
|
|
- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],
|
|
- os.getenv("PYSDL2_DLL_PATH"))
|
|
+ dll = DLL("SDL2_image", "@sdl2_image@")
|
|
except RuntimeError as exc:
|
|
raise ImportError(exc)
|
|
|
|
diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py
|
|
--- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100
|
|
+++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200
|
|
@@ -53,8 +53,7 @@
|
|
]
|
|
|
|
try:
|
|
- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
|
|
- os.getenv("PYSDL2_DLL_PATH"))
|
|
+ dll = DLL("SDL2_mixer", "@sdl2_mixer@")
|
|
except RuntimeError as exc:
|
|
raise ImportError(exc)
|
|
|
|
diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py
|
|
--- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100
|
|
+++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200
|
|
@@ -39,8 +39,7 @@
|
|
]
|
|
|
|
try:
|
|
- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
|
|
- os.getenv("PYSDL2_DLL_PATH"))
|
|
+ dll = DLL("SDL2_ttf", "@sdl2_ttf@")
|
|
except RuntimeError as exc:
|
|
raise ImportError(exc)
|
|
|