Merge pull request #1147 from dmanlfc/vk-tweaks

vulkan option tweaks & wlroots dependencies

Author: dmanlfc

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

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

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

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

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