From eb31132cc0656c7e1db701a4f5793777530a75ff Mon Sep 17 00:00:00 2001 From: Daniel Martin Date: Fri, 5 Jun 2026 18:04:19 +1000 Subject: [PATCH] vulkan option tweaks & wlroots dependencies --- package/libplacebo/libplacebo.mk | 4 ++-- package/mpv/mpv.mk | 4 ++-- package/pcmanfm/Config.in | 2 +- package/sdl2/sdl2.mk | 4 ++-- package/wlroots/wlroots.mk | 4 +++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/libplacebo/libplacebo.mk b/package/libplacebo/libplacebo.mk index 1e645e1b8ec..d854a55f251 100644 --- a/package/libplacebo/libplacebo.mk +++ b/package/libplacebo/libplacebo.mk @@ -15,9 +15,9 @@ LIBPLACEBO_INSTALL_STAGING = YES # batcoera - add the options below... LIBPLACEBO_CONF_OPTS = -Ddemos=false -ifeq ($(BR2_PACKAGE_VULKAN_HEADERS)$(BR2_PACKAGE_VULKAN_LOADER),yy) +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) LIBPLACEBO_CONF_OPTS += -Dvulkan=enabled -LIBPLACEBO_DEPENDENCIES += vulkan-headers vulkan-loader +LIBPLACEBO_DEPENDENCIES += mesa3d vulkan-loader else LIBPLACEBO_CONF_OPTS += -Dvulkan=disabled endif diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 1ba1152c669..9bbed535cd9 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -232,9 +232,9 @@ MPV_CONF_OPTS += -Dcuda-hwaccel=disabled -Dcuda-interop=disabled endif # batocera - add vulkan -ifeq ($(BR2_PACKAGE_VULKAN_HEADERS)$(BR2_PACKAGE_VULKAN_LOADER),yy) +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) MPV_CONF_OPTS += -Dvulkan=enabled -MPV_DEPENDENCIES += vulkan-headers vulkan-loader +MPV_DEPENDENCIES += mesa3d vulkan-loader else MPV_CONF_OPTS += -Dvulkan=disabled endif diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in index a4522d88f45..901707db1ed 100644 --- a/package/pcmanfm/Config.in +++ b/package/pcmanfm/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_PCMANFM depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libfm depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libfm depends on BR2_PACKAGE_XORG7 # libfm - depends on BR2_PACKAGE_HAS_LIBGL # libfm + #depends on BR2_PACKAGE_HAS_LIBGL # libfm # batocera rm double depends select BR2_PACKAGE_LIBFM select BR2_PACKAGE_MENU_CACHE select BR2_PACKAGE_LIBGLIB2 diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 26f85f6fa60..30bb9d0831e 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -221,8 +221,8 @@ SDL2_DEPENDENCIES += libdecor endif # batocera - enable/disable Vulkan support -ifeq ($(BR2_PACKAGE_VULKAN_HEADERS)$(BR2_PACKAGE_VULKAN_LOADER),yy) -SDL2_DEPENDENCIES += vulkan-headers vulkan-loader +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) +SDL2_DEPENDENCIES += mesa3d vulkan-loader SDL2_CONF_OPTS += --enable-video-vulkan else SDL2_CONF_OPTS += --disable-video-vulkan diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 5e4cea468c4..a64edf1e498 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -24,7 +24,9 @@ WLROOTS_DEPENDENCIES = \ seatd \ udev \ wayland \ - wayland-protocols + wayland-protocols \ + host-glslang \ + lcms2 # batocera, add host-glslang & lcms2 WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Dlibliftoff=disabled