<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b517187cfb6c2df09737c3ae02c01378d3915331">https://github.com/macports/macports-ports/commit/b517187cfb6c2df09737c3ae02c01378d3915331</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b517187cfb6 py-SDL2: update to 0.9.10
</span>b517187cfb6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b517187cfb6c2df09737c3ae02c01378d3915331
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 15 23:40:56 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> py-SDL2: update to 0.9.10
</span>---
python/py-SDL2/Portfile | 14 +++++++-----
python/py-SDL2/files/dll.py.patch | 47 +++++++++++++++++++++++++++++----------
2 files changed, 44 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-SDL2/Portfile b/python/py-SDL2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 893bb5dfcfe..00efde7da13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-SDL2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-SDL2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-SDL2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.10
</span> categories-append devel multimedia
license public-domain
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +16,11 @@ long_description \
</span> python.rootname PySDL2
homepage https://pypi.org/project/${python.rootname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 22fd63c5f4a4386b25cd29b4d18afa41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e9d2d5c77a0a851f0750d77a61f79dcc75c4510e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 45879ae588038d7cf7cb0289ae47af60722b394d0efa527bf4327103dc4dc918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 98ebe1b7a657614c38b6805dc1df9b59 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d36fd73bf8be46167558be5aeb424c0d42f51a07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 20f6aa5dbb4e2a17fce883fc4c7a044f675a044d91291c3ba2647ef438aad359
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 36 37 38 39 310
</span>
if {$subport ne $name} {
depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,10 @@ if {$subport ne $name} {
</span> port:libsdl2_mixer \
port:libsdl2_ttf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles dll.py.patch
post-patch {
reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/sdl2/dll.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-SDL2/files/dll.py.patch b/python/py-SDL2/files/dll.py.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4114fdce790..6662c2d1a44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-SDL2/files/dll.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-SDL2/files/dll.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sdl2/dll.py.orig 2021-08-07 01:40:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sdl2/dll.py 2021-08-10 13:01:12.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,6 +125,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- versioned.sort(key = _so_version_num, reverse = True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- results = results + versioned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sdl2/dll.py.orig 2022-01-12 07:42:03.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sdl2/dll.py 2022-01-15 23:33:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,12 +141,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patterns = ["lib{0}.so"]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # MacPorts addition: search in our prefix first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for libname in searchfor:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for pattern in patterns:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dllfile = os.path.join("__PREFIX__", "lib", pattern.format(libname))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if os.path.exists(dllfile):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ results.append(dllfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # On Apple Silicon Macs, search the non-standard Homebrew library path if no other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # path explicitly set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arm_brewpath = "/opt/Homebrew/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not path and platform == "darwin" and os.path.exists(arm_brewpath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- path = arm_brewpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Adding the potential 'd' suffix that is present on the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # when built in debug configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ searchfor = libnames + [libname + 'd' for libname in libnames]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,6 +150,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if path and path.lower() != "system":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ results = _finds_libs_at_path(libnames, path, patterns)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # MacPorts addition: search in our prefix first (after any explicit path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mp_path = os.path.join("__PREFIX__", "lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ results += _finds_libs_at_path(libnames, mp_path, patterns)
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Finally, search for library in system library search paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Next, search for library in system library search paths
</span> for libname in searchfor:
dllfile = find_library(libname)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,12 +163,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dllfile = "./" + dllfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ results.append(dllfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # On ARM64 Macs, search the non-standard brew library path as a fallback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arm_brewpath = "/opt/Homebrew/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- is_apple_silicon = platform == "darwin" and cpu_arch() == "arm64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if is_apple_silicon and os.path.exists(arm_brewpath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- results += _finds_libs_at_path(libnames, arm_brewpath, patterns)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return results
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>