From 6e30c933f16870f84709e46b117b0e253f856135 Mon Sep 17 00:00:00 2001 From: sdcb Date: Thu, 10 Nov 2016 11:13:56 +0800 Subject: [PATCH 1/3] [qt5] remove the empty plugins/gamepads folder (which caused a installation failure). --- ports/qt5/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index 6b11a8abe466bf..f2e19d4c6cec2f 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -144,4 +144,6 @@ vcpkg_execute_required_process( file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5 RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/plugins/gamepads) + vcpkg_copy_pdbs() From 202c113a7cdd917a4c90ef0b5b973cda1a985dca Mon Sep 17 00:00:00 2001 From: sdcb Date: Mon, 14 Nov 2016 17:37:16 +0800 Subject: [PATCH 2/3] Fix xinputgamepadd.dll directory issue. --- ports/qt5/portfile.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index f2e19d4c6cec2f..84d640a86f165a 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -130,6 +130,12 @@ foreach(file ${DEBUG_PLUGINS}) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}") file(RENAME ${file} "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}/${file_n}") endforeach() +file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/plugins/gamepads/xinputgamepadd.dll + ${CURRENT_PACKAGES_DIR}/plugins/gamepads/xinputgamepad.dll) +file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/plugins/gamepads/xinputgamepadd.pdb + ${CURRENT_PACKAGES_DIR}/plugins/gamepads/xinputgamepad.pdb) if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic) file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/bin/*.dll") @@ -144,6 +150,4 @@ vcpkg_execute_required_process( file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5 RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/plugins/gamepads) - vcpkg_copy_pdbs() From daa83822085ee79eec3f68d5111f11457972267e Mon Sep 17 00:00:00 2001 From: sdcb Date: Mon, 14 Nov 2016 17:39:22 +0800 Subject: [PATCH 3/3] Fix the xinputgamepad.dll directory issue. --- ports/qt5/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index 84d640a86f165a..85ebb107b1be6d 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -131,10 +131,10 @@ foreach(file ${DEBUG_PLUGINS}) file(RENAME ${file} "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}/${file_n}") endforeach() file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/plugins/gamepads/xinputgamepadd.dll + ${CURRENT_PACKAGES_DIR}/debug/plugins/gamepads/xinputgamepad.dll ${CURRENT_PACKAGES_DIR}/plugins/gamepads/xinputgamepad.dll) file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/plugins/gamepads/xinputgamepadd.pdb + ${CURRENT_PACKAGES_DIR}/debug/plugins/gamepads/xinputgamepad.pdb ${CURRENT_PACKAGES_DIR}/plugins/gamepads/xinputgamepad.pdb) if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)