[ptxdist] [PATCH 1/4] mesalib: version bump 24.3.3 -> 24.3.4

[ptxdist] [PATCH 1/4] mesalib: version bump 24.3.3 -> 24.3.4

[Philipp Zabel]

https://docs.mesa3d.org/relnotes/24.3.4.html

The license hashes are changed due to reorganization and cleanup:

  cdca99fe8409 ("docs: move license(s) to licenses directory")
  e54b547d4b49 ("docs: Clarify project name and include Mesa3D")
  3eb1489bb1aa ("docs: remove deprecated component list and licenses")

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index fe4bbd6c03ff..3c94fa299a4d 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 24.3.3
-MESALIB_MD5	:= eadaf9717907e5f92ee7924826f73ab6
+MESALIB_VERSION	:= 24.3.4
+MESALIB_MD5	:= c64b7e2b4f1c7782c41bf022edbb365c
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
 MESALIB_URL	:= \
@@ -24,7 +24,8 @@ MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_DIR	:= $(BUILDDIR)/$(MESALIB)
 MESALIB_LICENSE	:= MIT
 MESALIB_LICENSE_FILES := \
-	file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10
+	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
+	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.5

[ptxdist] [PATCH 2/4] mesalib: add BSL-1.0 license for C11 threads.h emulation library

[Philipp Zabel]

The C11 threads.h emulation library is used when building for
platforms other than Android.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 3c94fa299a4d..9fdb3b518b47 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -22,9 +22,10 @@ MESALIB_URL	:= \
 	https://mesa.freedesktop.org/archive/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_DIR	:= $(BUILDDIR)/$(MESALIB)
-MESALIB_LICENSE	:= MIT
+MESALIB_LICENSE	:= MIT AND BSL-1.0
 MESALIB_LICENSE_FILES := \
 	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
+	file://licenses/BSL-1.0;md5=4610c5f00caa47872489c3943d1bacc8 \
 	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d
 
 # ----------------------------------------------------------------------------
-- 
2.39.5

[ptxdist] [PATCH 3/4] mesalib: add SGI-B-2.0 license when GLX is enabled

[Philipp Zabel]

The GLX DRI code in src/glx is SGI-B-2.0 licensed.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.make | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 9fdb3b518b47..cf283ec19104 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -23,10 +23,14 @@ MESALIB_URL	:= \
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_DIR	:= $(BUILDDIR)/$(MESALIB)
 MESALIB_LICENSE	:= MIT AND BSL-1.0
+ifdef PTXCONF_MESALIB_GLX
+MESALIB_LICENSE += AND SGI-B-2.0
+endif
 MESALIB_LICENSE_FILES := \
 	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
 	file://licenses/BSL-1.0;md5=4610c5f00caa47872489c3943d1bacc8 \
-	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d
+	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d \
+	file://licenses/SGI-B-2.0;md5=efe792cf56e83c7aa8470e553faf333f
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.5

[ptxdist] [PATCH 4/4] mesalib: add Apache-2.0 license when Vulkan screenshot layer is enabled

[Philipp Zabel]

The Vulkan screenshot layer is based on the Apache-2.0 licensed
Vulkan layer template.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.make | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index cf283ec19104..25795f94d62e 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -26,8 +26,12 @@ MESALIB_LICENSE	:= MIT AND BSL-1.0
 ifdef PTXCONF_MESALIB_GLX
 MESALIB_LICENSE += AND SGI-B-2.0
 endif
+ifdef PTXCONF_MESALIB_VULKAN_SCREENSHOT
+MESALIB_LICENSE += AND Apache-2.0
+endif
 MESALIB_LICENSE_FILES := \
 	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
+	file://licenses/Apache-2.0;md5=db66a99884d6d2bdbd5f9e71e1bffec6 \
 	file://licenses/BSL-1.0;md5=4610c5f00caa47872489c3943d1bacc8 \
 	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d \
 	file://licenses/SGI-B-2.0;md5=efe792cf56e83c7aa8470e553faf333f
-- 
2.39.5

Re: [ptxdist] [APPLIED] mesalib: version bump 24.3.3 -> 24.3.4

[Michael Olbrich]

Thanks, applied as e83f80768e9823de992907d40897b3b1e9584d38.

Michael

[sent from post-receive hook]

On Mon, 27 Jan 2025 09:35:11 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://docs.mesa3d.org/relnotes/24.3.4.html
> 
> The license hashes are changed due to reorganization and cleanup:
> 
>   cdca99fe8409 ("docs: move license(s) to licenses directory")
>   e54b547d4b49 ("docs: Clarify project name and include Mesa3D")
>   3eb1489bb1aa ("docs: remove deprecated component list and licenses")
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20250123101141.3047977-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index fe4bbd6c03ff..3c94fa299a4d 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION	:= 24.3.3
> -MESALIB_MD5	:= eadaf9717907e5f92ee7924826f73ab6
> +MESALIB_VERSION	:= 24.3.4
> +MESALIB_MD5	:= c64b7e2b4f1c7782c41bf022edbb365c
>  MESALIB		:= mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX	:= tar.xz
>  MESALIB_URL	:= \
> @@ -24,7 +24,8 @@ MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
>  MESALIB_DIR	:= $(BUILDDIR)/$(MESALIB)
>  MESALIB_LICENSE	:= MIT
>  MESALIB_LICENSE_FILES := \
> -	file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10
> +	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
> +	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] mesalib: add BSL-1.0 license for C11 threads.h emulation library

[Michael Olbrich]

Thanks, applied as 2aaf5ac3c2bb76a97f98ba2db6bb4b5146826a74.

Michael

[sent from post-receive hook]

On Mon, 27 Jan 2025 09:35:11 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> The C11 threads.h emulation library is used when building for
> platforms other than Android.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20250123101141.3047977-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 3c94fa299a4d..9fdb3b518b47 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -22,9 +22,10 @@ MESALIB_URL	:= \
>  	https://mesa.freedesktop.org/archive/$(MESALIB).$(MESALIB_SUFFIX)
>  MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
>  MESALIB_DIR	:= $(BUILDDIR)/$(MESALIB)
> -MESALIB_LICENSE	:= MIT
> +MESALIB_LICENSE	:= MIT AND BSL-1.0
>  MESALIB_LICENSE_FILES := \
>  	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
> +	file://licenses/BSL-1.0;md5=4610c5f00caa47872489c3943d1bacc8 \
>  	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d
>  
>  # ----------------------------------------------------------------------------

Re: [ptxdist] [APPLIED] mesalib: add SGI-B-2.0 license when GLX is enabled

[Michael Olbrich]

Thanks, applied as 12a8271de1fee139f5f1e305af84be4592bf16f8.

Michael

[sent from post-receive hook]

On Mon, 27 Jan 2025 09:35:12 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> The GLX DRI code in src/glx is SGI-B-2.0 licensed.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20250123101141.3047977-3-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 9fdb3b518b47..cf283ec19104 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -23,10 +23,14 @@ MESALIB_URL	:= \
>  MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
>  MESALIB_DIR	:= $(BUILDDIR)/$(MESALIB)
>  MESALIB_LICENSE	:= MIT AND BSL-1.0
> +ifdef PTXCONF_MESALIB_GLX
> +MESALIB_LICENSE += AND SGI-B-2.0
> +endif
>  MESALIB_LICENSE_FILES := \
>  	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
>  	file://licenses/BSL-1.0;md5=4610c5f00caa47872489c3943d1bacc8 \
> -	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d
> +	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d \
> +	file://licenses/SGI-B-2.0;md5=efe792cf56e83c7aa8470e553faf333f
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] mesalib: add Apache-2.0 license when Vulkan screenshot layer is enabled

[Michael Olbrich]

Thanks, applied as bfa69a017e16d3fc2f7e13caee35f08f7d3f7eb4.

Michael

[sent from post-receive hook]

On Mon, 27 Jan 2025 09:35:13 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> The Vulkan screenshot layer is based on the Apache-2.0 licensed
> Vulkan layer template.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20250123101141.3047977-4-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index cf283ec19104..25795f94d62e 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -26,8 +26,12 @@ MESALIB_LICENSE	:= MIT AND BSL-1.0
>  ifdef PTXCONF_MESALIB_GLX
>  MESALIB_LICENSE += AND SGI-B-2.0
>  endif
> +ifdef PTXCONF_MESALIB_VULKAN_SCREENSHOT
> +MESALIB_LICENSE += AND Apache-2.0
> +endif
>  MESALIB_LICENSE_FILES := \
>  	file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11 \
> +	file://licenses/Apache-2.0;md5=db66a99884d6d2bdbd5f9e71e1bffec6 \
>  	file://licenses/BSL-1.0;md5=4610c5f00caa47872489c3943d1bacc8 \
>  	file://licenses/MIT;md5=e8f57dd048e186199433be2c41bd3d6d \
>  	file://licenses/SGI-B-2.0;md5=efe792cf56e83c7aa8470e553faf333f