From 88abc25d271c8516f060aa6191a10d149573406c Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Mon, 24 Jan 2022 12:03:54 +0100 Subject: [PATCH] vulkan: check for wl instead weston if wayland build - fix up after https://github.com/LibreELEC/LibreELEC.tv/pull/5979 --- packages/graphics/vulkan/vulkan-loader/package.mk | 4 ++-- packages/graphics/vulkan/vulkan-tools/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/vulkan/vulkan-loader/package.mk b/packages/graphics/vulkan/vulkan-loader/package.mk index b04f123950..2ae76f5629 100644 --- a/packages/graphics/vulkan/vulkan-loader/package.mk +++ b/packages/graphics/vulkan/vulkan-loader/package.mk @@ -15,7 +15,7 @@ configure_package() { # Displayserver Support if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" libxcb libX11" - elif [ "${DISPLAYSERVER}" = "weston" ]; then + elif [ "${DISPLAYSERVER}" = "wl" ]; then PKG_DEPENDS_TARGET+=" wayland" fi } @@ -27,7 +27,7 @@ pre_configure_target() { PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF" - elif [ "${DISPLAYSERVER}" = "weston" ]; then + elif [ "${DISPLAYSERVER}" = "wl" ]; then PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=OFF \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=ON" diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk index 4530df5ff1..9d5e124f96 100644 --- a/packages/graphics/vulkan/vulkan-tools/package.mk +++ b/packages/graphics/vulkan/vulkan-tools/package.mk @@ -15,7 +15,7 @@ configure_package() { # Displayserver Support if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" libxcb libX11" - elif [ "${DISPLAYSERVER}" = "weston" ]; then + elif [ "${DISPLAYSERVER}" = "wl" ]; then PKG_DEPENDS_TARGET+=" wayland" fi } @@ -33,7 +33,7 @@ pre_configure_target() { -DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -DCUBE_WSI_SELECTION=XCB" - elif [ "${DISPLAYSERVER}" = "weston" ]; then + elif [ "${DISPLAYSERVER}" = "wl" ]; then PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \ -DBUILD_WSI_XCB_SUPPORT=OFF \ -DBUILD_WSI_XLIB_SUPPORT=OFF \