mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 02:11:58 +08:00
[Qt3D] add missing qt port (#26928)
* bump qtbase * add qt3d * format manifest * test features in CI * pass ci baseline stuff * vulkan is skip in ci so cannot force it. * remove extra , * fix deps * try to fix promotion * gstreamer adjustments. * fix gstreamer on linux * fix gstreamer stuff * fix x264 api import macro * fix gst-rsp-server * correctly replace * promote targets.... * enable arm64 qtwebengine * --trace-expand * install wrapper for egl. * add newline * remove opengl from skip list * add gl to link * another try * retry again * test dynamic angle linkage * retry * link XNVCtrl * retry * add libxnvctrl * retry * retry again... * move wrapper to angle * revert changes to egl-reg * more debugging * try again * fix stuff * add missing , * egl stuff * wrapper stuff * fix angle * remove double dep * remove libxnvctrl * format manifest * revert trace * bump version * bump v * v db * remove trace * v db * refine supports * v db * remove qtmultimedia from baseline
This commit is contained in:
parent
28272621b8
commit
e1a1ddd093
@ -98,7 +98,8 @@ file(GLOB ANGLE_COMMON_SOURCES
|
||||
"src/common/third_party/xxhash/*.h"
|
||||
"src/common/third_party/xxhash/*.c"
|
||||
"src/common/third_party/smhasher/src/*.h"
|
||||
"src/common/third_party/smhasher/src/*.cpp")
|
||||
"src/common/third_party/smhasher/src/*.cpp"
|
||||
)
|
||||
list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}")
|
||||
add_library(angle_common OBJECT ${ANGLE_COMMON_SOURCES})
|
||||
target_include_directories(angle_common PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/common/third_party/base>")
|
||||
@ -442,6 +443,18 @@ file(GLOB ANGLE_GPU_INFO_UTIL_SOURCES
|
||||
"src/gpu_info_util/SystemInfo_internal.h"
|
||||
"src/gpu_info_util/SystemInfo.cpp"
|
||||
)
|
||||
|
||||
if(LINUX)
|
||||
find_package(X11 COMPONENTS Xext Xi REQUIRED)
|
||||
include_directories(${X11_INCLUDE_DIR})
|
||||
list(APPEND LIBANGLE_RENDERER_PLATFORM ${X11_LIBRARIES})
|
||||
set(LIBANGLE_RENDERER_COMPILEDEF
|
||||
-DANGLE_USE_X11
|
||||
)
|
||||
else()
|
||||
set(LIBANGLE_RENDERER_COMPILEDEF )
|
||||
endif()
|
||||
|
||||
add_library(angle_gpu_info_util OBJECT ${ANGLE_GPU_INFO_UTIL_SOURCES})
|
||||
if(WIN32)
|
||||
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp")
|
||||
@ -457,8 +470,9 @@ elseif(APPLE)
|
||||
target_link_libraries(angle_gpu_info_util PRIVATE ${IOKit} ${CoreFoundation} ${CoreGraphics})
|
||||
elseif(LINUX)
|
||||
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_linux.cpp" "src/gpu_info_util/SystemInfo_x11.cpp")
|
||||
target_sources(angle_gpu_info_util PRIVATE "src/third_party/libXNVCtrl/NVCtrl.c")
|
||||
target_compile_definitions(angle_gpu_info_util PRIVATE GPU_INFO_USE_X11)
|
||||
target_link_libraries(angle_gpu_info_util PRIVATE X11 Xi Xext)
|
||||
target_link_libraries(angle_gpu_info_util PRIVATE X11::X11 X11::Xi X11::Xext)
|
||||
elseif(ANDROID)
|
||||
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_android.cpp")
|
||||
endif()
|
||||
@ -547,17 +561,6 @@ else()
|
||||
set(LIBANGLE_RENDERER_PLATFORM )
|
||||
endif()
|
||||
|
||||
if(LINUX)
|
||||
find_package(X11)
|
||||
include_directories(${X11_INCLUDE_DIR})
|
||||
list(APPEND LIBANGLE_RENDERER_PLATFORM ${X11_LIBRARIES})
|
||||
set(LIBANGLE_RENDERER_COMPILEDEF
|
||||
-DANGLE_USE_X11
|
||||
)
|
||||
else()
|
||||
set(LIBANGLE_RENDERER_COMPILEDEF )
|
||||
endif()
|
||||
|
||||
add_library(libANGLE STATIC ${LIBANGLE_SOURCES})
|
||||
target_link_libraries(libANGLE PRIVATE
|
||||
angle::common
|
||||
|
@ -27,9 +27,9 @@ vcpkg_from_github(
|
||||
003-fix-mingw.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH})
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}/src/common)
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/angle_commit.h" DESTINATION "${SOURCE_PATH}")
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/angle_commit.h" DESTINATION "${SOURCE_PATH}/src/common")
|
||||
|
||||
function(checkout_in_path_with_patches PATH URL REF PATCHES)
|
||||
if(EXISTS "${PATH}")
|
||||
@ -53,21 +53,20 @@ checkout_in_path_with_patches(
|
||||
"third-party-zlib-far-undef.patch"
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
|
||||
OPTIONS
|
||||
-D${ANGLE_CPU_BITNESS}=1
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-angle PACKAGE_NAME unofficial-angle)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
# File conflict with opengl-registry! Make sure headers are similar on Update!
|
||||
# angle defines some additional entrypoints.
|
||||
@ -95,5 +94,3 @@ foreach(_file ${_double_files})
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "angle",
|
||||
"version-string": "chromium_4472",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": [
|
||||
"A conformant OpenGL ES implementation for Windows, Mac and Linux.",
|
||||
"The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
|
||||
@ -9,7 +9,27 @@
|
||||
"homepage": "https://github.com/google/angle",
|
||||
"dependencies": [
|
||||
"egl-registry",
|
||||
{
|
||||
"name": "libx11",
|
||||
"platform": "linux"
|
||||
},
|
||||
{
|
||||
"name": "libxext",
|
||||
"platform": "linux"
|
||||
},
|
||||
{
|
||||
"name": "libxi",
|
||||
"platform": "linux"
|
||||
},
|
||||
"opengl-registry",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
|
@ -24,3 +24,5 @@ file(
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||
RENAME copyright
|
||||
)
|
||||
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY)
|
||||
|
8
ports/egl-registry/vcpkg-cmake-wrapper.cmake
Normal file
8
ports/egl-registry/vcpkg-cmake-wrapper.cmake
Normal file
@ -0,0 +1,8 @@
|
||||
if(UNIX)
|
||||
_find_package(OpenGL COMPONENTS EGL)
|
||||
if(OPENGL_egl_LIBRARY) # Only defined for Linux with GLVND
|
||||
set(EGL_LIBRARY "${OPENGL_egl_LIBRARY}" CACHE STRING "")
|
||||
set(EGL_INCLUDE_DIR "${OPENGL_EGL_INCLUDE_DIRS}" CACHE STRING "")
|
||||
endif()
|
||||
endif()
|
||||
_find_package(${ARGS})
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "egl-registry",
|
||||
"version-date": "2021-11-23",
|
||||
"port-version": 1,
|
||||
"description": "the EGL API and Extension Registry",
|
||||
"homepage": "https://github.com/KhronosGroup/EGL-Registry"
|
||||
}
|
||||
|
@ -1,10 +1,25 @@
|
||||
{
|
||||
"name": "qt",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1,
|
||||
"description": "Qt",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qt3d",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"animation",
|
||||
"assimp",
|
||||
"extras",
|
||||
"input",
|
||||
"logic",
|
||||
"qml",
|
||||
"render",
|
||||
"rhi"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "qt5compat",
|
||||
"default-features": false,
|
||||
@ -142,7 +157,7 @@
|
||||
"spellchecker",
|
||||
"webchannel"
|
||||
],
|
||||
"platform": "!static"
|
||||
"platform": "!static & !(windows & arm)"
|
||||
},
|
||||
{
|
||||
"name": "qtwebsockets",
|
||||
@ -164,7 +179,7 @@
|
||||
"features": [
|
||||
"webengine"
|
||||
],
|
||||
"platform": "!static"
|
||||
"platform": "!static & !(windows & arm)"
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
|
35
ports/qt3d/portfile.cmake
Normal file
35
ports/qt3d/portfile.cmake
Normal file
@ -0,0 +1,35 @@
|
||||
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
|
||||
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
|
||||
|
||||
# General features:
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
|
||||
"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
|
||||
"vulkan" FEATURE_qt3d_vulkan
|
||||
"rhi" FEATURE_qt3d_rhi_renderer
|
||||
"render" FEATURE_qt3d_render
|
||||
"input" FEATURE_qt3d_input
|
||||
"logic" FEATURE_qt3d_logic
|
||||
"extras" FEATURE_qt3d_extras
|
||||
"animation" FEATURE_qt3d_animation
|
||||
INVERTED_FEATURES
|
||||
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
|
||||
"vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan
|
||||
)
|
||||
|
||||
if("assimp" IN_LIST FEATURES)
|
||||
list(APPEND FEATURE_OPTIONS -DINPUT_assimp=system)
|
||||
else()
|
||||
list(APPEND FEATURE_OPTIONS -DINPUT_assimp=no)
|
||||
endif()
|
||||
|
||||
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
|
||||
CONFIGURE_OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
#-DINPUT_fbxsdk=no
|
||||
-DFEATURE_qt3d_fbxsdk=OFF # OpenFBX? Probably not!
|
||||
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
|
||||
CONFIGURE_OPTIONS_RELEASE
|
||||
CONFIGURE_OPTIONS_DEBUG
|
||||
)
|
106
ports/qt3d/vcpkg.json
Normal file
106
ports/qt3d/vcpkg.json
Normal file
@ -0,0 +1,106 @@
|
||||
{
|
||||
"name": "qt3d",
|
||||
"version": "6.3.2",
|
||||
"description": "Qt wrapper for existing OPC UA stacks",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
"assimp",
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"concurrent",
|
||||
"gui",
|
||||
"network",
|
||||
"widgets"
|
||||
]
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"animation",
|
||||
"assimp",
|
||||
"extras",
|
||||
"input",
|
||||
"logic",
|
||||
"render"
|
||||
],
|
||||
"features": {
|
||||
"animation": {
|
||||
"description": "Use the 3D Animation Aspect library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qt3d",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"render"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"assimp": {
|
||||
"description": "Build with assimp",
|
||||
"dependencies": [
|
||||
"assimp"
|
||||
]
|
||||
},
|
||||
"extras": {
|
||||
"description": "Use the 3D Extra library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qt3d",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"input",
|
||||
"logic",
|
||||
"render"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"input": {
|
||||
"description": "Use the 3D Input Aspect library"
|
||||
},
|
||||
"logic": {
|
||||
"description": "Use the 3D Logic Aspect library"
|
||||
},
|
||||
"qml": {
|
||||
"description": "Build QML imports",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"gui"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "qtdeclarative",
|
||||
"default-features": false
|
||||
}
|
||||
]
|
||||
},
|
||||
"render": {
|
||||
"description": "Use the 3D Render Aspect library"
|
||||
},
|
||||
"rhi": {
|
||||
"description": "Enable RHI renderer",
|
||||
"dependencies": [
|
||||
"qtshadertools"
|
||||
]
|
||||
},
|
||||
"vulkan": {
|
||||
"description": "Build with vulkan support",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qt3d",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"rhi"
|
||||
]
|
||||
},
|
||||
"vulkan"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
@ -34,5 +34,6 @@ set(qtwebsockets_HASH "b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00
|
||||
set(qtwebview_HASH "39cb4bf67818e4d462fbdd180a802052b3637578a8b99a943359749f15b721f2e0b0354d90ceaaff99a57eba1c57c1ee271e4fd0a553d42c8093c665b9192688")
|
||||
set(qtinterfaceframework_REF a83bc81486891170750a3048e6b58d15903e6f9c)
|
||||
set(qtapplicationmanager_HASH "79a8e7588ec168d6cbccd921bc46b48a25512591b65e1602dd7cf461a7692472498301eea299808a08b7ed7f5efaa69f9a0b9ab86f9ea8f18cb4421c562c3f20")
|
||||
set(qt3d_HASH "1856aaf3ae7f91129b7eb0524497b0505f7ba9e1a7cbfee5eec26400d8ea36f88115f8d49ad93b3ef94c09f1ee11246482d6ab0416972a56431bd084cab44aa8")
|
||||
|
||||
set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629")
|
||||
|
@ -37,7 +37,8 @@ set(QT_PORTS qt
|
||||
qtopcua
|
||||
qtimageformats
|
||||
qtmqtt
|
||||
qtnetworkauth)
|
||||
qtnetworkauth
|
||||
qt3d)
|
||||
# qtquickcontrols2 -> moved into qtdeclarative
|
||||
if(QT_VERSION VERSION_GREATER_EQUAL 6.1)
|
||||
list(APPEND QT_PORTS
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "qtbase",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1,
|
||||
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
@ -45,4 +45,7 @@ qt_install_copyright("${SOURCE_PATH}")
|
||||
if(NOT VCPKG_CROSSCOMPILING)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen")
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
endif()
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "qtinterfaceframework",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1,
|
||||
"description": "Qt Interface Framework",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
@ -43,6 +43,7 @@ list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=OFF")
|
||||
|
||||
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
|
||||
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
|
||||
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
|
||||
CONFIGURE_OPTIONS_RELEASE
|
||||
CONFIGURE_OPTIONS_DEBUG
|
||||
)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "qtmultimedia",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1,
|
||||
"description": "Qt Multimedia",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
@ -26,7 +27,10 @@
|
||||
"gstreamer": {
|
||||
"description": "Build with gstreamer",
|
||||
"dependencies": [
|
||||
"angle",
|
||||
{
|
||||
"name": "angle",
|
||||
"platform": "windows"
|
||||
},
|
||||
"gstreamer"
|
||||
]
|
||||
},
|
||||
|
@ -79,7 +79,7 @@ endif()
|
||||
|
||||
string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length)
|
||||
# We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work.
|
||||
if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS)
|
||||
if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
|
||||
message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root=<shortpath> to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'")
|
||||
set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs
|
||||
cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR)
|
||||
|
@ -2,10 +2,11 @@
|
||||
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
|
||||
"name": "qtwebengine",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1,
|
||||
"description": "Qt WebEngine",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
"supports": "!static & !(x86 & windows)",
|
||||
"supports": "!static & !((x86 | arm) & windows)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
@ -85,10 +86,6 @@
|
||||
"name": "qtdeclarative",
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "qtdeclarative",
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "qttools",
|
||||
"default-features": false
|
||||
|
@ -785,7 +785,6 @@ opencv3:x64-windows-static-md = skip
|
||||
opencv3:x86-windows = skip
|
||||
opendnp3:x64-uwp=fail
|
||||
opendnp3:arm-uwp=fail
|
||||
opengl:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
|
||||
openmama:x64-windows-static-md=fail
|
||||
openmesh:arm64-windows=fail
|
||||
openmesh:arm-uwp=fail
|
||||
@ -863,12 +862,8 @@ qt5-canvas3d:x64-windows-static-md=skip
|
||||
qt5-canvas3d:x86-windows=skip
|
||||
# Missing system libraries
|
||||
qt5-wayland:x64-osx=fail
|
||||
# qtmultimedia needs an EGL fix
|
||||
qtmultimedia:x64-linux=fail
|
||||
qtwayland:x64-osx=fail
|
||||
qtwayland:arm64-osx=fail
|
||||
# Post build checks fail
|
||||
qtwebengine:arm64-windows=fail
|
||||
# Missing prerequisites for CI success
|
||||
qt5-webengine:x64-linux=fail
|
||||
qt5-webengine:x64-osx=fail
|
||||
@ -1238,6 +1233,13 @@ zeroc-ice:arm64-windows=fail
|
||||
zeroc-ice:arm-uwp=fail
|
||||
zeroc-ice:x64-uwp=fail
|
||||
|
||||
# Ports which needs to pass in CI
|
||||
cmake:x64-windows=pass
|
||||
cmake:x64-windows-static=pass
|
||||
cmake:x64-windows-static-md=pass
|
||||
cmake:arm64-windows=pass
|
||||
cmake:x64-linux=pass
|
||||
cmake:x64-osx=pass
|
||||
cmake-user:arm-uwp=pass
|
||||
cmake-user:arm64-windows=pass
|
||||
cmake-user:x64-linux=pass
|
||||
@ -1246,6 +1248,12 @@ cmake-user:x64-windows-static-md=pass
|
||||
cmake-user:x64-windows-static=pass
|
||||
cmake-user:x64-windows=pass
|
||||
cmake-user:x86-windows=pass
|
||||
qt:x64-windows=pass
|
||||
qt:x64-windows-static=pass
|
||||
# qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass.
|
||||
qt:arm64-windows=pass
|
||||
qt:x64-linux=pass
|
||||
# qt:x64-osx=pass # gstreamer issues preventing qtmultimedia
|
||||
vcpkg-ci-arrow:x64-windows=pass
|
||||
vcpkg-ci-arrow:x64-windows-static=pass
|
||||
vcpkg-ci-arrow:x64-windows-static-md=pass
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1c154e795d3d3c736dbbfec2db72a50aa37fa8f2",
|
||||
"version-string": "chromium_4472",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "d88baa0c355514a753460f90afb0451434460484",
|
||||
"version-string": "chromium_4472",
|
||||
|
@ -102,7 +102,7 @@
|
||||
},
|
||||
"angle": {
|
||||
"baseline": "chromium_4472",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"antlr4": {
|
||||
"baseline": "4.10.1",
|
||||
@ -2126,7 +2126,7 @@
|
||||
},
|
||||
"egl-registry": {
|
||||
"baseline": "2021-11-23",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"eigen3": {
|
||||
"baseline": "3.4.0",
|
||||
@ -5950,12 +5950,16 @@
|
||||
},
|
||||
"qt": {
|
||||
"baseline": "6.3.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qt-advanced-docking-system": {
|
||||
"baseline": "3.8.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"qt3d": {
|
||||
"baseline": "6.3.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"qt5": {
|
||||
"baseline": "5.15.6",
|
||||
"port-version": 0
|
||||
@ -6146,7 +6150,7 @@
|
||||
},
|
||||
"qtbase": {
|
||||
"baseline": "6.3.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qtcharts": {
|
||||
"baseline": "6.3.2",
|
||||
@ -6182,7 +6186,7 @@
|
||||
},
|
||||
"qtinterfaceframework": {
|
||||
"baseline": "6.3.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qtkeychain": {
|
||||
"baseline": "0.13.2",
|
||||
@ -6206,7 +6210,7 @@
|
||||
},
|
||||
"qtmultimedia": {
|
||||
"baseline": "6.3.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qtnetworkauth": {
|
||||
"baseline": "6.3.2",
|
||||
@ -6282,7 +6286,7 @@
|
||||
},
|
||||
"qtwebengine": {
|
||||
"baseline": "6.3.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qtwebsockets": {
|
||||
"baseline": "6.3.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "43e62391cc7413e33585df55584769bcb69bf563",
|
||||
"version-date": "2021-11-23",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "ec272777ea9d0ceccf5cc8b0336f038853e5c911",
|
||||
"version-date": "2021-11-23",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "dc6a4c7e1ff449ba08297582c31a2add75d1d87b",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "17bba488ae744a514ee214f30d0bdb1bd6da6831",
|
||||
"version": "6.3.2",
|
||||
|
9
versions/q-/qt3d.json
Normal file
9
versions/q-/qt3d.json
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8d2cabd2615053a8dcf800f29065e0cf9769a241",
|
||||
"version": "6.3.2",
|
||||
"port-version": 0
|
||||
}
|
||||
]
|
||||
}
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "02656542bbdef8469f5a461b1523c4111f0841b3",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "0b34c02c8bbcd997c6f65d11a4d01012f0441de1",
|
||||
"version": "6.3.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "887770433b2654dd335178a68b7f0910e28198cc",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "06bd4310e48e978c281804ba2bce2fc37d1b4fa1",
|
||||
"version": "6.3.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "953f717e1c02b90674da0910b204ce4f556a8673",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "f538a967236f91129b70c8cf335746242e0cacbd",
|
||||
"version": "6.3.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6a9606ce3a5531467f484accb11a2fe6e69f09a3",
|
||||
"version": "6.3.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "ec3282a08fee4cdadb156aa5389d33d39d507ebc",
|
||||
"version": "6.3.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user