-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20908 from podsvirov/vsg-new-package
vulkanscenegraph: new package
- Loading branch information
Showing
5 changed files
with
410 additions
and
0 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # Maintainer: Konstantin Podsvirov <konstantin@podsvirov.pro> | ||
|
|
||
| _realname=vsgQt | ||
| pkgbase=mingw-w64-${_realname,,} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname,,}" | ||
| "${MINGW_PACKAGE_PREFIX}-${_realname,,}-docs") | ||
| pkgver=0.3.0 | ||
| pkgrel=1 | ||
| pkgdesc="Qt integration with VulkanSceneGraph (mingw-w64)" | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| url='http://www.vulkanscenegraph.org/' | ||
| msys2_repository_url='https://github.com/vsg-dev/vsgQt' | ||
| license=('spdx:MIT') | ||
| depends=("${MINGW_PACKAGE_PREFIX}-vulkanscenegraph" | ||
| "${MINGW_PACKAGE_PREFIX}-qt6-base") | ||
| makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" | ||
| "${MINGW_PACKAGE_PREFIX}-ninja" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-vsgxchange" | ||
| "${MINGW_PACKAGE_PREFIX}-doxygen" | ||
| "${MINGW_PACKAGE_PREFIX}-graphviz") | ||
| optdepends=("${MINGW_PACKAGE_PREFIX}-vsgxchange: Used by examples") | ||
| source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") | ||
| sha256sums=('3e929993977540ea7b5faadb4c914517a418a3492ad7775a253892ea78538dd7') | ||
|
|
||
| build() { | ||
| declare -a extra_config | ||
| if check_option "debug" "n"; then | ||
| extra_config+=("-DCMAKE_BUILD_TYPE=Release") | ||
| else | ||
| extra_config+=("-DCMAKE_BUILD_TYPE=Debug") | ||
| fi | ||
|
|
||
| MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ | ||
| "${MINGW_PREFIX}"/bin/cmake.exe \ | ||
| -GNinja \ | ||
| -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ | ||
| "${extra_config[@]}" \ | ||
| -DBUILD_{SHARED,STATIC}_LIBS=ON \ | ||
| -DQT_PACKAGE_NAME=Qt6 \ | ||
| -S "${_realname}-${pkgver}" \ | ||
| -B "build-${MSYSTEM}" | ||
|
|
||
| "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}" | ||
|
|
||
| "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}" --target docs | ||
| } | ||
|
|
||
| package_vsgqt() { | ||
| DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}" | ||
|
|
||
| install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname,,}/LICENSE.md" | ||
| } | ||
|
|
||
| package_vsgqt-docs() { | ||
| pkgdesc+=" (documentation)" | ||
| depends=() | ||
|
|
||
| mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname,,}" | ||
| cp -r "build-${MSYSTEM}/html" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname,,}/" | ||
| } | ||
|
|
||
| # template start; name=mingw-w64-splitpkg-wrappers; version=1.0; | ||
| # vim: set ft=bash : | ||
|
|
||
| # generate wrappers | ||
| for _name in "${pkgname[@]}"; do | ||
| _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}" | ||
| _func="$(declare -f "${_short}")" | ||
| eval "${_func/#${_short}/package_${_name}}" | ||
| done | ||
| # template end; |
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,78 @@ | ||
| # Maintainer: Konstantin Podsvirov <konstantin@podsvirov.pro> | ||
|
|
||
| _realname=vsgXchange | ||
| pkgbase=mingw-w64-${_realname,,} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname,,}" | ||
| "${MINGW_PACKAGE_PREFIX}-${_realname,,}-docs") | ||
| pkgver=1.1.2 | ||
| pkgrel=1 | ||
| pkgdesc="Utility library for converting data+materials to/from VulkanSceneGraph (mingw-w64)" | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| url='http://www.vulkanscenegraph.org/' | ||
| msys2_repository_url='https://github.com/vsg-dev/vsgXchange' | ||
| license=('spdx:MIT') | ||
| depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" | ||
| "${MINGW_PACKAGE_PREFIX}-assimp" | ||
| "${MINGW_PACKAGE_PREFIX}-curl" | ||
| "${MINGW_PACKAGE_PREFIX}-freetype" | ||
| "${MINGW_PACKAGE_PREFIX}-gdal" | ||
| "${MINGW_PACKAGE_PREFIX}-openexr" | ||
| "${MINGW_PACKAGE_PREFIX}-vulkan-loader" | ||
| "${MINGW_PACKAGE_PREFIX}-vulkanscenegraph") | ||
| makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" | ||
| "${MINGW_PACKAGE_PREFIX}-ninja" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-winpthreads-git" | ||
| "${MINGW_PACKAGE_PREFIX}-vulkan-headers" | ||
| "${MINGW_PACKAGE_PREFIX}-doxygen" | ||
| "${MINGW_PACKAGE_PREFIX}-graphviz") | ||
| source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") | ||
| sha256sums=('b80974c0e037c7b078fd15fa8e9dc942d8f8fe892e41ae173b21196cd2412e99') | ||
|
|
||
| build() { | ||
| declare -a extra_config | ||
| if check_option "debug" "n"; then | ||
| extra_config+=("-DCMAKE_BUILD_TYPE=Release") | ||
| else | ||
| extra_config+=("-DCMAKE_BUILD_TYPE=Debug") | ||
| fi | ||
|
|
||
| MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ | ||
| "${MINGW_PREFIX}"/bin/cmake.exe \ | ||
| -GNinja \ | ||
| -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ | ||
| "${extra_config[@]}" \ | ||
| -DBUILD_{SHARED,STATIC}_LIBS=ON \ | ||
| -S "${_realname}-${pkgver}" \ | ||
| -B "build-${MSYSTEM}" | ||
|
|
||
| "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}" | ||
|
|
||
| "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}" --target docs | ||
| } | ||
|
|
||
| package_vsgxchange() { | ||
| DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}" | ||
|
|
||
| install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname,,}/LICENSE.md" | ||
| } | ||
|
|
||
| package_vsgxchange-docs() { | ||
| pkgdesc+=" (documentation)" | ||
| depends=() | ||
|
|
||
| mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname,,}" | ||
| cp -r "build-${MSYSTEM}/html" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname,,}/" | ||
| } | ||
|
|
||
| # template start; name=mingw-w64-splitpkg-wrappers; version=1.0; | ||
| # vim: set ft=bash : | ||
|
|
||
| # generate wrappers | ||
| for _name in "${pkgname[@]}"; do | ||
| _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}" | ||
| _func="$(declare -f "${_short}")" | ||
| eval "${_func/#${_short}/package_${_name}}" | ||
| done | ||
| # template end; |
79 changes: 79 additions & 0 deletions
79
mingw-w64-vulkanscenegraph/0001-vsg-1.1.3-devendor-glslang.patch
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,79 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 85d18322..0ad18049 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -36,13 +36,14 @@ endif() | ||
| find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED) | ||
|
|
||
| find_package(Threads REQUIRED) | ||
| +find_package(glslang CONFIG REQUIRED) | ||
|
|
||
| # Set the instrumentation level to compile into sources | ||
| set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level to build into the VSG ibrary, 0 for off, 1 coarse grained, 2 medium, 3 fine grained." ) | ||
|
|
||
| # Enable/disable shader compilation support that pulls in glslang | ||
| set(VSG_SUPPORTS_ShaderCompiler 1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." ) | ||
| -if (VSG_SUPPORTS_ShaderCompiler) | ||
| +if (FALSE) | ||
| if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/glslang/build_vars.cmake) | ||
|
|
||
| if (Git_FOUND) | ||
| diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt | ||
| index 36597e0f..9f8cd47e 100644 | ||
| --- a/src/vsg/CMakeLists.txt | ||
| +++ b/src/vsg/CMakeLists.txt | ||
| @@ -254,7 +254,7 @@ set(SOURCES | ||
| utils/Profiler.cpp | ||
| ) | ||
|
|
||
| -if (${VSG_SUPPORTS_ShaderCompiler}) | ||
| +if (FALSE) | ||
|
|
||
| # include glslang source code directly into the VulkanScenegraph library build. | ||
| include(../glslang/build_vars.cmake) | ||
| @@ -264,6 +264,10 @@ endif() | ||
| set(LIBRARIES PUBLIC | ||
| Vulkan::Vulkan | ||
| Threads::Threads | ||
| + PRIVATE | ||
| + glslang::glslang | ||
| + glslang::glslang-default-resource-limits | ||
| + glslang::SPIRV | ||
| ) | ||
|
|
||
| # Check for std::atomic | ||
| @@ -402,9 +406,6 @@ target_include_directories(vsg | ||
| PUBLIC | ||
| $<BUILD_INTERFACE:${VSG_SOURCE_DIR}/include> | ||
| $<BUILD_INTERFACE:${VSG_BINARY_DIR}/include> | ||
| - PRIVATE | ||
| - $<BUILD_INTERFACE:${VSG_SOURCE_DIR}/src/glslang> | ||
| - $<BUILD_INTERFACE:${GLSLANG_GENERATED_INCLUDEDIR}> | ||
| ) | ||
|
|
||
| target_link_libraries(vsg ${LIBRARIES}) | ||
| diff --git a/src/vsg/utils/ShaderCompiler.cpp b/src/vsg/utils/ShaderCompiler.cpp | ||
| index a8f8dec9..2ca86f87 100644 | ||
| --- a/src/vsg/utils/ShaderCompiler.cpp | ||
| +++ b/src/vsg/utils/ShaderCompiler.cpp | ||
| @@ -20,7 +20,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI | ||
| #include <vsg/utils/ShaderCompiler.h> | ||
|
|
||
| #if VSG_SUPPORTS_ShaderCompiler | ||
| -# include <SPIRV/GlslangToSpv.h> | ||
| +# include <glslang/SPIRV/GlslangToSpv.h> | ||
| # include <glslang/Public/ResourceLimits.h> | ||
| # include <glslang/Public/ShaderLang.h> | ||
| #endif | ||
| diff --git a/src/vsg/vsgConfig.cmake.in b/src/vsg/vsgConfig.cmake.in | ||
| index 7ea0de02..4f7e77bd 100644 | ||
| --- a/src/vsg/vsgConfig.cmake.in | ||
| +++ b/src/vsg/vsgConfig.cmake.in | ||
| @@ -2,6 +2,7 @@ include(CMakeFindDependencyMacro) | ||
|
|
||
| find_package(Vulkan @Vulkan_MIN_VERSION@ REQUIRED) | ||
| find_dependency(Threads) | ||
| +find_dependency(glslang) | ||
|
|
||
| @FIND_DEPENDENCY_WINDOWING@ | ||
| include("${CMAKE_CURRENT_LIST_DIR}/vsgTargets.cmake") |
80 changes: 80 additions & 0 deletions
80
mingw-w64-vulkanscenegraph/0002-vsg-1.1.3-fix-win32-window.patch
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,80 @@ | ||
| --- VulkanSceneGraph-1.1.3.orig/src/vsg/platform/win32/Win32_Window.cpp 2024-05-18 00:12:14.035806400 +0300 | ||
| +++ VulkanSceneGraph-1.1.3/src/vsg/platform/win32/Win32_Window.cpp 2024-05-18 00:19:17.004076900 +0300 | ||
| @@ -199,14 +199,14 @@ | ||
| {VK_F22 , KEY_F22}, | ||
| {VK_F23 , KEY_F23}, | ||
| {VK_F24 , KEY_F24}, | ||
| - {VK_NAVIGATION_VIEW , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_MENU , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_UP , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_DOWN , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_LEFT , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_RIGHT , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_ACCEPT , KEY_Undefined}, // reserved | ||
| - {VK_NAVIGATION_CANCEL , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_VIEW , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_MENU , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_UP , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_DOWN , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_LEFT , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_RIGHT , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_ACCEPT , KEY_Undefined}, // reserved | ||
| +// {VK_NAVIGATION_CANCEL , KEY_Undefined}, // reserved | ||
| {VK_NUMLOCK , KEY_Undefined}, | ||
| {VK_SCROLL , KEY_Undefined}, | ||
| {VK_LSHIFT , KEY_Shift_L}, | ||
| @@ -240,30 +240,30 @@ | ||
| {VK_OEM_PERIOD , KEY_Period }, // '.' any country | ||
| {VK_OEM_2 , KEY_Slash }, // '/?' for US | ||
| {VK_OEM_3 , KEY_Tilde }, // '`~' for US | ||
| - {VK_GAMEPAD_A , KEY_Undefined}, | ||
| - {VK_GAMEPAD_B , KEY_Undefined}, | ||
| - {VK_GAMEPAD_X , KEY_Undefined}, | ||
| - {VK_GAMEPAD_Y , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_SHOULDER , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_SHOULDER , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_TRIGGER , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_TRIGGER , KEY_Undefined}, | ||
| - {VK_GAMEPAD_DPAD_UP , KEY_Undefined}, | ||
| - {VK_GAMEPAD_DPAD_DOWN , KEY_Undefined}, | ||
| - {VK_GAMEPAD_DPAD_LEFT , KEY_Undefined}, | ||
| - {VK_GAMEPAD_DPAD_RIGHT , KEY_Undefined}, | ||
| - {VK_GAMEPAD_MENU , KEY_Undefined}, | ||
| - {VK_GAMEPAD_VIEW , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_THUMBSTICK_UP , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_THUMBSTICK_DOWN , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT , KEY_Undefined}, | ||
| - {VK_GAMEPAD_LEFT_THUMBSTICK_LEFT , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_THUMBSTICK_UP , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT , KEY_Undefined}, | ||
| - {VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_A , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_B , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_X , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_Y , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_SHOULDER , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_SHOULDER , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_TRIGGER , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_TRIGGER , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_DPAD_UP , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_DPAD_DOWN , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_DPAD_LEFT , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_DPAD_RIGHT , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_MENU , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_VIEW , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_THUMBSTICK_UP , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_THUMBSTICK_DOWN , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_LEFT_THUMBSTICK_LEFT , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_THUMBSTICK_UP , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT , KEY_Undefined}, | ||
| +// {VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT , KEY_Undefined}, | ||
| {VK_OEM_4 , KEY_Leftbracket}, // '[{' for US | ||
| {VK_OEM_5 , KEY_Backslash}, // '\|' for US | ||
| {VK_OEM_6 , KEY_Rightbracket}, // ']}' for US |
Oops, something went wrong.