From 887824320c59425f0c0e6d74681c8270add6bd9c Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 15:48:28 +1000 Subject: [PATCH 01/18] Fix Irrlicht compilation on OSX --- ports/irrlicht/CMakeLists.txt | 69 ++++++++++++++++++------ ports/irrlicht/CONTROL | 2 +- ports/irrlicht/fix-osx-compilation.patch | 22 ++++++++ ports/irrlicht/portfile.cmake | 6 +-- 4 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 ports/irrlicht/fix-osx-compilation.patch diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index d7e0c8f50ff405..5cd30a1be803f6 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -1,11 +1,11 @@ # # Irrlicht 3D engine # -cmake_minimum_required(VERSION 3.8) -project(Irrlicht) +cmake_minimum_required(VERSION 3.16) +project(Irrlicht LANGUAGES C CXX OBJCXX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) - + # Irrlicht directories # ------------------------------------------------------------------------------------------------- set(IRR_SRC_DIR "source/Irrlicht") @@ -48,7 +48,15 @@ glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_TOOL_DIR}/FileToHeader glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_TOOL_DIR}/GUIEditor/) glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_TOOL_DIR}/IrrFontTool/newFontTool/) glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_TOOL_DIR}/MeshConverter/) - + +if(APPLE) + file(GLOB IRR_SRC_FILES_OSX + "${IRR_SRC_DIR}/MacOSX/*.mm" + "${IRR_SRC_DIR}/MacOSX/*.h") + + set(IRR_SRC_FILES ${IRR_SRC_FILES} ${IRR_SRC_FILES_OSX}) +endif() + # Group files # ------------------------------------------------------------------------------------------------- source_group(Irrlicht\\engine FILES ${IRR_SRC_FILES}) @@ -79,11 +87,41 @@ else() add_library(Irrlicht STATIC ${IRR_ALL_SRC_FILES}) endif() -target_link_libraries(Irrlicht PRIVATE - ${PNG_LIBRARY} - ${JPEG_LIBRARY} +if(APPLE) + target_include_directories(Irrlicht PRIVATE ${IRR_SRC_DIR}/MacOSX) + + target_compile_definitions(Irrlicht PRIVATE SYSTEM=MacOSX) + + target_link_libraries(Irrlicht ${OSX_LIBRARIES}) + + target_compile_options(Irrlicht PRIVATE "-ObjC++") + + # PATCH: + + # source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm:499:23: error: cannot initialize a parameter of type 'id _Nullable' with an rvalue of type 'id' + #[NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + # source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm: + # L499: + # -[NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + # +[NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + # L498: + # -[NSApplication sharedApplication]; + # +[[NSApplication sharedApplication] activateIgnoringOtherApps]; + + set(ADDITIONAL_LIRARIES + "-framework OpenGL" + "-framework IOKit" + "-framework Carbon" + "-framework AppKit" + "-framework Cocoa") +endif() + +target_link_libraries(Irrlicht PRIVATE + ${PNG_LIBRARY} + ${JPEG_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARY} + ${ADDITIONAL_LIRARIES} ) if(IRR_BUILD_TOOLS) @@ -112,7 +150,7 @@ target_include_directories(Irrlicht ) # I dont realy understand why this is necesary or what it is doing, -# but it is necesarry to build and export a package. +# but it is necesarry to build and export a package. # See: https://cmake.org/cmake/help/v3.8/command/target_include_directories.html target_include_directories(Irrlicht PUBLIC $ @@ -177,7 +215,6 @@ if(WIN32) target_compile_options(Irrlicht PRIVATE /arch:SSE2) endif() endif() - elseif(UNIX) # Standard mode target_compile_options(Irrlicht @@ -185,7 +222,7 @@ elseif(UNIX) PRIVATE -pipe PRIVATE -fno-exceptions PRIVATE -fno-strict-aliasing) - + # Disable RTTI on C++ files only (no sense for C files) set_source_files_properties(${IRR_SRC_FILES} ${IRR_SRC_FILES_AESGLADMAN} PROPERTIES COMPILE_FLAGS -fno-rtti) @@ -194,10 +231,12 @@ elseif(UNIX) target_compile_options(Irrlicht PRIVATE $<$:-D_DEBUG>) # X11 and OpenGL - target_link_libraries(Irrlicht - PRIVATE X11 - PRIVATE GL - PRIVATE Xxf86vm) + if(NOT APPLE) + target_link_libraries(Irrlicht + PRIVATE X11 + PRIVATE GL + PRIVATE Xxf86vm) + endif() endif() # Installation @@ -214,7 +253,7 @@ install(FILES ${IRR_SRC_FILES_INTERFACE} DESTINATION "include/irrlicht" CONFIGUR if(IRR_BUILD_TOOLS) install( - TARGETS FileToHeader GUIEditor FontTool MeshConverter + TARGETS FileToHeader GUIEditor FontTool MeshConverter RUNTIME DESTINATION tools/irrlicht/ CONFIGURATIONS Release ) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index e8ff45bdd81fd5..74307fa7a00bbc 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -3,7 +3,7 @@ Version: 1.8.4-10 Homepage: http://irrlicht.sourceforge.net Description: Irrlicht lightning fast 3d engine Build-Depends: zlib, libpng, bzip2, libjpeg-turbo -Supports: !(arm|uwp|osx) +Supports: !(arm|uwp) Feature: unicode Description: Support unicode path on windows diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch new file mode 100644 index 00000000000000..482e5792bc2462 --- /dev/null +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -0,0 +1,22 @@ +--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm ++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +@@ -495,8 +495,8 @@ + 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]; + } +--- a/source/Irrlicht/CImageLoaderJPG.cpp ++++ b/source/Irrlicht/CImageLoaderJPG.cpp +@@ -68,7 +68,7 @@ + boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) + { + // DO NOTHING +- return 1; ++ return TRUE; + } diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 754119f3ed9ec2..9506d4a9347dba 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "osx" "uwp") +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -6,7 +6,7 @@ vcpkg_from_sourceforge( REF 1.8/1.8.4 FILENAME "irrlicht-1.8.4.zip" SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 - PATCHES fix-encoding.patch fix-sysctl.patch + PATCHES fix-encoding.patch fix-sysctl.patch fix-osx-compilation.patch ) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) @@ -24,7 +24,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS + OPTIONS -DIRR_SHARED_LIB=${SHARED_LIB} ${FEATURE_OPTIONS} ) From 95df5539e72fb4553be76c5da9e42834bff8e2e3 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 15:56:27 +1000 Subject: [PATCH 02/18] Update port description --- ports/irrlicht/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index 74307fa7a00bbc..0ac470d56d5bee 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -1,7 +1,7 @@ Source: irrlicht Version: 1.8.4-10 Homepage: http://irrlicht.sourceforge.net -Description: Irrlicht lightning fast 3d engine +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. Build-Depends: zlib, libpng, bzip2, libjpeg-turbo Supports: !(arm|uwp) From 0acc0d09c5d68a270f87754cde6d62332917bc82 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 15:56:46 +1000 Subject: [PATCH 03/18] Update portfile instructions --- ports/irrlicht/portfile.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 9506d4a9347dba..3a0ec5c7adfe56 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -21,17 +21,16 @@ vcpkg_check_features( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS -DIRR_SHARED_LIB=${SHARED_LIB} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() if("tools" IN_LIST FEATURES) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) From 5bac7d9dfbb66a15840b326a02ffe9eefc35a355 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 15:56:57 +1000 Subject: [PATCH 04/18] Update version --- versions/i-/irrlicht.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index a5fb44f207eb38..cba1fcb92a5067 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e2b2dd836e693401dab067c5064665e926a46b07", + "git-tree": "d6bda38d2537ccfb348d40dea89026ea64c90852", "version-string": "1.8.4-10", "port-version": 0 }, From 76ba4fd9f36ae148b6f6688510f21484fe4a0418 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 16:09:00 +1000 Subject: [PATCH 05/18] Fix patch files --- ports/irrlicht/fix-osx-compilation.patch | 40 ++++++++++++++---------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch index 482e5792bc2462..6f623db265e214 100644 --- a/ports/irrlicht/fix-osx-compilation.patch +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -1,22 +1,28 @@ ---- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -@@ -495,8 +495,8 @@ - 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/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp +index 66144326c..4ea224c24 100644 --- a/source/Irrlicht/CImageLoaderJPG.cpp +++ b/source/Irrlicht/CImageLoaderJPG.cpp -@@ -68,7 +68,7 @@ +@@ -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]; + } From dca2bbe97c71aa0ba9cb5027e945903aecb1fe72 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 16:09:11 +1000 Subject: [PATCH 06/18] Add missing cmake dependencies --- ports/irrlicht/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index 0ac470d56d5bee..5e14c71e52171f 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -2,7 +2,7 @@ Source: irrlicht Version: 1.8.4-10 Homepage: http://irrlicht.sourceforge.net 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. -Build-Depends: zlib, libpng, bzip2, libjpeg-turbo +Build-Depends: zlib, libpng, bzip2, libjpeg-turbo, vcpkg-cmake, vcpkg-cmake-config Supports: !(arm|uwp) Feature: unicode From a6c128e08745af1aed8a0e7b6bb2ef8139f57a0c Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 16:15:21 +1000 Subject: [PATCH 07/18] Remove obsolete comment --- ports/irrlicht/CMakeLists.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index 5cd30a1be803f6..e5ee7290eb681a 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -96,18 +96,6 @@ if(APPLE) target_compile_options(Irrlicht PRIVATE "-ObjC++") - # PATCH: - - # source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm:499:23: error: cannot initialize a parameter of type 'id _Nullable' with an rvalue of type 'id' - #[NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - # source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm: - # L499: - # -[NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - # +[NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - # L498: - # -[NSApplication sharedApplication]; - # +[[NSApplication sharedApplication] activateIgnoringOtherApps]; - set(ADDITIONAL_LIRARIES "-framework OpenGL" "-framework IOKit" From 97d739c7d7e7131cebc135d4fba91c65be62ed38 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 16:50:11 +1000 Subject: [PATCH 08/18] Update version --- versions/i-/irrlicht.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index cba1fcb92a5067..22304ee4e890b8 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d6bda38d2537ccfb348d40dea89026ea64c90852", + "git-tree": "60a98b41c351578d3333739dbb98dbdf7db9a0e6", "version-string": "1.8.4-10", "port-version": 0 }, From b46295e854b4635212fadd7d71eae34f70a85892 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 17:18:44 +1000 Subject: [PATCH 09/18] Remove OBJCXX language from project definition to prevent Windows builds from failing --- ports/irrlicht/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index e5ee7290eb681a..cc6edc785b5916 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -2,7 +2,7 @@ # Irrlicht 3D engine # cmake_minimum_required(VERSION 3.16) -project(Irrlicht LANGUAGES C CXX OBJCXX) +project(Irrlicht LANGUAGES C CXX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) From 6386082e68c5fb02e10d1ddeae72887830263da7 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 17:57:38 +1000 Subject: [PATCH 10/18] Update versions --- versions/i-/irrlicht.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index 22304ee4e890b8..c283e609892263 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "60a98b41c351578d3333739dbb98dbdf7db9a0e6", + "git-tree": "da996239bd0a673f57f59686d2fdf350e9b5ea64", "version-string": "1.8.4-10", "port-version": 0 }, From 2ba1c2212381a1a41303731c019114f56bc13eaf Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 19:48:06 +1000 Subject: [PATCH 11/18] Code review tweaks --- ports/irrlicht/CONTROL | 3 ++- ports/irrlicht/portfile.cmake | 5 ++++- scripts/ci.baseline.txt | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index 5e14c71e52171f..5161a33b2671d0 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -1,5 +1,6 @@ Source: irrlicht -Version: 1.8.4-10 +Version: 1.8.4 +Port-Version: 11 Homepage: http://irrlicht.sourceforge.net 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. Build-Depends: zlib, libpng, bzip2, libjpeg-turbo, vcpkg-cmake, vcpkg-cmake-config diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 3a0ec5c7adfe56..9641f8fddc837d 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -6,7 +6,10 @@ vcpkg_from_sourceforge( REF 1.8/1.8.4 FILENAME "irrlicht-1.8.4.zip" SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 - PATCHES fix-encoding.patch fix-sysctl.patch fix-osx-compilation.patch + PATCHES + fix-encoding.patch + fix-sysctl.patch + fix-osx-compilation.patch ) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dbf417741b856d..2c48d86006a4c5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -487,7 +487,6 @@ intelrdfpmathlib:x64-linux=fail intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail -irrlicht:x64-osx=fail irrlicht:x64-uwp=fail isal:arm64-windows=fail isal:arm-uwp=fail From 1169efad79ba3ea4c74b02df13f9cbcae2572f49 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 19:48:19 +1000 Subject: [PATCH 12/18] Update version --- versions/baseline.json | 8 ++++---- versions/i-/irrlicht.json | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b505800252b1b5..11c0b1f120ee06 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2701,8 +2701,8 @@ "port-version": 2 }, "irrlicht": { - "baseline": "1.8.4-10", - "port-version": 0 + "baseline": "1.8.4", + "port-version": 11 }, "irrxml": { "baseline": "0", @@ -3539,8 +3539,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index c283e609892263..da5b5eb9caa89c 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18ae08d6099b5457ccedbdb7209c79321a9e9027", + "version-string": "1.8.4", + "port-version": 11 + }, { "git-tree": "da996239bd0a673f57f59686d2fdf350e9b5ea64", "version-string": "1.8.4-10", From a8b5d39c3018ea78c5ab1406e739eeec2caaffd4 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 30 Jun 2021 20:29:21 +1000 Subject: [PATCH 13/18] Update versions/i-/irrlicht.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- versions/i-/irrlicht.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index da5b5eb9caa89c..6d884cfe326ed8 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -6,7 +6,7 @@ "port-version": 11 }, { - "git-tree": "da996239bd0a673f57f59686d2fdf350e9b5ea64", + "git-tree": "e2b2dd836e693401dab067c5064665e926a46b07", "version-string": "1.8.4-10", "port-version": 0 }, From cfe13d26db178b17b937af0995481ddb0ae34011 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Thu, 1 Jul 2021 17:11:24 +1000 Subject: [PATCH 14/18] Fix qt5-3d build failure on OSX --- ports/qt5-3d/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 912bad83dc6b51..62a01e4de459a9 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -45,6 +45,8 @@ if(BZ2_DBG) endif() if(VCPKG_TARGET_IS_WINDOWS) set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib") +elseif(VCPKG_TARGET_IS_OSX) + set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit") else() set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") endif() From 1be211c74a88e8c1562251aca396fca165d57538 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Thu, 1 Jul 2021 17:11:44 +1000 Subject: [PATCH 15/18] Update qt5-3d version --- versions/q-/qt5-3d.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index d29595cbe01ae1..0303c2414cc56e 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c9a8b7a2360c554409f283143edf9202bebe6a3b", + "git-tree": "485d3bc3da70ca095891f8641bafd228e1538232", "version-string": "5.15.2", "port-version": 0 }, From d37b9e3843f3dc04bb5b42a298a580d8d6b567f2 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Thu, 1 Jul 2021 18:29:52 +1000 Subject: [PATCH 16/18] Update port-version for qt5-3d --- ports/qt5-3d/CONTROL | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 7868a6595c2c04..1ec0c15a669e54 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,5 @@ Source: qt5-3d Version: 5.15.2 +Port-Version: 1 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad, assimp From f234b5f8996e7a70389898aefc5a5e12dfe20960 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Thu, 1 Jul 2021 18:30:29 +1000 Subject: [PATCH 17/18] Update version for qt5-3d --- versions/baseline.json | 2 +- versions/q-/qt5-3d.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 11c0b1f120ee06..b717e930819bd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5086,7 +5086,7 @@ }, "qt5-3d": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.2", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 0303c2414cc56e..e3bc8d82785c3d 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c3c15324a4764d3501798299c8ad8087905b136", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "485d3bc3da70ca095891f8641bafd228e1538232", "version-string": "5.15.2", From a28026873579605c63447df6ea40390232e1797f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 1 Jul 2021 17:07:20 +0000 Subject: [PATCH 18/18] [qt5-3d] Revert modification to previous version entry --- versions/q-/qt5-3d.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index e3bc8d82785c3d..ca2dd24e74b219 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -6,7 +6,7 @@ "port-version": 1 }, { - "git-tree": "485d3bc3da70ca095891f8641bafd228e1538232", + "git-tree": "c9a8b7a2360c554409f283143edf9202bebe6a3b", "version-string": "5.15.2", "port-version": 0 },