<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c99616ebc71bf0c943990a4e606de5b036976eec">https://github.com/macports/macports-ports/commit/c99616ebc71bf0c943990a4e606de5b036976eec</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 c99616e irrlicht: use upstream patches
</span>c99616e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c99616ebc71bf0c943990a4e606de5b036976eec
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue Oct 8 15:36:52 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> irrlicht: use upstream patches
</span>---
devel/irrlicht/Portfile | 8 +--
.../irrlicht/files/patch-irrlicht-cirrdevice.diff | 61 ++++++++++++++++++----
2 files changed, 55 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/Portfile b/devel/irrlicht/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3ffbed..debbfb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/irrlicht/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup xcode 1.0
</span>
name irrlicht
version 1.8.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
license zlib
platforms darwin macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +29,12 @@ post-extract {
</span> system "mv ${worksrcpath}/source/Irrlicht/MacOSX/irrFramework-Info.plist ${worksrcpath}/source/Irrlicht/MacOSX/IrrFramework-Info.plist"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix an errant typecast in one file, but not on 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} != 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/\r$//" ${worksrcpath}/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # patch out test to exclude older zlib versions that fails on some mac systems like 10.6
patchfiles-append patch-pngpriv-zlib-test.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/files/patch-irrlicht-cirrdevice.diff b/devel/irrlicht/files/patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ce35704..5b15780 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/irrlicht/files/patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/files/patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,50 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm.old 2016-12-03 16:23:57.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm 2016-12-03 16:19:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -496,7 +496,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSApplication sharedApplication];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSApp finishLaunching];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r5869 | cutealien | 2019-10-06 11:52:02 +0000 (Sun, 06 Oct 2019) | 3 lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CIrrDeviceMacOSX now sets the SEvent.MouseInput Shift and Control values on mouse events like the other devices.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Thanks @ Zero King for patch (#321) (https://sourceforge.net/p/irrlicht/patches/321)
</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;'>+Index: source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5868)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5869)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1259,7 +1259,12 @@
</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;'>+ if (post)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ievent.MouseInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postEventFromUser(ievent);
</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;'>+ [NSApp sendEvent:(NSEvent *)event];
</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;'>+------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r5690 | cutealien | 2019-01-23 12:49:24 +0000 (Wed, 23 Jan 2019) | 3 lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backport from trunk: Fix compilation on OSX and prevent capturing mouse cursor when Window is not on top (Patch #319.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Thanks at Artem Shoobovych for bugreport and patch (https://sourceforge.net/p/irrlicht/patches/319/)
</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;'>+Index: source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5689)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5690)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -495,8 +495,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!CreationParams.WindowId) //load menus if standalone application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSApplication sharedApplication];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSApp finishLaunching];
</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;'>+------------------------------------------------------------------------
</span></pre><pre style='margin:0'>
</pre>