diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch index 6f623db265e..a1daf0b5c10 100644 --- a/ports/irrlicht/fix-osx-compilation.patch +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -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)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; -+ [[NSApplication sharedApplication] activateIgnoringOtherApps]; -+ [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; - [NSApp finishLaunching]; - } + + diff --git a/ports/irrlicht/fix-sysctl.patch b/ports/irrlicht/fix-sysctl.patch deleted file mode 100644 index 98c70273ecb..00000000000 --- a/ports/irrlicht/fix-sysctl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/source/Irrlicht/COSOperator.cpp -+++ b/source/Irrlicht/COSOperator.cpp -@@ -11,8 +11,8 @@ - #else - #include - #include --#ifndef _IRR_SOLARIS_PLATFORM_ - #include -+#ifdef _IRR_OSX_PLATFORM_ - #include - #endif - #endif diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 37f4ee26e88..4bea3839d2b 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -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") diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index d795eb26343..93bab6e65be 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -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)", diff --git a/versions/baseline.json b/versions/baseline.json index 5ff060bf324..9e750449e8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index 06cd40c1b35..f9d7634c454 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3", + "version": "1.8.5", + "port-version": 0 + }, { "git-tree": "a66d1403393733885e625b5f95fc1b7d3ed03505", "version": "1.8.4",