* [ptxdist] [PATCH 2/5] spirv-tools: version bump 2020.3 -> 2020.4
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
@ 2020-08-04 14:56 ` Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-04 14:56 ` [ptxdist] [PATCH 3/5] vulkan-loader: version bump 1.2.141.0 -> 1.2.148.0 Philipp Zabel
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philipp Zabel @ 2020-08-04 14:56 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/spirv-tools.make | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
index 20367a383106..8b5f5957ee8c 100644
--- a/rules/spirv-tools.make
+++ b/rules/spirv-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
#
# Paths and names
#
-SPIRV_TOOLS_VERSION := 2020.3
-SPIRV_TOOLS_MD5 := 1b7d45e6a060d3a2e3dad73531cb0768
+SPIRV_TOOLS_VERSION := 2020.4
+SPIRV_TOOLS_MD5 := ee90575b73c376a800c3dd4f5ed94e59
SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION)
SPIRV_TOOLS_SUFFIX := tar.gz
SPIRV_TOOLS_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
@@ -24,8 +24,8 @@ SPIRV_TOOLS_DIR := $(BUILDDIR)/$(SPIRV_TOOLS)
SPIRV_TOOLS_LICENSE := Apache-2.0
SPIRV_TOOLS_LICENSE_FILES := file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
-SPIRV_HEADERS_VERSION := 2020-05-21-gac638f181542
-SPIRV_HEADERS_MD5 := 4dde857e9ecfe44025478876286f0915
+SPIRV_HEADERS_VERSION := 2020-07-21-g979924c8bc83
+SPIRV_HEADERS_MD5 := d34e33839fa3fbcbe377c3835fb5c1a0
SPIRV_HEADERS_SUFFIX := tar.gz
SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
SPIRV_HEADERS_SOURCE := $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] spirv-tools: version bump 2020.3 -> 2020.4
2020-08-04 14:56 ` [ptxdist] [PATCH 2/5] spirv-tools: version bump 2020.3 -> 2020.4 Philipp Zabel
@ 2020-08-17 6:18 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2020-08-17 6:18 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 4f53e73c0ce1c805fc6fd67f5f734fe149760ac5.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:18 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200804145632.29278-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
> index 20367a383106..8b5f5957ee8c 100644
> --- a/rules/spirv-tools.make
> +++ b/rules/spirv-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
> #
> # Paths and names
> #
> -SPIRV_TOOLS_VERSION := 2020.3
> -SPIRV_TOOLS_MD5 := 1b7d45e6a060d3a2e3dad73531cb0768
> +SPIRV_TOOLS_VERSION := 2020.4
> +SPIRV_TOOLS_MD5 := ee90575b73c376a800c3dd4f5ed94e59
> SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION)
> SPIRV_TOOLS_SUFFIX := tar.gz
> SPIRV_TOOLS_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
> @@ -24,8 +24,8 @@ SPIRV_TOOLS_DIR := $(BUILDDIR)/$(SPIRV_TOOLS)
> SPIRV_TOOLS_LICENSE := Apache-2.0
> SPIRV_TOOLS_LICENSE_FILES := file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
>
> -SPIRV_HEADERS_VERSION := 2020-05-21-gac638f181542
> -SPIRV_HEADERS_MD5 := 4dde857e9ecfe44025478876286f0915
> +SPIRV_HEADERS_VERSION := 2020-07-21-g979924c8bc83
> +SPIRV_HEADERS_MD5 := d34e33839fa3fbcbe377c3835fb5c1a0
> SPIRV_HEADERS_SUFFIX := tar.gz
> SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
> SPIRV_HEADERS_SOURCE := $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 3/5] vulkan-loader: version bump 1.2.141.0 -> 1.2.148.0
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
2020-08-04 14:56 ` [ptxdist] [PATCH 2/5] spirv-tools: version bump 2020.3 -> 2020.4 Philipp Zabel
@ 2020-08-04 14:56 ` Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-04 14:56 ` [ptxdist] [PATCH 4/5] vulkan-tools: " Philipp Zabel
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philipp Zabel @ 2020-08-04 14:56 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/vulkan-loader.make | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
index 4a0b83e3f348..e786eb775437 100644
--- a/rules/vulkan-loader.make
+++ b/rules/vulkan-loader.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader
#
# Paths and names
#
-VULKAN_LOADER_VERSION := 1.2.141.0
-VULKAN_LOADER_MD5 := 87e41363a65bba24cd1231557b4bca8c
+VULKAN_LOADER_VERSION := 1.2.148.0
+VULKAN_LOADER_MD5 := 669e95510505fabe5513ed83d695a29a
VULKAN_LOADER := vulkan-loader-$(VULKAN_LOADER_VERSION)
VULKAN_LOADER_SUFFIX := tar.gz
VULKAN_LOADER_URL := https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
@@ -24,8 +24,8 @@ VULKAN_LOADER_DIR := $(BUILDDIR)/$(VULKAN_LOADER)
VULKAN_LOADER_LICENSE := Apache-2.0
VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac
-VULKAN_HEADERS_VERSION := 1.2.141.0
-VULKAN_HEADERS_MD5 := 4067d1268504c4e2bb47135aea55ae17
+VULKAN_HEADERS_VERSION := 1.2.148.0
+VULKAN_HEADERS_MD5 := df07cce41e6e69da350164fce26034fa
VULKAN_HEADERS_SUFFIX := tar.gz
VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
VULKAN_HEADERS_SOURCE := $(SRCDIR)/vulkan-headers-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
@@ -59,6 +59,7 @@ VULKAN_LOADER_CONF_OPT := \
-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \
-DBUILD_WSI_XLIB_SUPPORT=OFF \
-DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_WAYLAND) \
+ -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
-DBUILD_LOADER=ON \
-DBUILD_TESTS=OFF \
-DVulkanHeaders_INCLUDE_DIR=$(VULKAN_HEADERS_DIR)/include \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.2.141.0 -> 1.2.148.0
2020-08-04 14:56 ` [ptxdist] [PATCH 3/5] vulkan-loader: version bump 1.2.141.0 -> 1.2.148.0 Philipp Zabel
@ 2020-08-17 6:18 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2020-08-17 6:18 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as a4075c34479ce86a6038f9ca2beb9743ddcd83c5.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:18 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200804145632.29278-3-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
> index 4a0b83e3f348..e786eb775437 100644
> --- a/rules/vulkan-loader.make
> +++ b/rules/vulkan-loader.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader
> #
> # Paths and names
> #
> -VULKAN_LOADER_VERSION := 1.2.141.0
> -VULKAN_LOADER_MD5 := 87e41363a65bba24cd1231557b4bca8c
> +VULKAN_LOADER_VERSION := 1.2.148.0
> +VULKAN_LOADER_MD5 := 669e95510505fabe5513ed83d695a29a
> VULKAN_LOADER := vulkan-loader-$(VULKAN_LOADER_VERSION)
> VULKAN_LOADER_SUFFIX := tar.gz
> VULKAN_LOADER_URL := https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
> @@ -24,8 +24,8 @@ VULKAN_LOADER_DIR := $(BUILDDIR)/$(VULKAN_LOADER)
> VULKAN_LOADER_LICENSE := Apache-2.0
> VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac
>
> -VULKAN_HEADERS_VERSION := 1.2.141.0
> -VULKAN_HEADERS_MD5 := 4067d1268504c4e2bb47135aea55ae17
> +VULKAN_HEADERS_VERSION := 1.2.148.0
> +VULKAN_HEADERS_MD5 := df07cce41e6e69da350164fce26034fa
> VULKAN_HEADERS_SUFFIX := tar.gz
> VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
> VULKAN_HEADERS_SOURCE := $(SRCDIR)/vulkan-headers-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
> @@ -59,6 +59,7 @@ VULKAN_LOADER_CONF_OPT := \
> -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \
> -DBUILD_WSI_XLIB_SUPPORT=OFF \
> -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_WAYLAND) \
> + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
> -DBUILD_LOADER=ON \
> -DBUILD_TESTS=OFF \
> -DVulkanHeaders_INCLUDE_DIR=$(VULKAN_HEADERS_DIR)/include \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 4/5] vulkan-tools: version bump 1.2.141.0 -> 1.2.148.0
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
2020-08-04 14:56 ` [ptxdist] [PATCH 2/5] spirv-tools: version bump 2020.3 -> 2020.4 Philipp Zabel
2020-08-04 14:56 ` [ptxdist] [PATCH 3/5] vulkan-loader: version bump 1.2.141.0 -> 1.2.148.0 Philipp Zabel
@ 2020-08-04 14:56 ` Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-04 14:56 ` [ptxdist] [PATCH 5/5] vulkan-validationlayers: " Philipp Zabel
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philipp Zabel @ 2020-08-04 14:56 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/vulkan-tools.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
index 0d04775e7aa4..ddc7aec6bbb4 100644
--- a/rules/vulkan-tools.make
+++ b/rules/vulkan-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools
#
# Paths and names
#
-VULKAN_TOOLS_VERSION := 1.2.141.0
-VULKAN_TOOLS_MD5 := d74d6536dfa19a972149a5e41830249c
+VULKAN_TOOLS_VERSION := 1.2.148.0
+VULKAN_TOOLS_MD5 := 608d84950477171c06c6f89ab9455c5f
VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION)
VULKAN_TOOLS_SUFFIX := tar.gz
VULKAN_TOOLS_URL := https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.2.141.0 -> 1.2.148.0
2020-08-04 14:56 ` [ptxdist] [PATCH 4/5] vulkan-tools: " Philipp Zabel
@ 2020-08-17 6:18 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2020-08-17 6:18 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 7f7f0b241847d290e0c067bab0ceb3e1007483d2.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:19 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200804145632.29278-4-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
> index 0d04775e7aa4..ddc7aec6bbb4 100644
> --- a/rules/vulkan-tools.make
> +++ b/rules/vulkan-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools
> #
> # Paths and names
> #
> -VULKAN_TOOLS_VERSION := 1.2.141.0
> -VULKAN_TOOLS_MD5 := d74d6536dfa19a972149a5e41830249c
> +VULKAN_TOOLS_VERSION := 1.2.148.0
> +VULKAN_TOOLS_MD5 := 608d84950477171c06c6f89ab9455c5f
> VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION)
> VULKAN_TOOLS_SUFFIX := tar.gz
> VULKAN_TOOLS_URL := https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 5/5] vulkan-validationlayers: version bump 1.2.141.0 -> 1.2.148.0
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
` (2 preceding siblings ...)
2020-08-04 14:56 ` [ptxdist] [PATCH 4/5] vulkan-tools: " Philipp Zabel
@ 2020-08-04 14:56 ` Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-05 9:45 ` [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Roland Hieber
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philipp Zabel @ 2020-08-04 14:56 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/vulkan-validationlayers.make | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
index 2662e6d30d4d..3ee3f55152e8 100644
--- a/rules/vulkan-validationlayers.make
+++ b/rules/vulkan-validationlayers.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
#
# Paths and names
#
-VULKAN_VALIDATIONLAYERS_VERSION := 1.2.141.0
-VULKAN_VALIDATIONLAYERS_MD5 := 5baf1ca0e462c72140748bf82cd31eb4
+VULKAN_VALIDATIONLAYERS_VERSION := 1.2.148.0
+VULKAN_VALIDATIONLAYERS_MD5 := 32bd6f518b369bdc0f29dedc12f90aae
VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz
VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
@@ -39,7 +39,10 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \
-DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \
-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \
-DBUILD_WSI_XLIB_SUPPORT=OFF \
- -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin
+ -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin \
+ -DSPIRV_HEADERS_INSTALL_DIR=$(PTXDIST_SYSROOT_TARGET)/usr \
+ -DSPIRV_TOOLS_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin \
+ -DVulkanRegistry_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/share/vulkan
# ----------------------------------------------------------------------------
# Target-Install
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.2.141.0 -> 1.2.148.0
2020-08-04 14:56 ` [ptxdist] [PATCH 5/5] vulkan-validationlayers: " Philipp Zabel
@ 2020-08-17 6:18 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2020-08-17 6:18 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as d5c17b7e63bda3628533962122409805a2095b7c.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:19 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200804145632.29278-5-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
> index 2662e6d30d4d..3ee3f55152e8 100644
> --- a/rules/vulkan-validationlayers.make
> +++ b/rules/vulkan-validationlayers.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
> #
> # Paths and names
> #
> -VULKAN_VALIDATIONLAYERS_VERSION := 1.2.141.0
> -VULKAN_VALIDATIONLAYERS_MD5 := 5baf1ca0e462c72140748bf82cd31eb4
> +VULKAN_VALIDATIONLAYERS_VERSION := 1.2.148.0
> +VULKAN_VALIDATIONLAYERS_MD5 := 32bd6f518b369bdc0f29dedc12f90aae
> VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
> VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz
> VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
> @@ -39,7 +39,10 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \
> -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \
> -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \
> -DBUILD_WSI_XLIB_SUPPORT=OFF \
> - -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin
> + -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin \
> + -DSPIRV_HEADERS_INSTALL_DIR=$(PTXDIST_SYSROOT_TARGET)/usr \
> + -DSPIRV_TOOLS_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin \
> + -DVulkanRegistry_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/share/vulkan
>
> # ----------------------------------------------------------------------------
> # Target-Install
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
` (3 preceding siblings ...)
2020-08-04 14:56 ` [ptxdist] [PATCH 5/5] vulkan-validationlayers: " Philipp Zabel
@ 2020-08-05 9:45 ` Roland Hieber
2020-08-07 12:22 ` Michael Olbrich
2020-08-07 17:26 ` Michael Olbrich
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2020-08-05 9:45 UTC (permalink / raw)
To: ptxdist
On Tue, Aug 04, 2020 at 04:56:28PM +0200, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> rules/glslang.in | 1 +
> rules/glslang.make | 8 ++++----
> rules/host-glslang.in | 1 +
> 3 files changed, 6 insertions(+), 4 deletions(-)
Reviewed-by: Roland Hieber <rhi@pengutronix.de>
>
> diff --git a/rules/glslang.in b/rules/glslang.in
> index c2a660243d31..fba48e79e857 100644
> --- a/rules/glslang.in
> +++ b/rules/glslang.in
> @@ -4,6 +4,7 @@ menuconfig GLSLANG
> tristate
> prompt "glslang"
> select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
> help
> Khronos-reference SPIR-V generator
>
> diff --git a/rules/glslang.make b/rules/glslang.make
> index ada329737ce1..904517d1a8ce 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> #
> # Paths and names
> #
> -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b
> -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48
> +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331
> +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7
> GLSLANG := glslang-$(GLSLANG_VERSION)
> GLSLANG_SUFFIX := tar.gz
> GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
> GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
> -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
> -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
> +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/host-glslang.in b/rules/host-glslang.in
> index 69f255572c2b..8ef31f52937a 100644
> --- a/rules/host-glslang.in
> +++ b/rules/host-glslang.in
> @@ -4,3 +4,4 @@ config HOST_GLSLANG
> tristate
> default y if ALLYES
> select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
2020-08-05 9:45 ` [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Roland Hieber
@ 2020-08-07 12:22 ` Michael Olbrich
2020-08-08 14:06 ` Roland Hieber
0 siblings, 1 reply; 14+ messages in thread
From: Michael Olbrich @ 2020-08-07 12:22 UTC (permalink / raw)
To: ptxdist
On Wed, Aug 05, 2020 at 11:45:22AM +0200, Roland Hieber wrote:
> On Tue, Aug 04, 2020 at 04:56:28PM +0200, Philipp Zabel wrote:
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> > rules/glslang.in | 1 +
> > rules/glslang.make | 8 ++++----
> > rules/host-glslang.in | 1 +
> > 3 files changed, 6 insertions(+), 4 deletions(-)
>
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
For this patch or the whole series?
Michael
> >
> > diff --git a/rules/glslang.in b/rules/glslang.in
> > index c2a660243d31..fba48e79e857 100644
> > --- a/rules/glslang.in
> > +++ b/rules/glslang.in
> > @@ -4,6 +4,7 @@ menuconfig GLSLANG
> > tristate
> > prompt "glslang"
> > select HOST_CMAKE
> > + select HOST_SYSTEM_PYTHON3
> > help
> > Khronos-reference SPIR-V generator
> >
> > diff --git a/rules/glslang.make b/rules/glslang.make
> > index ada329737ce1..904517d1a8ce 100644
> > --- a/rules/glslang.make
> > +++ b/rules/glslang.make
> > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> > #
> > # Paths and names
> > #
> > -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b
> > -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48
> > +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331
> > +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7
> > GLSLANG := glslang-$(GLSLANG_VERSION)
> > GLSLANG_SUFFIX := tar.gz
> > GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> > GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
> > GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
> > -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
> > -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
> > +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> > +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
> >
> > # ----------------------------------------------------------------------------
> > # Prepare
> > diff --git a/rules/host-glslang.in b/rules/host-glslang.in
> > index 69f255572c2b..8ef31f52937a 100644
> > --- a/rules/host-glslang.in
> > +++ b/rules/host-glslang.in
> > @@ -4,3 +4,4 @@ config HOST_GLSLANG
> > tristate
> > default y if ALLYES
> > select HOST_CMAKE
> > + select HOST_SYSTEM_PYTHON3
> > --
> > 2.20.1
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> >
>
> --
> Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
> Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
2020-08-07 12:22 ` Michael Olbrich
@ 2020-08-08 14:06 ` Roland Hieber
0 siblings, 0 replies; 14+ messages in thread
From: Roland Hieber @ 2020-08-08 14:06 UTC (permalink / raw)
To: ptxdist
On Fri, Aug 07, 2020 at 02:22:46PM +0200, Michael Olbrich wrote:
> On Wed, Aug 05, 2020 at 11:45:22AM +0200, Roland Hieber wrote:
> > On Tue, Aug 04, 2020 at 04:56:28PM +0200, Philipp Zabel wrote:
> > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > > ---
> > > rules/glslang.in | 1 +
> > > rules/glslang.make | 8 ++++----
> > > rules/host-glslang.in | 1 +
> > > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > Reviewed-by: Roland Hieber <rhi@pengutronix.de>
>
> For this patch or the whole series?
Only this patch, because it included license changes.
- Roland
>
> Michael
>
> > >
> > > diff --git a/rules/glslang.in b/rules/glslang.in
> > > index c2a660243d31..fba48e79e857 100644
> > > --- a/rules/glslang.in
> > > +++ b/rules/glslang.in
> > > @@ -4,6 +4,7 @@ menuconfig GLSLANG
> > > tristate
> > > prompt "glslang"
> > > select HOST_CMAKE
> > > + select HOST_SYSTEM_PYTHON3
> > > help
> > > Khronos-reference SPIR-V generator
> > >
> > > diff --git a/rules/glslang.make b/rules/glslang.make
> > > index ada329737ce1..904517d1a8ce 100644
> > > --- a/rules/glslang.make
> > > +++ b/rules/glslang.make
> > > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> > > #
> > > # Paths and names
> > > #
> > > -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b
> > > -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48
> > > +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331
> > > +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7
> > > GLSLANG := glslang-$(GLSLANG_VERSION)
> > > GLSLANG_SUFFIX := tar.gz
> > > GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> > > GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
> > > GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
> > > -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
> > > -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
> > > +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> > > +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
> > >
> > > # ----------------------------------------------------------------------------
> > > # Prepare
> > > diff --git a/rules/host-glslang.in b/rules/host-glslang.in
> > > index 69f255572c2b..8ef31f52937a 100644
> > > --- a/rules/host-glslang.in
> > > +++ b/rules/host-glslang.in
> > > @@ -4,3 +4,4 @@ config HOST_GLSLANG
> > > tristate
> > > default y if ALLYES
> > > select HOST_CMAKE
> > > + select HOST_SYSTEM_PYTHON3
> > > --
> > > 2.20.1
> > >
> > >
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> > >
> >
> > --
> > Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
> > Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
` (4 preceding siblings ...)
2020-08-05 9:45 ` [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Roland Hieber
@ 2020-08-07 17:26 ` Michael Olbrich
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
6 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2020-08-07 17:26 UTC (permalink / raw)
To: ptxdist
On Tue, Aug 04, 2020 at 04:56:28PM +0200, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> rules/glslang.in | 1 +
> rules/glslang.make | 8 ++++----
> rules/host-glslang.in | 1 +
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/rules/glslang.in b/rules/glslang.in
> index c2a660243d31..fba48e79e857 100644
> --- a/rules/glslang.in
> +++ b/rules/glslang.in
> @@ -4,6 +4,7 @@ menuconfig GLSLANG
> tristate
> prompt "glslang"
> select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
> help
> Khronos-reference SPIR-V generator
>
> diff --git a/rules/glslang.make b/rules/glslang.make
> index ada329737ce1..904517d1a8ce 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> #
> # Paths and names
> #
> -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b
> -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48
> +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331
> +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7
> GLSLANG := glslang-$(GLSLANG_VERSION)
> GLSLANG_SUFFIX := tar.gz
> GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
> GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
> -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
> -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
> +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
You need to update the license data in shaderc as well. Maybe don't
hardcode it but reuse this.
$(subst file://,file://third_party/glslang/,$(GLSLANG_LICENSE_FILES))
Michael
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/host-glslang.in b/rules/host-glslang.in
> index 69f255572c2b..8ef31f52937a 100644
> --- a/rules/host-glslang.in
> +++ b/rules/host-glslang.in
> @@ -4,3 +4,4 @@ config HOST_GLSLANG
> tristate
> default y if ALLYES
> select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
2020-08-04 14:56 [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Philipp Zabel
` (5 preceding siblings ...)
2020-08-07 17:26 ` Michael Olbrich
@ 2020-08-17 6:18 ` Michael Olbrich
6 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2020-08-17 6:18 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 8193a24ad7a7a2ed0e3b0f1d9ca88e9e9d0547b7.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:17 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200804145632.29278-1-p.zabel@pengutronix.de>
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/glslang.in b/rules/glslang.in
> index c2a660243d31..fba48e79e857 100644
> --- a/rules/glslang.in
> +++ b/rules/glslang.in
> @@ -4,6 +4,7 @@ menuconfig GLSLANG
> tristate
> prompt "glslang"
> select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
> help
> Khronos-reference SPIR-V generator
>
> diff --git a/rules/glslang.make b/rules/glslang.make
> index ada329737ce1..904517d1a8ce 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> #
> # Paths and names
> #
> -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b
> -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48
> +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331
> +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7
> GLSLANG := glslang-$(GLSLANG_VERSION)
> GLSLANG_SUFFIX := tar.gz
> GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
> GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
> -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
> -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
> +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/host-glslang.in b/rules/host-glslang.in
> index 69f255572c2b..8ef31f52937a 100644
> --- a/rules/host-glslang.in
> +++ b/rules/host-glslang.in
> @@ -4,3 +4,4 @@ config HOST_GLSLANG
> tristate
> default y if ALLYES
> select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread