<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/f0c11b269947c646554ebbaeda057662229815a4">https://github.com/macports/macports-ports/commit/f0c11b269947c646554ebbaeda057662229815a4</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 f0c11b2 py-game: update to 1.9.3, add py35 and py36 subports
</span>f0c11b2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f0c11b269947c646554ebbaeda057662229815a4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 8 16:36:00 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> py-game: update to 1.9.3, add py35 and py36 subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/45341
</span>---
python/py-game/Portfile | 40 +++++++----------
python/py-game/files/patch-MIDI-case.diff | 11 -----
python/py-game/files/patch-config_darwin.py.diff | 54 ++++++++++-------------
python/py-game/files/patch-disable_portmidi.diff | 14 +++---
python/py-game/files/patch-src_scale_mmx64.c.diff | 20 ---------
5 files changed, 45 insertions(+), 94 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/Portfile b/python/py-game/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db02d89..339c18d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-game/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-game
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.9.3
</span> categories-append devel multimedia graphics
platforms darwin
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,48 +18,39 @@ long_description Pygame is a set of Python modules designed for \
</span> platform and operating system.
homepage http://www.pygame.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}ftp/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname pygame-${version}release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 352d74d6cb025e7489e1123a7a25d1695beabafb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# files.pythonhosted.org says 404 for this file for some reason
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites pypi https://pypi.python.org/packages/61/06/3c25051549c252cc6fde01c8aeae90b96831370884504fe428a623316def/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname Pygame
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname pygame-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 ac744ea6952b68d5f2b6d02a6d8e836c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ac95b8c2afa5076746227a6d1ae9c200d14d5757 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 26 27 35 36
</span>
if {$subport ne $name} {
patchfiles patch-config_darwin.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_scale_mmx64.c.diff \
</span> patch-disable_portmidi.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:py${python.version}-numpy \
port:libsdl_mixer \
port:libsdl_image \
port:libsdl_ttf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure yes
configure.env-append LOCALBASE=${prefix}
configure.cmd ${python.bin} config.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/doc/${subport}/examples
</span> copy {*}[glob ${worksrcpath}/docs/*] ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/examples ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} install.html WHATSNEW \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- README.txt ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} install.html LGPL WHATSNEW \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readme.html readme.rst ${destroot}${prefix}/share/doc/${subport}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant portmidi description {Enable MIDI support using portmidi (experimental)} {
depends_lib-append port:portmidi
patchfiles-delete patch-disable_portmidi.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-MIDI-case.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} >= 30} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "Not all pygame modules are available for Python 3.x as of this release."
</span> }
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url ${homepage}download.shtml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {<a href=".*/ftp/pygame\-([0-9\.]+)release\.tar\.gz">}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/files/patch-MIDI-case.diff b/python/py-game/files/patch-MIDI-case.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86277cf..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/files/patch-MIDI-case.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config_darwin.py.orig 2013-05-20 01:59:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config_darwin.py 2013-05-20 01:59:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dependency('SCRAP', '','',[]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMidi'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FrameworkDependency('PORTTIME', 'CoreMIDI.h', 'CoreMIDI', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/files/patch-config_darwin.py.diff b/python/py-game/files/patch-config_darwin.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d01a23e..0b1569d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/files/patch-config_darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-game/files/patch-config_darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +1,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config_darwin.py.orig 2008-03-29 08:45:44.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config_darwin.py 2008-04-25 20:50:36.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from glob import glob
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config_darwin.py.orig 2016-08-21 06:28:55.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config_darwin.py 2017-07-08 16:04:22.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span> from distutils.sysconfig import get_python_inc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ from config_unix import DependencyProg
</span>
+localbase = os.environ.get('LOCALBASE', '')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Dependency:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libext = '.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libext = '.dylib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def __init__(self, name, checkhead, checklib, libs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.name = name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.inc_dir = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,11 +88,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print (self.name + ' '[len(self.name):] + ': not found')
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPS = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FrameworkDependency('SDL', 'SDL.h', 'libSDL', 'SDL'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FrameworkDependency('FONT', 'SDL_ttf.h', 'libSDL_ttf', 'SDL_ttf'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FrameworkDependency('IMAGE', 'SDL_image.h', 'libSDL_image', 'SDL_image'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FrameworkDependency('SMPEG', 'smpeg.h', 'libsmpeg', 'smpeg'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dependency('SDL', 'SDL.h', 'libSDL', ['SDL']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf', ['SDL_ttf']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dependency('IMAGE', 'SDL_image.h', 'libSDL_image', ['SDL_image']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', ['SDL_mixer']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dependency('SMPEG', 'smpeg.h', 'libsmpeg', ['smpeg']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basestring_ = basestring
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +108,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FrameworkDependency('IMAGE', 'SDL_image.h', 'libSDL_image', 'SDL_image')],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Dependency('MIXER', ['SDL_mixer.h', 'SDL/SDL_mixer.h'], 'libSDL_mixer', ['SDL_mixer']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer')],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FrameworkDependency('PORTTIME', 'CoreMIDI.h', 'CoreMIDI', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
</span> Dependency('PNG', 'png.h', 'libpng', ['png']),
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Dependency('SCRAP', '','',[]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,8 +105,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,12 +125,8 @@
</span> global DEPS
print ('Hunting dependencies...')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- incdirs = ['/usr/local/include','/opt/local/include']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libdirs = ['/usr/local/lib','/opt/local/lib']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ incdirs = [localbase+'/include', localbase+'/include/SDL', localbase+'/include/smpeg']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- incdirs = ['/usr/local/include', '/usr/local/include/SDL',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #'/usr/X11/include',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/opt/local/include',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/opt/local/include/freetype2/freetype']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libdirs = ['/usr/local/lib', '/opt/local/lib']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ incdirs = [localbase+'/include']
</span> + libdirs = [localbase+'/lib']
<span style='display:block; white-space:pre;background:#ffe0e0;'>- newconfig = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> for d in DEPS:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d.configure(incdirs, libdirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isinstance(d, (list, tuple)):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/files/patch-disable_portmidi.diff b/python/py-game/files/patch-disable_portmidi.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fa9c1e..3a63b17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/files/patch-disable_portmidi.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-game/files/patch-disable_portmidi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config_darwin.py.orig 2010-05-05 20:17:12.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config_darwin.py 2010-05-05 20:27:03.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config_darwin.py.orig2 2017-07-08 16:04:22.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config_darwin.py 2017-07-08 16:07:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +112,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
</span> Dependency('PNG', 'png.h', 'libpng', ['png']),
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Dependency('SCRAP', '','',[]),
</span> - Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
+ Dependency('PORTMIDI', '', '', []),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMidi'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #DependencyProg('FREETYPE', 'FREETYPE_CONFIG', '/usr/X11R6/bin/freetype-config', '2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['freetype'], '--ftversion'),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/files/patch-src_scale_mmx64.c.diff b/python/py-game/files/patch-src_scale_mmx64.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b96d92..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/files/patch-src_scale_mmx64.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/scale_mmx64.c.orig 2008-10-23 07:54:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/scale_mmx64.c 2011-10-22 03:35:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -425,7 +425,7 @@ filter_expand_X_MMX(Uint8 *srcpix, Uint8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " movl %5, %%ecx; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " pxor %%mm0, %%mm0; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "1: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " movsxl (%3), %%rax; " /* get xidx0[x] */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " movslq (%3), %%rax; " /* get xidx0[x] */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " add $4, %3; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " movq (%0), %%mm1; " /* load mult0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " add $8, %0; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -500,7 +500,7 @@ filter_expand_X_SSE(Uint8 *srcpix, Uint8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " movl %5, %%ecx; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " pxor %%mm0, %%mm0; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "1: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " movsxl (%3), %%rax; " /* get xidx0[x] */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " movslq (%3), %%rax; " /* get xidx0[x] */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " add $4, %3; "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " movq (%0), %%mm1; " /* load mult0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " add $8, %0; "
</span></pre><pre style='margin:0'>
</pre>