Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c229327d38538ecf530df6a49138d91a0cd4e67b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c229327d38538ecf530df6a49138d91a0cd4e67b)
  • Date: Sun, 13 Aug 2023 19:56:49 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

vulkan/vulkan-tools/BUILD | 8 +++++---
vulkan/vulkan-tools/DEPENDS | 22 ++++++++++++++++++++--
vulkan/vulkan-tools/HISTORY | 5 +++++
3 files changed, 30 insertions(+), 5 deletions(-)

New commits:
commit c229327d38538ecf530df6a49138d91a0cd4e67b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

vulkan/vulkan-tools: made wayland and wayland-protocols optional

added libx11 and libxcb optional dependencies, also, disabled ICD
building

diff --git a/vulkan/vulkan-tools/BUILD b/vulkan/vulkan-tools/BUILD
index e1cd4c3..afbfafe 100755
--- a/vulkan/vulkan-tools/BUILD
+++ b/vulkan/vulkan-tools/BUILD
@@ -1,4 +1,6 @@
-OPTS+=" -DSPIRV_SKIP_TESTS=1" &&
-OPTS+=" -DSPIRV_CHECK_CONTEXT=0" &&
-OPTS+=" -DSPIRV_WERROR=0" &&
+OPTS="-DSPIRV_SKIP_TESTS=ON
+ -DSPIRV_CHECK_CONTEXT=OFF
+ -DSPIRV_WERROR=OFF
+ -DBUILD_ICD=OFF
+ ${OPTS}" &&
default_build
diff --git a/vulkan/vulkan-tools/DEPENDS b/vulkan/vulkan-tools/DEPENDS
index 9121c1a..01e947a 100755
--- a/vulkan/vulkan-tools/DEPENDS
+++ b/vulkan/vulkan-tools/DEPENDS
@@ -1,8 +1,26 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends wayland &&
depends vulkan-headers "-DVULKAN_HEADERS_INSTALL_DIR=${TRACK_ROOT}/usr" &&
+
optional_depends glslang \
"-DBUILD_CUBE=ON -DGLSLANG_INSTALL_DIR=${TRACK_ROOT}/usr" \
"-DBUILD_CUBE=OFF" \
- "to build vkcube"
+ "to build vkcube" &&
+
+optional_depends libx11 \
+ "-DBUILD_WSI_XLIB_SUPPORT=ON" \
+ "-DBUILD_WSI_XLIB_SUPPORT=OFF" \
+ "Xlib support" &&
+
+optional_depends libxcb \
+ "-DBUILD_WSI_XCB_SUPPORT=ON" \
+ "-DBUILD_WSI_XCB_SUPPORT=OFF" \
+ "XCB support" &&
+
+optional_depends wayland \
+ "-DBUILD_WSI_WAYLAND_SUPPORT=ON" \
+ "-DBUILD_WSI_WAYLAND_SUPPORT=OFF" \
+ "Wayland support" &&
+if is_depends_enabled "${SPELL}" "wayland"; then
+ depends wayland-protocols
+fi
diff --git a/vulkan/vulkan-tools/HISTORY b/vulkan/vulkan-tools/HISTORY
index 66d21d6..dedf50a 100644
--- a/vulkan/vulkan-tools/HISTORY
+++ b/vulkan/vulkan-tools/HISTORY
@@ -1,3 +1,8 @@
+2023-08-13 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: reformatted, 0 -> OFF, 1 -> ON, disabled useless ICD building
+ * DEPENDS: made wayland and wayland-protocols optional, added libx11
and
+ libxcb options
+
2023-08-12 Pavel Vinogradov <public AT sourcemage.org>
* BUILD: made it executable, cmake_build -> default_build
* DEPENDS: glslang is optional now, INSTALL_ROOT -> TRACK_ROOT



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c229327d38538ecf530df6a49138d91a0cd4e67b), Pavel Vinogradov, 08/13/2023

Archive powered by MHonArc 2.6.24.

Top of Page