[qt5-location] Rename vendored libs to avoid conflicts (#13451)

* [qt5-location] Rename vendored libs to avoid conflicts

* [qt5-location] Use upstream patch

* [qt5-location] Replace / in patch url with %2F

* Update ports/qt5-location/CONTROL

* [assimp][irrxml] Remove outdated version of irrxml; redirect assimp at newer irrlicht

* [assimp] Apply skipped patch irrlicht.patch

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

4 files changed, 86 insertions, 114 deletions

diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
index be6613ec9..827ceadb3 100644
--- a/ports/assimp/CONTROL
+++ b/ports/assimp/CONTROL
@@ -1,6 +1,6 @@
 Source: assimp
 Version: 5.0.1
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/assimp/assimp
 Description: The Open Asset import library
-Build-Depends: zlib, rapidjson, minizip, stb, kubazip, irrxml, polyclipping, utfcpp, poly2tri
+Build-Depends: zlib, rapidjson, minizip, stb, kubazip, irrlicht, polyclipping, utfcpp, poly2tri
diff --git a/ports/assimp/config.patch b/ports/assimp/config.patch
deleted file mode 100644
index 7a7af9aaf..000000000
--- a/ports/assimp/config.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 4cb6927..d642832 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -352,7 +352,7 @@ IF (NOT TARGET uninstall)

-   ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

- ENDIF()

- 

--IF(HUNTER_ENABLED)

-+IF(HUNTER_ENABLED OR 1)

-   set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")

-   set(INCLUDE_INSTALL_DIR "include")

- 

-@@ -389,7 +389,7 @@ IF(HUNTER_ENABLED)

-       NAMESPACE "${NAMESPACE}"

-       DESTINATION "${CONFIG_INSTALL_DIR}"

-   )

--ELSE(HUNTER_ENABLED)

-+ELSE()

-   # cmake configuration files

-   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)

-   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)

-@@ -412,7 +412,7 @@ ELSE(HUNTER_ENABLED)

-     "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake"

-     ${PACKAGE_TARGETS_FILE}

-     DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT})

--ENDIF(HUNTER_ENABLED)

-+ENDIF()

- 

- FIND_PACKAGE( DirectX )

- 

-diff --git a/cmake/assimp-hunter-config.cmake.in b/cmake/assimp-hunter-config.cmake.in

-index 34762ac..ec1f554 100644

---- a/cmake/assimp-hunter-config.cmake.in

-+++ b/cmake/assimp-hunter-config.cmake.in

-@@ -1,14 +1,8 @@

- @PACKAGE_INIT@

- 

- find_package(RapidJSON CONFIG REQUIRED)

--find_package(ZLIB CONFIG REQUIRED)

--find_package(utf8 CONFIG REQUIRED)

--find_package(irrXML CONFIG REQUIRED)

-+find_package(ZLIB REQUIRED)

- find_package(minizip CONFIG REQUIRED)

--find_package(openddlparser CONFIG REQUIRED)

--find_package(poly2tri CONFIG REQUIRED)

--find_package(polyclipping CONFIG REQUIRED)

--find_package(zip CONFIG REQUIRED)

- 

- include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")

- check_required_components("@PROJECT_NAME@")

-diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt

-index 8e14fcf..91a3a7b 100644

---- a/code/CMakeLists.txt

-+++ b/code/CMakeLists.txt

-@@ -676,7 +676,7 @@ SET( PostProcessing_SRCS

- )

- SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})

- 

--SET( IrrXML_SRCS ${HEADER_PATH}/irrXMLWrapper.h )

-+SET( IrrXML_SRCS ${PROJECT_SOURCE_DIR}/contrib/irrXML/irrXML.cpp ${HEADER_PATH}/irrXMLWrapper.h )

- SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})

- 

- ADD_ASSIMP_IMPORTER( Q3D

-@@ -1125,7 +1125,7 @@ IF(HUNTER_ENABLED)

-       zip::zip

-   )

- ELSE(HUNTER_ENABLED)

--  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} minizip::minizip)

-+  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} minizip::minizip)

- ENDIF(HUNTER_ENABLED)

- 

- if(ASSIMP_ANDROID_JNIIOSYSTEM)

-@@ -1222,7 +1222,7 @@ IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)

-   TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY})

- ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)

- 

--IF(HUNTER_ENABLED)

-+IF(HUNTER_ENABLED OR 1)

-   INSTALL( TARGETS assimp

-     EXPORT "${TARGETS_EXPORT_NAME}"

-     LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

-@@ -1231,14 +1231,14 @@ IF(HUNTER_ENABLED)

-     FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

-     COMPONENT ${LIBASSIMP_COMPONENT}

-     INCLUDES DESTINATION "include")

--ELSE(HUNTER_ENABLED)

-+ELSE()

- INSTALL( TARGETS assimp

-     LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

-     ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

-     RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}

-     FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

-     COMPONENT ${LIBASSIMP_COMPONENT})

--ENDIF(HUNTER_ENABLED)

-+ENDIF()

- INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev)

- INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev)

- 

-diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt

-index 7f58af3..6d4b41e 100644

---- a/contrib/irrXML/CMakeLists.txt

-+++ b/contrib/irrXML/CMakeLists.txt

-@@ -21,6 +21,7 @@ ENDIF()

- set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )

- set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )

- 

-+return()

- install(TARGETS IrrXML

-   LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

-   ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}

diff --git a/ports/assimp/irrlicht.patch b/ports/assimp/irrlicht.patch
new file mode 100644
index 000000000..02d521dfb
--- /dev/null
+++ b/ports/assimp/irrlicht.patch
@@ -0,0 +1,82 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 2ec072d..3c8b5ab 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -132,7 +132,6 @@ OPTION ( IGNORE_GIT_HASH

+ 

+ find_package(Stb REQUIRED)

+ include_directories(${Stb_INCLUDE_DIR})

+-find_package(irrXML CONFIG REQUIRED)

+ find_path(UTF8_INCLUDE_DIRS "utf8.h")

+ include_directories(${UTF8_INCLUDE_DIRS})

+ find_package(RapidJSON CONFIG REQUIRED)

+@@ -389,7 +388,7 @@ ENDIF( BUILD_DOCS )

+ 

+ # Look for system installed irrXML

+ IF ( SYSTEM_IRRXML )

+-  FIND_PACKAGE( irrXML REQUIRED )

++  FIND_PACKAGE( irrlicht CONFIG REQUIRED )

+ ENDIF( SYSTEM_IRRXML )

+ 

+ # Search for external dependencies, and build them from source if not found

+diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt

+index 17fcea7..f08f59f 100644

+--- a/code/CMakeLists.txt

++++ b/code/CMakeLists.txt

+@@ -862,7 +862,7 @@ SET( Extra_SRCS

+ SOURCE_GROUP( Extra FILES ${Extra_SRCS})

+ 

+ # irrXML

+-  find_package(irrXML CONFIG REQUIRED)

++  find_package(irrlicht CONFIG REQUIRED)

+ 

+ # polyclipping

+   find_package(polyclipping CONFIG REQUIRED)

+@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC

+ 

+   TARGET_LINK_LIBRARIES(assimp

+       polyclipping::polyclipping

+-      irrXML::irrXML

++      Irrlicht

+       minizip::minizip

+       ZLIB::ZLIB

+       kubazip::kubazip

+diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp

+index 31d9aba..2c96052 100644

+--- a/code/X3D/FIReader.cpp

++++ b/code/X3D/FIReader.cpp

+@@ -654,8 +654,8 @@ public:

+         return currentNodeType;

+     }

+ 

+-    virtual int getAttributeCount() const /*override*/ {

+-        return static_cast<int>(attributes.size());

++    virtual unsigned int getAttributeCount() const /*override*/ {

++        return static_cast<unsigned int>(attributes.size());

+     }

+ 

+     virtual const char* getAttributeName(int idx) const /*override*/ {

+@@ -1733,7 +1733,7 @@ public:

+         return reader->getNodeType();

+     }

+ 

+-    virtual int getAttributeCount() const /*override*/ {

++    virtual unsigned int getAttributeCount() const /*override*/ {

+         return reader->getAttributeCount();

+     }

+ 

+diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h

+index 77cfd5e..ba584a0 100644

+--- a/include/assimp/irrXMLWrapper.h

++++ b/include/assimp/irrXMLWrapper.h

+@@ -133,8 +133,8 @@ public:

+ 

+     // ----------------------------------------------------------------------------------

+     //! Returns size of file in bytes

+-    virtual int getSize()   {

+-        return (int)data.size();

++    virtual long getSize() const override {

++        return (long)data.size();

+     }

+ 

+ private:

diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake
index 9d4ddbca0..7070921d5 100644
--- a/ports/assimp/portfile.cmake
+++ b/ports/assimp/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         build_fixes.patch
+        irrlicht.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)
@@ -49,7 +50,7 @@ file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake ASSIMP_CONFIG)
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake "
 include(CMakeFindDependencyMacro)
 find_dependency(ZLIB)
-find_dependency(irrXML CONFIG)
+find_dependency(irrlicht CONFIG)
 find_dependency(polyclipping CONFIG)
 find_dependency(minizip CONFIG)
 find_dependency(kubazip CONFIG)