<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2d93e639bc40bc7f61ac3ace664787d5568ce628">https://github.com/macports/macports-ports/commit/2d93e639bc40bc7f61ac3ace664787d5568ce628</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 2d93e639bc4 irrlicht: Fix build with OS X 10.10 SDK
</span>2d93e639bc4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2d93e639bc40bc7f61ac3ace664787d5568ce628
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 4 01:01:51 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> irrlicht: Fix build with OS X 10.10 SDK
</span>---
devel/irrlicht/Portfile | 13 ++++++----
devel/irrlicht/files/AppDelegate.patch | 36 ++++++++++++++++++++++++++
devel/irrlicht/files/HEADER_SEARCH_PATHS.patch | 7 ++++-
3 files changed, 50 insertions(+), 6 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 ebb1ed74d3c..e29d6f15405 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;'>@@ -12,7 +12,6 @@ checksums rmd160 84daa2521f039c21be659363af20941583782046 \
</span>
categories devel
license zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin macosx
</span>
maintainers nomaintainer
description lightning fast realtime 3D game engine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +30,17 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DOS to UNIX line endings so we can patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/source/Irrlicht "s|\r||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MacOSX/AppDelegate.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MacOSX/CIrrDeviceMacOSX.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fix build on case-sensitive file systems
# https://sourceforge.net/p/irrlicht/bugs/460/
move ${worksrcpath}/source/Irrlicht/MacOSX/irrFramework-Info.plist ${worksrcpath}/source/Irrlicht/MacOSX/IrrFramework-Info.plist
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append AppDelegate.patch
</span> patchfiles-append HEADER_SEARCH_PATHS.patch
xcode.project ./source/Irrlicht/MacOSX/MacOSX.xcodeproj
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +50,7 @@ xcode.target IrrFramework
</span>
# https://sourceforge.net/p/irrlicht/bugs/443/
# https://sourceforge.net/p/irrlicht/bugs/452/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://sourceforge.net/p/irrlicht/bugs/461/
</span> xcode.destroot.settings GCC_PREPROCESSOR_DEFINITIONS=PNG_ARM_NEON_OPT=0
# port builds again in destroot phase - no need to build twice
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +64,7 @@ if {${os.platform} eq "darwin" && [vercmp ${xcodeversion} >= 10.0]} {
</span>
post-destroot {
# the xcode project does not install all the include files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set flist [glob ${worksrcpath}/include/*.h]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f $flist {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy -force $f ${destroot}${frameworks_dir}/IrrFramework.framework/Versions/A/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force {*}[glob ${worksrcpath}/include/*.h] ${destroot}${frameworks_dir}/IrrFramework.framework/Versions/A/Headers
</span>
# add traditional paths for software that expects to find irrlicht in the headers & libs folders
ln -s ${frameworks_dir}/IrrFramework.framework/Versions/A/Headers ${destroot}${prefix}/include/irrlicht
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/files/AppDelegate.patch b/devel/irrlicht/files/AppDelegate.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5772cceb05e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/files/AppDelegate.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with the OS X 10.10 SDK:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: cannot initialize a parameter of type 'id<NSFileManagerDelegate>' with an rvalue of type 'id<NSApplicationDelegate>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/irrlicht/bugs/462/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Irrlicht/MacOSX/AppDelegate.h (revision 6519)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Irrlicht/MacOSX/AppDelegate.h (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "CIrrDeviceMacOSX.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@interface AppDelegate : NSObject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@interface AppDelegate : NSObject <NSApplicationDelegate, NSWindowDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL _quit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ irr::CIrrDeviceMacOSX *_device;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm.orig 2019-10-07 12:55:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm 2023-08-03 22:08:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -496,7 +496,7 @@
</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] 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;'>++ [[NSApplication sharedApplication] setDelegate:[[[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;'>+@@ -718,7 +718,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!CreationParams.WindowId)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Window center];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Window setDelegate:(id<NSWindowDelegate>)[NSApp delegate]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [Window setDelegate:(AppDelegate *)[NSApp delegate]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CreationParams.DriverType == video::EDT_OPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [OGLContext setView:[Window contentView]];
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/files/HEADER_SEARCH_PATHS.patch b/devel/irrlicht/files/HEADER_SEARCH_PATHS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3603d33a086..41eaa16d68a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/irrlicht/files/HEADER_SEARCH_PATHS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/files/HEADER_SEARCH_PATHS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,10 @@
</span> The bundled zlib library will be used, so make sure we use the bundled zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-header too to prevent build failure.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+header too to prevent build failure:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "_inflateValidate", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _png_inflate_claim in pngrutil.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ld: symbol(s) not found for architecture x86_64
</span>
https://sourceforge.net/p/irrlicht/bugs/459/
--- source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj.orig 2013-11-17 20:11:00.000000000 -0600
</pre><pre style='margin:0'>
</pre>