forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Qt3D] add missing qt port (microsoft#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
- Loading branch information
Showing
28 changed files
with
299 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,35 @@ | ||
| { | ||
| "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." | ||
| ], | ||
| "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" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.