Merge pull request #160 from jdorigao/vulkan

vulkan: bump to v1.4.304

Author: jdorigao

package/vulkan-headers/vulkan-headers.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e204e0b3c19f622d197df945737f5db913d6621830999b8578d34e80a7c90585  vulkan-headers-v1.3.296.tar.gz
-sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
+sha256  5e1a06b3f27e7581b55d1dea176fd97ee0a2f299406db2f437c1d2f297ceba5b  vulkan-headers-1.4.304.tar.gz
+sha256  ac24e5ea920e4318e4d02c4086ae51f53cfb03feed06c18df1019e7ada1ec7bc  LICENSE.md

package/vulkan-headers/vulkan-headers.mk

@@ -3,11 +3,13 @@
 # vulkan-headers
 #
 ################################################################################
-# reglinux - bump
-VULKAN_HEADERS_VERSION = v1.3.296
-VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,$(VULKAN_HEADERS_VERSION))
-VULKAN_HEADERS_LICENSE = Apache-2.0
-VULKAN_HEADERS_LICENSE_FILES = LICENSE.txt
+
+# Note: changing this version will also affect vulkan-loader and
+# vulkan-tools, so please update those packages as well.
+VULKAN_HEADERS_VERSION = 1.4.304
+VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION))
+VULKAN_HEADERS_LICENSE = Apache-2.0, MIT
+VULKAN_HEADERS_LICENSE_FILES = LICENSE.md
 VULKAN_HEADERS_INSTALL_STAGING = YES
 
 # batocera

package/vulkan-loader/vulkan-loader.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  682d5323cf31308402c888599b375ebf15810f95d6d1a08ad2f525766becf99b  vulkan-loader-v1.3.296.tar.gz
+sha256  368d8281604a3f4dee038bfcc55c44e305031ec67f6e3fdd50cdeb83586c99f9  vulkan-loader-1.4.304.tar.gz
 sha256  43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece  LICENSE.txt

package/vulkan-loader/vulkan-loader.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-VULKAN_LOADER_VERSION = v1.3.296
-VULKAN_LOADER_SITE = $(call github,KhronosGroup,Vulkan-Loader,$(VULKAN_LOADER_VERSION))
+VULKAN_LOADER_VERSION = $(VULKAN_HEADERS_VERSION)
+VULKAN_LOADER_SITE = $(call github,KhronosGroup,Vulkan-Loader,v$(VULKAN_LOADER_VERSION))
 VULKAN_LOADER_LICENSE = Apache-2.0
 VULKAN_LOADER_LICENSE_FILES = LICENSE.txt
 VULKAN_LOADER_INSTALL_STAGING = YES

package/vulkan-tools/vulkan-tools.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  a44b5456f473dae0b6d15c23d3b1eb461bb8ef58867271abd641d99735a54b6c  vulkan-tools-v1.3.296.tar.gz
+sha256  fa17870f531affec06dfd5cab8121cb6e54777f779dab59fccafeb136fe43e19  vulkan-tools-1.4.304.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/vulkan-tools/vulkan-tools.mk

@@ -3,9 +3,9 @@
 # vulkan-tools
 #
 ################################################################################
-# reglinux -  update
-VULKAN_TOOLS_VERSION = v1.3.296
-VULKAN_TOOLS_SITE = $(call github,KhronosGroup,Vulkan-Tools,$(VULKAN_TOOLS_VERSION))
+
+VULKAN_TOOLS_VERSION = $(VULKAN_HEADERS_VERSION)
+VULKAN_TOOLS_SITE = $(call github,KhronosGroup,Vulkan-Tools,v$(VULKAN_TOOLS_VERSION))
 VULKAN_TOOLS_LICENSE = Apache-2.0
 VULKAN_TOOLS_LICENSE_FILES = LICENSE.txt
 
@@ -18,8 +18,7 @@ VULKAN_TOOLS_CONF_OPTS += \
 	-DBUILD_CUBE=OFF \
 	-DBUILD_ICD=OFF \
 	-DBUILD_VULKANINFO=ON \
-	-DINSTALL_ICD=OFF \
-	#-DUPDATE_DEPS=ON # batocera
+	-DINSTALL_ICD=OFF
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 VULKAN_TOOLS_DEPENDENCIES += directfb