diff --git a/config/graphic b/config/graphic
index e2c123e4f2..22fb88adbb 100644
--- a/config/graphic
+++ b/config/graphic
@@ -1,5 +1,6 @@
 [ -z "${OPENGL}" ] && OPENGL="no"
 [ -z "${OPENGLES}" ] && OPENGLES="no"
+[ -z "${VULKAN}" ] && VULKAN="no"
 
 if [ "${OPENGL}" = "no" ]; then
   OPENGL_SUPPORT="no"
@@ -13,11 +14,19 @@ else
   OPENGLES_SUPPORT="yes"
 fi
 
+if [ "${VULKAN}" = "no" ]; then
+  VULKAN_SUPPORT="no"
+else
+  VULKAN_SUPPORT="yes"
+fi
+
 get_graphicdrivers() {
 
   # set defaults
   GALLIUM_DRIVERS=""
   XORG_DRIVERS=""
+  VULKAN_DRIVERS_CONFIG=""
+  VULKAN_DRIVERS_MESA=""
   LLVM_SUPPORT="no"
   COMPOSITE_SUPPORT="no"
   VDPAU_SUPPORT="no"
@@ -59,6 +68,7 @@ get_graphicdrivers() {
   if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
     GALLIUM_DRIVERS+=" iris"
     XORG_DRIVERS+=" intel"
+    VULKAN_DRIVERS_MESA+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
@@ -74,6 +84,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
     XORG_DRIVERS+=" nvidia"
+    VULKAN_DRIVERS_CONFIG+=" nvidia"
     VDPAU_SUPPORT="yes"
   fi
 
@@ -84,6 +95,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
     GALLIUM_DRIVERS+=" kmsro panfrost"
+    VULKAN_DRIVERS_MESA+=" panfrost"
     V4L2_SUPPORT="yes"
   fi
 
@@ -107,6 +119,7 @@ get_graphicdrivers() {
   if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
     GALLIUM_DRIVERS+=" radeonsi"
     XORG_DRIVERS+=" ati amdgpu"
+    VULKAN_DRIVERS_MESA+=" amd"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
     VDPAU_SUPPORT="yes"
@@ -115,6 +128,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
     GALLIUM_DRIVERS+=" vc4 v3d kmsro"
+    VULKAN_DRIVERS_MESA+=" broadcom"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"
@@ -139,4 +153,7 @@ get_graphicdrivers() {
   GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
   GRAPHIC_DRIVERS="$(echo ${GRAPHIC_DRIVERS} | xargs -n1 | sort -u | xargs)"
   XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  VULKAN_DRIVERS_MESA="$(echo ${VULKAN_DRIVERS_MESA} | xargs -n1 | sort -u | xargs)"
+  VULKAN_DRIVERS_CONFIG+=" ${VULKAN_DRIVERS_MESA}"
+  VULKAN_DRIVERS_CONFIG="$(echo ${VULKAN_DRIVERS_CONFIG} | xargs -n1 | sort -u | xargs)"
 }
diff --git a/config/show_config b/config/show_config
index f9c2fca0ce..337f85f1ef 100644
--- a/config/show_config
+++ b/config/show_config
@@ -99,6 +99,10 @@ show_config() {
   config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}"
   config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT} (${OPENGL})"
   config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT} (${OPENGLES})"
+  config_message+="\n - Vulkan API support (provider):\t ${VULKAN_SUPPORT} (${VULKAN})"
+  if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+    config_message+="\n - Vulkan Graphic Drivers:\t\t ${VULKAN_DRIVERS_CONFIG}"
+  fi
 
   # Video Acceleration configuration
 
diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index ca8adde27c..a0b1cb07c1 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -21,7 +21,6 @@ PKG_MESON_OPTS_TARGET="-Ddri-drivers= \
                        -Dgallium-omx=disabled \
                        -Dgallium-nine=false \
                        -Dgallium-opencl=disabled \
-                       -Dvulkan-drivers= \
                        -Dshader-cache=enabled \
                        -Dshared-glapi=enabled \
                        -Dopengl=true \
@@ -82,3 +81,9 @@ else
   PKG_MESON_OPTS_TARGET+=" -Dgles1=disabled -Dgles2=disabled"
 fi
 
+if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" ${VULKAN} vulkan-tools"
+  PKG_MESON_OPTS_TARGET+=" -Dvulkan-drivers=${VULKAN_DRIVERS_MESA// /,}"
+else
+  PKG_MESON_OPTS_TARGET+=" -Dvulkan-drivers="
+fi
diff --git a/packages/graphics/vulkan/glslang/package.mk b/packages/graphics/vulkan/glslang/package.mk
new file mode 100644
index 0000000000..1987e78864
--- /dev/null
+++ b/packages/graphics/vulkan/glslang/package.mk
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="glslang"
+PKG_VERSION="11.7.0"
+PKG_SHA256="b6c83864c3606678d11675114fa5f358c519fe1dad9a781802bcc87fb8fa32d5"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://github.com/KhronosGroup/glslang"
+PKG_URL="https://github.com/KhronosGroup/glslang/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain:host Python3:host spirv-tools:host spirv-headers:host"
+PKG_LONGDESC="Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator."
+
+pre_configure_host() {
+  PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \
+                       -DBUILD_EXTERNAL=ON \
+                       -DENABLE_SPVREMAPPER=OFF \
+                       -DENABLE_GLSLANG_JS=OFF \
+                       -DENABLE_RTTI=OFF \
+                       -DENABLE_EXCEPTIONS=OFF \
+                       -DENABLE_OPT=ON \
+                       -DENABLE_PCH=ON \
+                       -DENABLE_CTEST=OFF \
+                       -DENABLE_RTTI=OFF \
+                       -Wno-dev"
+
+  # The SPIRV-Tools & SPIRV-Headers have to be specific versions matching the pkg version
+  # https://github.com/KhronosGroup/glslang/blob/master/known_good.json
+  mkdir -p ${PKG_BUILD}/External/spirv-tools/external/spirv-headers
+    cp -R $(get_build_dir spirv-tools)/* ${PKG_BUILD}/External/spirv-tools
+    cp -R $(get_build_dir spirv-headers)/* ${PKG_BUILD}/External/spirv-tools/external/spirv-headers
+}
diff --git a/packages/graphics/vulkan/spirv-headers/package.mk b/packages/graphics/vulkan/spirv-headers/package.mk
new file mode 100644
index 0000000000..a30cf7d7e2
--- /dev/null
+++ b/packages/graphics/vulkan/spirv-headers/package.mk
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="spirv-headers"
+# The SPIRV-Headers have to be specific versions matching the glslang pkg version
+# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
+PKG_VERSION="814e728b30ddd0f4509233099a3ad96fd4318c07"
+PKG_SHA256="c262d3c0c36ad5c87fbe3572aa292d2aed4dcd9b1ca4868eff9ec180e3f994f2"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://github.com/KhronosGroup/SPIRV-headers"
+PKG_URL="https://github.com/KhronosGroup/SPIRV-headers/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST=""
+PKG_LONGDESC="SPIRV-Headers"
+PKG_TOOLCHAIN="manual"
diff --git a/packages/graphics/vulkan/spirv-tools/package.mk b/packages/graphics/vulkan/spirv-tools/package.mk
new file mode 100644
index 0000000000..9a5c969cc2
--- /dev/null
+++ b/packages/graphics/vulkan/spirv-tools/package.mk
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="spirv-tools"
+# The SPIRV-Tools have to be specific versions matching the glslang pkg version
+# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
+PKG_VERSION="21e3f681e2004590c7865bc8c0195a4ab8e66c88"
+PKG_SHA256="1253ada1d3af912d43f7a9acff86c74afbdb6bdf1acd92bd61e0010c103bc050"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://github.com/KhronosGroup/SPIRV-Tools"
+PKG_URL="https://github.com/KhronosGroup/SPIRV-Tools/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST=""
+PKG_LONGDESC="The SPIR-V Tools project provides an API and commands for processing SPIR-V modules."
+PKG_TOOLCHAIN="manual"
diff --git a/packages/graphics/vulkan/vulkan-headers/package.mk b/packages/graphics/vulkan/vulkan-headers/package.mk
new file mode 100644
index 0000000000..31bd246c16
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-headers/package.mk
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2018-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="vulkan-headers"
+PKG_VERSION="1.2.201"
+PKG_SHA256="6b7f9c809acff4f0877e2e7722e02a08f2e17e06c6e2e8c84081631d15490009"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://github.com/KhronosGroup/Vulkan-Headers"
+PKG_URL="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Vulkan Header files and API registry"
diff --git a/packages/graphics/vulkan/vulkan-loader/package.mk b/packages/graphics/vulkan/vulkan-loader/package.mk
new file mode 100644
index 0000000000..0fc2a379ca
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-loader/package.mk
@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2018-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="vulkan-loader"
+PKG_VERSION="1.2.201"
+PKG_SHA256="465e8a35e875ddebde7cb59f15b0e2cdfae9c3826680c775d7d5b731d95ee1d6"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader"
+PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain vulkan-headers"
+PKG_LONGDESC="Vulkan Installable Client Driver (ICD) Loader."
+
+configure_package() {
+  # Displayserver Support
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    PKG_DEPENDS_TARGET+=" libxcb libX11"
+  elif [ "${DISPLAYSERVER}" = "weston" ]; then
+    PKG_DEPENDS_TARGET+=" wayland"
+  fi
+}
+
+pre_configure_target() {
+  PKG_CMAKE_OPTS_TARGET="-DBUILD_TESTS=OFF"
+
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=ON \
+                             -DBUILD_WSI_XLIB_SUPPORT=ON \
+                             -DBUILD_WSI_WAYLAND_SUPPORT=OFF"
+  elif [ "${DISPLAYSERVER}" = "weston" ]; then
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=OFF \
+                             -DBUILD_WSI_XLIB_SUPPORT=OFF \
+                             -DBUILD_WSI_WAYLAND_SUPPORT=ON"
+  else
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=OFF \
+                             -DBUILD_WSI_XLIB_SUPPORT=OFF \
+                             -DBUILD_WSI_WAYLAND_SUPPORT=OFF"
+  fi
+}
diff --git a/packages/graphics/vulkan/vulkan-loader/patches/vulkan-loader-995.01-fix-cross-compile.patch b/packages/graphics/vulkan/vulkan-loader/patches/vulkan-loader-995.01-fix-cross-compile.patch
new file mode 100644
index 0000000000..496285bc38
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-loader/patches/vulkan-loader-995.01-fix-cross-compile.patch
@@ -0,0 +1,23 @@
+From 4b90138ea1c28246e6a2b8d9b7568836cc4f3782 Mon Sep 17 00:00:00 2001
+From: SupervisedThinking <supervisedthinking@gmail.com>
+Date: Wed, 18 Sep 2019 20:24:48 +0200
+Subject: [PATCH] loader/CMakeList.txt: fix execution of asm_offset
+
+---
+ loader/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
+index ed78054a1..0af792501 100644
+--- a/loader/CMakeLists.txt
++++ b/loader/CMakeLists.txt
+@@ -246,7 +246,7 @@
+         add_executable(asm_offset asm_offset.c)
+         target_link_libraries(asm_offset Vulkan::Headers)
+         target_compile_definitions(asm_offset PRIVATE _GNU_SOURCE)
+-        add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND asm_offset GAS)
++        add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND ./asm_offset GAS)
+         add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm)
+     else()
+         if(USE_GAS)
+
diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk
new file mode 100644
index 0000000000..dfe6cdfaf3
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-tools/package.mk
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2018-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="vulkan-tools"
+PKG_VERSION="1.2.201"
+PKG_SHA256="a259667fba1260352a872e70f325fe0a9a04f1caa5ef353e379acf04b1d2a15a"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools"
+PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain vulkan-loader glslang:host"
+PKG_LONGDESC="This project provides Khronos official Vulkan Tools and Utilities."
+
+configure_package() {
+  # Displayserver Support
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    PKG_DEPENDS_TARGET+=" libxcb libX11"
+  elif [ "${DISPLAYSERVER}" = "weston" ]; then
+    PKG_DEPENDS_TARGET+=" wayland"
+  fi
+}
+
+pre_configure_target() {
+  PKG_CMAKE_OPTS_TARGET="-DBUILD_VULKANINFO=ON \
+                         -DBUILD_ICD=OFF \
+                         -DINSTALL_ICD=OFF \
+                         -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
+                         -Wno-dev"
+
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
+                             -DBUILD_WSI_XCB_SUPPORT=ON \
+                             -DBUILD_WSI_XLIB_SUPPORT=ON \
+                             -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
+                             -DCUBE_WSI_SELECTION=XCB"
+  elif [ "${DISPLAYSERVER}" = "weston" ]; then
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
+                             -DBUILD_WSI_XCB_SUPPORT=OFF \
+                             -DBUILD_WSI_XLIB_SUPPORT=OFF \
+                             -DBUILD_WSI_WAYLAND_SUPPORT=ON
+                             -DCUBE_WSI_SELECTION=WAYLAND"
+  else
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
+                             -DBUILD_WSI_XCB_SUPPORT=OFF \
+                             -DBUILD_WSI_XLIB_SUPPORT=OFF \
+                             -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
+                             -DCUBE_WSI_SELECTION=DISPLAY"
+  fi
+}
+
+pre_make_target() {
+  # Fix cross compiling
+  find ${PKG_BUILD} -name flags.make -exec sed -i  "s:isystem :I:g" \{} \;
+  find ${PKG_BUILD} -name build.ninja -exec sed -i "s:isystem :I:g" \{} \;
+}
diff --git a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch
new file mode 100644
index 0000000000..5bef68f8b2
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch
@@ -0,0 +1,26 @@
+From c9c7423f2d0ecfc7ab354d2a3d9ea9c2e4998416 Mon Sep 17 00:00:00 2001
+From: SupervisedThinking <supervisedthinking@gmail.com>
+Date: Thu, 18 Nov 2021 15:02:55 +0100
+Subject: [PATCH] CMakeLists: add CMake options for cube & vulkaninfo
+
+---
+ CMakeLists.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 422b7d2cc..d123c9dc5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ option(BUILD_CUBE "Build cube" ON)
+ option(BUILD_VULKANINFO "Build vulkaninfo" ON)
+ option(BUILD_ICD "Build icd" ON)
++option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
++option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
++option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
++option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF)
++set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for vkcube (XCB, XLIB, WAYLAND, DIRECTFB, DISPLAY)")
++
+ # Installing the Mock ICD to system directories is probably not desired since this ICD is not a very complete implementation.
+ # Require the user to ask that it be installed if they really want it.
+ option(INSTALL_ICD "Install icd" OFF)
diff --git a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.02-fix-find-pkg-wayland-protocols.patch b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.02-fix-find-pkg-wayland-protocols.patch
new file mode 100644
index 0000000000..7e6088a645
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.02-fix-find-pkg-wayland-protocols.patch
@@ -0,0 +1,25 @@
+From 3f2debf2710f84f42b999da2b7eb1f168205695f Mon Sep 17 00:00:00 2001
+From: SupervisedThinking <supervisedthinking@gmail.com>
+Date: Thu, 18 Nov 2021 13:28:38 +0100
+Subject: [PATCH] cmake/FindWaylandProtocols: fix wayland protocol path
+ generation for cross compile
+
+---
+ cmake/FindWaylandProtocols.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindWaylandProtocols.cmake b/cmake/FindWaylandProtocols.cmake
+index 17859ed7c..6941f6024 100644
+--- a/cmake/FindWaylandProtocols.cmake
++++ b/cmake/FindWaylandProtocols.cmake
+@@ -6,8 +6,8 @@
+ 
+ if(NOT WIN32)
+     find_package(PkgConfig)
+-    pkg_check_modules(PKG_WAYLAND_PROTOCOLS QUIET wayland-protocols)
+-    set(WAYLAND_PROTOCOLS_PATH ${PKG_WAYLAND_PROTOCOLS_PREFIX}/share/wayland-protocols)
++    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols
++       OUTPUT_VARIABLE WAYLAND_PROTOCOLS_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+     find_package_handle_standard_args(WAYLAND DEFAULT_MSG WAYLAND_PROTOCOLS_PATH)
+     mark_as_advanced(WAYLAND_PROTOCOLS_PATH)
+ endif()
diff --git a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.03-fix-cube-cross-compile.patch b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.03-fix-cube-cross-compile.patch
new file mode 100644
index 0000000000..02b7f80dc7
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.03-fix-cube-cross-compile.patch
@@ -0,0 +1,45 @@
+From b5ccef606aa9cb8bc96acfeba3b586da0617e80a Mon Sep 17 00:00:00 2001
+From: SupervisedThinking <supervisedthinking@gmail.com>
+Date: Fri, 19 Nov 2021 19:46:26 +0100
+Subject: [PATCH] cube: allow cross compile
+
+---
+ cube/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
+index d59eb4366..c0c9ddad6 100644
+--- a/cube/CMakeLists.txt
++++ b/cube/CMakeLists.txt
+@@ -228,7 +228,6 @@ include_directories(${CUBE_INCLUDE_DIRS})
+ if(APPLE)
+     include(macOS/cube/cube.cmake)
+ elseif(NOT WIN32)
+-    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
+         add_executable(vkcube
+                        cube.c
+                        ${PROJECT_SOURCE_DIR}/cube/cube.vert
+@@ -242,7 +241,6 @@ elseif(NOT WIN32)
+         if (NEED_RT)
+             target_link_libraries(vkcube rt)
+         endif()
+-    endif()
+ else()
+     if(CMAKE_CL_64)
+         set(LIB_DIR "Win64")
+@@ -279,7 +277,6 @@ endif()
+ if(APPLE)
+     include(macOS/cubepp/cubepp.cmake)
+ elseif(NOT WIN32)
+-    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
+         add_executable(vkcubepp
+                        cube.cpp
+                        ${PROJECT_SOURCE_DIR}/cube/cube.vert
+@@ -288,7 +285,6 @@ elseif(NOT WIN32)
+                        cube.frag.inc
+                        ${OPTIONAL_WAYLAND_DATA_FILES})
+         target_link_libraries(vkcubepp Vulkan::Vulkan)
+-    endif()
+ else()
+     if(CMAKE_CL_64)
+         set(LIB_DIR "Win64")
diff --git a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
new file mode 100644
index 0000000000..254f287535
--- /dev/null
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
@@ -0,0 +1,67 @@
+From a1894dc9f650ab94fb7e348e1b06ee75a1e9728b Mon Sep 17 00:00:00 2001
+From: SupervisedThinking <supervisedthinking@gmail.com>
+Date: Sat, 20 Nov 2021 18:39:04 +0100
+Subject: [PATCH] CMakeLists: updated glslangValidator logik
+
+---
+ cube/CMakeLists.txt | 43 +++++++++++++++++++++++++++----------------
+ 1 file changed, 27 insertions(+), 16 deletions(-)
+
+diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
+index d59eb4366..a684fc4f0 100644
+--- a/cube/CMakeLists.txt
++++ b/cube/CMakeLists.txt
+@@ -26,26 +26,37 @@ endif()
+ if(GLSLANG_INSTALL_DIR)
+     message(STATUS "Using GLSLANG_INSTALL_DIR to look for glslangValidator")
+     find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_INSTALL_DIR}/bin")
++
+ else()
+     set(GLSLANG_VALIDATOR_NAME "glslangValidator")
+-    message(STATUS "Using cmake find_program to look for glslangValidator")
+-    if(WIN32)
+-        execute_process(
+-            COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
+-        set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
+-    elseif(APPLE)
+-        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
+-    elseif(UNIX AND NOT APPLE) # i.e. Linux
+-        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
+-    endif()
+-    if (WIN32)
+-        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
+-    elseif(APPLE)
+-        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
++    message(CHECK_START "Looking for glslangValidator")
++    find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
++    if(GLSLANG_VALIDATOR)
++        message(CHECK_PASS ${GLSLANG_VALIDATOR})
+     else()
+-        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
++        if(WIN32)
++            execute_process(
++                COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
++            set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
++        elseif(APPLE)
++            execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
++        elseif(UNIX AND NOT APPLE) # i.e. Linux
++            execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
++        endif()
++        if (WIN32)
++            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
++        elseif(APPLE)
++            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
++        else()
++            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
++        endif()
++        find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
++        if(GLSLANG_VALIDATOR)
++            message(CHECK_PASS ${GLSLANG_VALIDATOR})
++        else()
++            message(FATAL_ERROR "no glslangValidator binary found")
++        endif()
+     endif()
+-    find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
+ endif()
+ 
+ if(UNIX AND NOT APPLE) # i.e. Linux
diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk
index e1ba8b180b..6fd8e76edb 100644
--- a/packages/x11/driver/xf86-video-intel/package.mk
+++ b/packages/x11/driver/xf86-video-intel/package.mk
@@ -32,9 +32,14 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \
                            --disable-tear-free \
                            --disable-create2 \
                            --disable-async-swap \
-                           --with-default-dri=2 \
                            --with-xorg-module-dir=${XORG_PATH_MODULES}"
 
+if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+  PKG_CONFIGURE_OPTS_TARGET+=" --with-default-dri=3"
+else
+  PKG_CONFIGURE_OPTS_TARGET+=" --with-default-dri=2"
+fi
+
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/share/polkit-1
 }
diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk
index 3ef7895778..204bf84749 100644
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@@ -18,6 +18,10 @@ PKG_TOOLCHAIN="manual"
 
 PKG_IS_KERNEL_PKG="yes"
 
+if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" ${VULKAN} vulkan-tools"
+fi
+
 unpack() {
   [ -d ${PKG_BUILD} ] && rm -rf ${PKG_BUILD}
 
@@ -71,4 +75,14 @@ makeinstall_target() {
     cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1
     ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so
     ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1
+
+  # Install Vulkan ICD & SPIR-V lib
+  if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+    mkdir -p ${INSTALL}/usr/lib
+      cp -P libnvidia-glvkspirv.so.${PKG_VERSION} ${INSTALL}/usr/lib 
+    mkdir -p ${INSTALL}/usr/share/vulkan/icd.d
+      cp -P nvidia_icd.json ${INSTALL}/usr/share/vulkan/icd.d
+    mkdir -p ${INSTALL}/usr/share/vulkan/implicit_layer.d
+      cp -P nvidia_layers.json ${INSTALL}/usr/share/vulkan/icd.d
+  fi
 }
diff --git a/packages/x11/lib/libxcb/package.mk b/packages/x11/lib/libxcb/package.mk
index a62dbe7976..7313633c30 100644
--- a/packages/x11/lib/libxcb/package.mk
+++ b/packages/x11/lib/libxcb/package.mk
@@ -12,9 +12,7 @@ PKG_DEPENDS_TARGET="toolchain util-macros Python3:host xcb-proto libpthread-stub
 PKG_LONGDESC="X C-language Bindings library."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared \
-                           --disable-screensaver \
+PKG_CONFIGURE_OPTS_TARGET="--disable-screensaver \
                            --disable-xprint \
                            --disable-selinux \
                            --disable-xvmc"
diff --git a/projects/ARM/options b/projects/ARM/options
index 7001c62918..63c03f9627 100644
--- a/projects/ARM/options
+++ b/projects/ARM/options
@@ -141,6 +141,9 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # Displayserver to use (wl / no)
     DISPLAYSERVER="no"
 
diff --git a/projects/Allwinner/options b/projects/Allwinner/options
index 9d988e435a..50b9766499 100644
--- a/projects/Allwinner/options
+++ b/projects/Allwinner/options
@@ -37,6 +37,9 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # Displayserver to use (wl / no)
     DISPLAYSERVER="no"
 
diff --git a/projects/Amlogic/options b/projects/Amlogic/options
index f77a2ab6d8..9bbc07058a 100644
--- a/projects/Amlogic/options
+++ b/projects/Amlogic/options
@@ -46,6 +46,9 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # Displayserver to use (wl / no)
     DISPLAYSERVER="no"
 
diff --git a/projects/Generic/devices/Generic/options b/projects/Generic/devices/Generic/options
index 94475cd756..f8843b03a7 100644
--- a/projects/Generic/devices/Generic/options
+++ b/projects/Generic/devices/Generic/options
@@ -4,6 +4,9 @@
 # OpenGL-ES implementation to use (mesa / no)
   OPENGLES="mesa"
 
+# Vulkan implementation to use (vulkan-loader / no)
+  VULKAN="no"
+
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="no"
 
diff --git a/projects/Generic/devices/wayland/options b/projects/Generic/devices/wayland/options
index 948674a923..ab3cf235bb 100644
--- a/projects/Generic/devices/wayland/options
+++ b/projects/Generic/devices/wayland/options
@@ -4,6 +4,9 @@
 # OpenGL-ES implementation to use (mesa / no)
   OPENGLES="mesa"
 
+# Vulkan implementation to use (vulkan-loader / no)
+  VULKAN="no"
+
 # Displayserver to use (wl / x11 / no)
   DISPLAYSERVER="wl"
 
diff --git a/projects/Generic/devices/x11/options b/projects/Generic/devices/x11/options
index a5ff6d8ffb..6b1c2aeded 100644
--- a/projects/Generic/devices/x11/options
+++ b/projects/Generic/devices/x11/options
@@ -4,6 +4,9 @@
 # OpenGL-ES implementation to use (mesa / no)
   OPENGLES="no"
 
+# Vulkan implementation to use (vulkan-loader / no)
+  VULKAN="no"
+
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="x11"
 
diff --git a/projects/NXP/options b/projects/NXP/options
index 300c16efec..85b303489b 100644
--- a/projects/NXP/options
+++ b/projects/NXP/options
@@ -35,6 +35,9 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson6)
     OPENGLES="mesa"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # include uvesafb support (yes / no)
     UVESAFB_SUPPORT="no"
 
diff --git a/projects/Qualcomm/devices/Dragonboard/options b/projects/Qualcomm/devices/Dragonboard/options
index a43c08fb62..64af254add 100644
--- a/projects/Qualcomm/devices/Dragonboard/options
+++ b/projects/Qualcomm/devices/Dragonboard/options
@@ -63,6 +63,9 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson6)
     OPENGLES="mesa"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # include uvesafb support (yes / no)
     UVESAFB_SUPPORT="no"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index b4e8e7cb72..f2a10dc4ed 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -75,6 +75,9 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / mesa)
     OPENGLES="mesa"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # Displayserver to use (wl / no)
     DISPLAYSERVER="no"
 
diff --git a/projects/Rockchip/options b/projects/Rockchip/options
index 1c20771c9c..92369011d7 100644
--- a/projects/Rockchip/options
+++ b/projects/Rockchip/options
@@ -44,6 +44,9 @@
   # OpenGL-ES implementation to use (no / libmali / mesa)
     OPENGLES="${OPENGLES:-mesa}"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # Displayserver to use (wl / no)
     DISPLAYSERVER="no"
 
diff --git a/projects/Samsung/options b/projects/Samsung/options
index 111b6472b9..e2043278b2 100644
--- a/projects/Samsung/options
+++ b/projects/Samsung/options
@@ -48,6 +48,9 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
+  # Vulkan implementation to use (vulkan-loader / no)
+    VULKAN="no"
+
   # Displayserver to use (wl / no)
     DISPLAYSERVER="no"