[qt5] Update to 5.15.1 (#13477)

* update everything. Let ci test if just updating is enough

* fix some minor version details.

* remove upstream patch

* add zstdd patch and do not remove zlib since it is required for bootstrapping

* add mqtt hash

* webengine hash

* add fixup pkgconfig to assimp

* add assimp to qt-3d (still requires zlib fix)

* setup pkg-config for qt

* fix psql detection in configure

* fix build details

* fix assimp library nameing

* -rpath option is not available for static builds

* move config log somewhere where CI can catch it.

* move logs only if they exists

* append bzip2 qt-3d

* break qt3d again to get logs

* retry qt3d

* remove qt-3d failure. everything ok now

* add assistent patch for qt5-tools not building qthelp

* remove unnecessary qt5-webengine patches

* Remove PSQL_TYPES

* [qt5-3d] remove irrxml as a assimp dep

* remove unnecessary patch

* fix qt-3d on windows

* fix qt5-3d linux

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

2 files changed, 55 insertions, 3 deletions

diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
index 179432bfb..716610b1d 100644
--- a/ports/qt5-3d/CONTROL
+++ b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d

-Version: 5.15.0

+Version: 5.15.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

+Build-Depends:  qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad, assimp

diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake
index 214726759..912bad83d 100644
--- a/ports/qt5-3d/portfile.cmake
+++ b/ports/qt5-3d/portfile.cmake
@@ -1,2 +1,54 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
\ No newline at end of file
+
+set(OPTIONS -system-assimp)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(VCVER vc140 vc141 vc142 )
+    set(CRT mt md)
+    set(DBG_NAMES)
+    set(REL_NAMES)
+    foreach(_ver IN LISTS VCVER)
+        foreach(_crt IN LISTS CRT)
+            list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d)
+            list(APPEND REL_NAMES assimp-${_ver}-${_crt})
+        endforeach()
+    endforeach()
+endif()
+
+find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
+find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+
+find_library(MINIZIP_REL NAMES minizip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
+find_library(MINIZIP_DBG NAMES minizip minizipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(KUBAZIP_REL NAMES kubazip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
+find_library(KUBAZIP_DBG NAMES kubazip kubazipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(JPEG_REL NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(JPEG_DBG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib
+find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(IRRLICHT_REL NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(IRRLICHT_DBG NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(POLYCLIPPING_REL NAMES polyclipping PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(POLYCLIPPING_DBG NAMES polyclipping polyclippingd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
+find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+# poly2tri
+find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+if(BZ2_REL)
+    string(APPEND MINIZIP_REL " ${BZ2_REL}")
+endif()
+if(BZ2_DBG)
+    string(APPEND MINIZIP_DBG " ${BZ2_DBG}")
+endif()
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib")
+else()
+    set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11")
+endif()
+set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${POLYCLIPPING_REL} ${POLY2TRI_REL} ${IRRLICHT_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}")
+set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${POLYCLIPPING_DBG} ${POLY2TRI_DBG} ${IRRLICHT_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}")
+
+qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})