[irrlicht] update to <1.8.5> (#31558)

* [irrlicht] update to <1.8.5>

* update version

* update portfile.cmake

* update version
This commit is contained in:
JonLiu1993 2023-05-24 04:46:17 +08:00 committed by GitHub
parent e4e7a0b86b
commit 3a750bdcd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 42 deletions

View File

@ -1,28 +1,13 @@
diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp
index 66144326c..4ea224c24 100644
index 404bd53..71684d8 100644
--- a/source/Irrlicht/CImageLoaderJPG.cpp
+++ b/source/Irrlicht/CImageLoaderJPG.cpp
@@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)
boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
{
// DO NOTHING
- return 1;
+ return TRUE;
// DO NOTHING
- return 1;
+ return TRUE;
}
diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
index 53029eb45..e75b707e1 100644
--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
if(!CreationParams.WindowId) //load menus if standalone application
{
[[NSAutoreleasePool alloc] init];
- [NSApplication sharedApplication];
- [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
+ [[NSApplication sharedApplication] activateIgnoringOtherApps];
+ [NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
[NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
[NSApp finishLaunching];
}

View File

@ -1,12 +0,0 @@
--- a/source/Irrlicht/COSOperator.cpp
+++ b/source/Irrlicht/COSOperator.cpp
@@ -11,8 +11,8 @@
#else
#include <string.h>
#include <unistd.h>
-#ifndef _IRR_SOLARIS_PLATFORM_
#include <sys/types.h>
+#ifdef _IRR_OSX_PLATFORM_
#include <sys/sysctl.h>
#endif
#endif

View File

@ -1,12 +1,11 @@
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO irrlicht/Irrlicht%20SDK
REF 1.8/1.8.4
FILENAME "irrlicht-1.8.4.zip"
SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
REF 1.8/${VERSION}
FILENAME "irrlicht-${VERSION}.zip"
SHA512 d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9
PATCHES
fix-encoding.patch
fix-sysctl.patch
fix-osx-compilation.patch
)
@ -54,4 +53,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht")
endif()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt")

View File

@ -1,7 +1,6 @@
{
"name": "irrlicht",
"version": "1.8.4",
"port-version": 14,
"version": "1.8.5",
"description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.",
"homepage": "http://irrlicht.sourceforge.net",
"supports": "!(arm | uwp)",

View File

@ -3377,8 +3377,8 @@
"port-version": 5
},
"irrlicht": {
"baseline": "1.8.4",
"port-version": 14
"baseline": "1.8.5",
"port-version": 0
},
"irrxml": {
"baseline": "0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3",
"version": "1.8.5",
"port-version": 0
},
{
"git-tree": "a66d1403393733885e625b5f95fc1b7d3ed03505",
"version": "1.8.4",