<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce43624df98dc50905f49f97ff9a21eb7f1cf117">https://github.com/macports/macports-ports/commit/ce43624df98dc50905f49f97ff9a21eb7f1cf117</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 ce43624 allegro5: update version 5.0.10->5.2.1.1
</span>ce43624 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce43624df98dc50905f49f97ff9a21eb7f1cf117
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 5 21:23:06 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> allegro5: update version 5.0.10->5.2.1.1
</span>---
devel/allegro5/Portfile | 36 +++++++++---------
devel/allegro5/files/patch-10.12.diff | 71 +++++++++++++++++++++++++++++++++++
devel/allegro5/files/patch-32.diff | 11 ++++++
3 files changed, 101 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/allegro5/Portfile b/devel/allegro5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2708c4..5b0470f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/allegro5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/allegro5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # build architectures separately so that variable such as CMAKE_CXX_SIZEOF_DATA_PTR are set correctly
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +12,7 @@ name allegro5
</span> subport ${name}-devel {}
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.0.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.2.1.1
</span> conflicts ${name}-devel
} else {
version 5.1.8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,17 +27,21 @@ maintainers nomaintainer
</span> categories devel games
platforms darwin
license Permissive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://alleg.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites sourceforge:project/alleg/allegro/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites sourceforge:project/alleg/allegro-unstable/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://liballeg.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://download.gna.org/allegro/allegro/${version}
</span> distname allegro-${version}
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 65b66100f8b89e7e71da193435d29924123d3774 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 71b81080f34f6e485edd0c51f22923c18ff967d5db438e591e6f3885d5bdcda1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ea35ac930370a691ca24b9e5f8e5f5c4b98fd8a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b5d9df303bc6d72d54260c24505889acd995049b75463b46344e797a58a44a71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/liballeg/allegro5/pull/682
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-10.12.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow build on 32-bit systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/liballeg/allegro5/pull/690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-32.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
checksums rmd160 f1f15d4301ad98ee45565d23245eb62fab3cc9a2 \
sha256 9f0608fc285b014e4cf6c570f9953b87c73c9ad57a25f795f503e2fe208515a0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,18 +54,15 @@ depends_lib port:flac \
</span> port:libvorbis \
port:freetype \
port:zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:physfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # added Ogg Theora/Vorbis backend in 5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libtheora
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:physfs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opusfile
</span>
# prevents errors when upgrading (prevents new allegro5 from finding old allegro5)
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://alleg.sourceforge.net/download.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://liballeg.org/download.html
</span> if {${name} eq ${subport}} {
# This livecheck tries to match the stable branch only
livecheck.regex (5\\.(?:\\d*\[02468\])(?:\\.\\d+)*)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/allegro5/files/patch-10.12.diff b/devel/allegro5/files/patch-10.12.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..62bc87b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/allegro5/files/patch-10.12.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 159eed48b6b0a6f9afde68180e7c7ed809b85da5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Pavel Sountsov <siege@google.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Sep 2016 18:39:52 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix deprecated getBytes call.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/macosx/osx_app_delegate.m | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/macosx/osx_app_delegate.m b/src/macosx/osx_app_delegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7336578..d99e11a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macosx/osx_app_delegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macosx/osx_app_delegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,8 +130,11 @@ - (BOOL)application: (NSApplication *)theApplication openFile: (NSString *)filen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int len = 1 + [data length];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arg1 = al_malloc(len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(arg1, 0, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [data getBytes: arg1 length:len];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [data getBytes: arg1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c6a9ac3e04614a3d008b637c9b5ef8bda8347e7c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Pavel Sountsov <siege@google.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Sep 2016 18:24:00 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Read backingScaleFactor from NSWindow, not NSView.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Not sure how that worked before OSX 10.12, but it definitely breaks then. Code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with this change seems to work fine and matches the documentation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/macosx/qzmouse.m | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/macosx/qzmouse.m b/src/macosx/qzmouse.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd88171..b70f5b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macosx/qzmouse.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macosx/qzmouse.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,7 @@ void _al_osx_mouse_generate_event(NSEvent* evt, ALLEGRO_DISPLAY* dpy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Y-coordinates in OS X start from the bottom.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pos.y = NSHeight(frm) - pos.y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- scaling_factor = [[[evt window] contentView] backingScaleFactor];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scaling_factor = [[evt window] backingScaleFactor];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fc2c2c18473242d326c04e0b405075d3f8db2117 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Pavel Sountsov <siege@google.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Sep 2016 18:32:06 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove QuickTime header, it doesn't appear to be used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/allegro5/platform/alosx.h | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/allegro5/platform/alosx.h b/include/allegro5/platform/alosx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c36c84..c9278ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/allegro5/platform/alosx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/allegro5/platform/alosx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <CoreAudio/CoreAudio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <AudioUnit/AudioUnit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <AudioToolbox/AudioToolbox.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #import <QuickTime/QuickTime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <IOKit/IOKitLib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <IOKit/IOCFPlugIn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <IOKit/hid/IOHIDLib.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/allegro5/files/patch-32.diff b/devel/allegro5/files/patch-32.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..594b8a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/allegro5/files/patch-32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macosx/qzmouse.m.orig 2016-11-05 21:16:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macosx/qzmouse.m 2016-11-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,7 +342,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGPoint point_pos = CGPointMake(x, y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- point_pos = [[window contentView] convertPointFromBacking: point_pos];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ point_pos = NSPointToCGPoint([[window contentView] convertPointFromBacking: NSPointFromCGPoint(point_pos)]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pos.x = content.origin.x + point_pos.x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pos.y = rect.size.height - content.origin.y - content.size.height + point_pos.y;
</span></pre><pre style='margin:0'>
</pre>