[ptxdist] [PATCH 5/8] vulkan-headers: 1.3.236.0 -> 1.3.239.0
Signed-off-by: Philipp Zabel --- rules/vulkan-headers.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make index da62d80f6b6e..4552bff7da38 100644 --- a/rules/vulkan-headers.make +++ b/rules/vulkan-headers.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers # Paths and names # -VULKAN_HEADERS_VERSION := 1.3.236.0 -VULKAN_HEADERS_MD5 := 9fba7f1ef2c43b6ce3c9660a618e788c +VULKAN_HEADERS_VERSION := 1.3.239.0 +VULKAN_HEADERS_MD5 := 284c313634dcda93bd1875fc3d8596b1 VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) VULKAN_HEADERS_SUFFIX := tar.gz VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) @@ -34,6 +34,6 @@ VULKAN_HEADERS_LICENSE_FILES := \ VULKAN_HEADERS_CONF_TOOL := cmake VULKAN_HEADERS_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ - -DVULKAN_HEADERS_INSTALL=ON + -DBUILD_TESTS=OFF # vim: syntax=make -- 2.30.2
[ptxdist] [PATCH 1/8] glslang: version bump 1.3.236.0 -> 1.3.239.0
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index e132f6806ec6..da44f91231ca 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.236.0 -GLSLANG_MD5:= 624390dc06d35f359ed14288bb8ccbe1 +GLSLANG_VERSION:= 1.3.239.0 +GLSLANG_MD5:= 0d43884d4cfe1f374025ce001ed8d724 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.30.2
[ptxdist] [PATCH 6/8] vulkan-loader: version bump 1.3.236.0 -> 1.3.239.0
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index c683708eaa66..d44087f1a6ba 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.3.236.0 -VULKAN_LOADER_MD5 := ed9d0fd06898e508adb4e2bdff2c88a5 +VULKAN_LOADER_VERSION := 1.3.239.0 +VULKAN_LOADER_MD5 := ff690deea26c9ae4815e08c4cd24ebab 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) -- 2.30.2
[ptxdist] [PATCH 8/8] vulkan-validationlayers: version bump 1.3.236.0 -> 1.3.239.0
Signed-off-by: Philipp Zabel --- rules/vulkan-validationlayers.make | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index 7e7b97bca1eb..df543d66a623 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.3.236.0 -VULKAN_VALIDATIONLAYERS_MD5:= a95eab3163458901535b49681abf710f +VULKAN_VALIDATIONLAYERS_VERSION:= 1.3.239.0 +VULKAN_VALIDATIONLAYERS_MD5:= d18d36356c30719b4e6b30bd5b781c86 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,10 +39,11 @@ 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 \ - -DINSTALL_TESTS=OFF \ + -DUPDATE_DEPS=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \ -DVVL_CPP_STANDARD=20 \ - -DVVL_ENABLE_ASAN=OFF + -DVVL_ENABLE_ASAN=OFF \ + -DVVL_ENABLE_TSAN=OFF # # Target-Install -- 2.30.2
[ptxdist] [PATCH] pipewire: version bump 0.3.59 -> 0.3.60
Signed-off-by: Philipp Zabel --- rules/pipewire.make | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index 3b9e1b51a914..b8d04e8f8fd4 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.59 -PIPEWIRE_MD5 := d310bf1f3cc5b2b446aecfa97c2cde82 +PIPEWIRE_VERSION := 0.3.60 +PIPEWIRE_MD5 := 3b77c023fef647f848fb4189349bde80 PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) @@ -49,6 +49,7 @@ PIPEWIRE_CONF_OPT := \ -Dbluez5-backend-hfp-native=disabled \ -Dbluez5-backend-hsp-native=disabled \ -Dbluez5-backend-hsphfpd=disabled \ + -Dbluez5-backend-native-mm=disabled \ -Dbluez5-backend-ofono=disabled \ -Dbluez5-codec-aac=disabled \ -Dbluez5-codec-aptx=disabled \ @@ -84,6 +85,7 @@ PIPEWIRE_CONF_OPT := \ -Dpipewire-v4l2=disabled \ -Dpw-cat=enabled \ -Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \ + -Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \ -Droc=disabled \ -Dsdl2=disabled \ -Dsession-managers= \ @@ -132,6 +134,8 @@ PIPEWIRE_MODULES-y := \ protocol-simple \ rt \ session-manager \ + rtp-source \ + rtp-sink \ spa-device \ spa-device-factory \ spa-node \ -- 2.30.2
[ptxdist] [PATCH] wayland-protocols: version bump 1.27 -> 1.28
Signed-off-by: Philipp Zabel --- rules/wayland-protocols.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make index 131187d67e28..2e166bc2c9bb 100644 --- a/rules/wayland-protocols.make +++ b/rules/wayland-protocols.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols # # Paths and names # -WAYLAND_PROTOCOLS_VERSION := 1.27 -WAYLAND_PROTOCOLS_MD5 := 883fa28a6094871421491086ba50f01a +WAYLAND_PROTOCOLS_VERSION := 1.28 +WAYLAND_PROTOCOLS_MD5 := 391ac1ac30e96d2f5559e2cc40a4d924 WAYLAND_PROTOCOLS := wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION) WAYLAND_PROTOCOLS_SUFFIX := tar.xz WAYLAND_PROTOCOLS_URL := https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX) -- 2.30.2
[ptxdist] [PATCH] mesalib: version bump 22.2.2 -> 22.2.3
Signed-off-by: Philipp Zabel --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 6395e1384261..933212479e83 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 22.2.2 -MESALIB_MD5:= b696316674c2007cdcc25e67e192aba8 +MESALIB_VERSION:= 22.2.3 +MESALIB_MD5:= 06c329323a60f6eb6d4adc0d3971b0f4 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.30.2
Re: [ptxdist] [PATCH 5/7] vulkan-tools: version bump 1.3.231.0 -> 1.3.231.1
On Fr, 2022-11-04 at 10:11 +0100, Michael Olbrich wrote:
> On Thu, Nov 03, 2022 at 05:57:05PM +0100, Philipp Zabel wrote:
> > Signed-off-by: Philipp Zabel
>
> Fails to build:
>
> CMake Error at cube/CMakeLists.txt:274 (install):
> install TARGETS given target "vkcube" which does not exist.
>
>
> CMake Error at cube/CMakeLists.txt:321 (install):
> install TARGETS given target "vkcubepp" which does not exist.
>
>
> CMake Error at cube/CMakeLists.txt:353 (install):
> install TARGETS given target "vkcube-wayland" which does not exist.
I missed that cube/CMakeList.txt still contains the
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
checks.
> And there are issues with the 1.3.231.0 patches as well, so please
> fix and squash the two series.
Fixed, squashed, and resent. Marked the VULKAN_TOOLS_CUBE option as
BROKEN again.
regards
Philipp
[ptxdist] [PATCH 6/7] vulkan-validationlayers: version bump 1.3.224.1 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/vulkan-validationlayers.make | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index 142df7157029..08648e01007f 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.3.224.1 -VULKAN_VALIDATIONLAYERS_MD5:= 6c015ae4e1e0f4cc82f4670fc9042e0b +VULKAN_VALIDATIONLAYERS_VERSION:= 1.3.231.1 +VULKAN_VALIDATIONLAYERS_MD5:= cd1c2e8df889c392a0e41cec12b8eb00 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) @@ -32,21 +32,21 @@ VULKAN_VALIDATIONLAYERS_CONF_TOOL := cmake VULKAN_VALIDATIONLAYERS_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ - -DAPI_NAME=Vulkan \ -DBUILD_LAYERS=ON \ -DBUILD_LAYER_SUPPORT_FILES=OFF \ -DBUILD_TESTS=OFF \ - -DBUILD_WERROR=ON \ + -DBUILD_WERROR=OFF \ -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 \ -DDEMOS_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND, WAYLAND, \ $(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB, XCB, DISPLAY)) \ -DINSTALL_TESTS=OFF \ - -DUSE_CCACHE=OFF \ + -DSPIRV_HEADERS_INSTALL_DIR=$(SYSROOT)/usr \ -DUSE_ROBIN_HOOD_HASHING=OFF \ -DVVL_CPP_STANDARD=14 \ - -DVVL_ENABLE_ASAN=OFF + -DVVL_ENABLE_ASAN=OFF \ + -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan # # Target-Install -- 2.30.2
[ptxdist] [PATCH 2/7] spirv-headers: version bump 1.3.224.1 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index 3e9b59929cf1..ddf8b26049ea 100644 --- a/rules/spirv-headers.make +++ b/rules/spirv-headers.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers # # Paths and names # -SPIRV_HEADERS_VERSION := 1.3.224.1 -SPIRV_HEADERS_MD5 := 295b55773166d3ccfade522b9b80805f +SPIRV_HEADERS_VERSION := 1.3.231.1 +SPIRV_HEADERS_MD5 := 2eac8853ab6ad09a31c6464ca3051407 SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) @@ -30,6 +30,8 @@ SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae SPIRV_HEADERS_CONF_TOOL:= cmake SPIRV_HEADERS_CONF_OPT := \ - $(CROSS_CMAKE_USR) + $(CROSS_CMAKE_USR) \ + -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ + -DSPIRV_HEADERS_SKIP_INSTALL=OFF # vim: syntax=make -- 2.30.2
[ptxdist] [PATCH 5/7] vulkan-tools: version bump 1.3.224.1 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/vulkan-tools.in | 7 --- rules/vulkan-tools.make | 8 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rules/vulkan-tools.in b/rules/vulkan-tools.in index 76b312d71bbf..ce40987f594e 100644 --- a/rules/vulkan-tools.in +++ b/rules/vulkan-tools.in @@ -6,9 +6,10 @@ config VULKAN_TOOLS select HOST_CMAKE select HOST_GLSLANG select VULKAN_LOADER - select LIBXCB if VULKAN_TOOLS_XCB - select XORG_LIB_X11 if VULKAN_TOOLS_XCB - select WAYLAND if VULKAN_TOOLS_WAYLAND + select LIBXCB if VULKAN_TOOLS_XCB + select XORG_LIB_X11 if VULKAN_TOOLS_XCB + select WAYLAND if VULKAN_TOOLS_WAYLAND + select WAYLAND_PROTOCOLSif VULKAN_TOOLS_WAYLAND help Vulkan Utilities and Tools diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index 293c2486aba2..a7ed9b947177 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.3.224.1 -VULKAN_TOOLS_MD5 := 1e0751827d92fbd715687bdce6d374f4 +VULKAN_TOOLS_VERSION := 1.3.231.1 +VULKAN_TOOLS_MD5 := 927ccb38f18bc0af35742e81ba68b9d3 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) @@ -43,7 +43,7 @@ VULKAN_TOOLS_CONF_OPT := \ -DUSE_CCACHE=OFF \ -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan -ifdef VULKAN_TOOLS_CUBE +ifdef PTXCONF_VULKAN_TOOLS_CUBE VULKAN_TOOLS_CONF_OPT += \ -DCUBE_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_WAYLAND, WAYLAND, \ $(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_XCB, XCB, DISPLAY)) \ @@ -63,7 +63,7 @@ $(STATEDIR)/vulkan-tools.targetinstall: @$(call install_fixup, vulkan-tools, AUTHOR, "Philipp Zabel ") @$(call install_fixup, vulkan-tools, DESCRIPTION, Vulkan Utilities and Tools) -ifdef VULKAN_TOOLS_CUBE +ifdef PTXCONF_VULKAN_TOOLS_CUBE @$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcube) @$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcubepp) endif -- 2.30.2
[ptxdist] [PATCH 3/7] spirv-tools: version bump 1.3.224.1 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index ce7ec569c769..6a9b3cb12fa4 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:= 1.3.224.1 -SPIRV_TOOLS_MD5:= 16d8c78da2c4f17dc69aef137a94fc2a +SPIRV_TOOLS_VERSION:= 1.3.231.1 +SPIRV_TOOLS_MD5:= 400b8ea1c96b1662cbe5668d81548a52 SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) @@ -64,6 +64,7 @@ SPIRV_TOOLS_CONF_OPT := \ -DSPIRV_COLOR_TERMINAL=ON \ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ -DSPIRV_HEADERS_SKIP_INSTALL=ON \ + -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \ -DSPIRV_LOG_DEBUG=OFF \ -DSPIRV_SKIP_EXECUTABLES=ON \ -DSPIRV_SKIP_TESTS=ON \ -- 2.30.2
[ptxdist] [PATCH 4/7] vulkan-loader: version bump 1.3.224.1 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 355d2edfd0fe..9d537da6b7b9 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.3.224.1 -VULKAN_LOADER_MD5 := 54b7498c122e2ec8eb3d1dc80c654456 +VULKAN_LOADER_VERSION := 1.3.231.1 +VULKAN_LOADER_MD5 := 1b7da12f3339204c48eafef259aad635 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.3.224.1 -VULKAN_HEADERS_MD5 := 8c5bce593727609fdbf574b98ed7f38e +VULKAN_HEADERS_VERSION := 1.3.231.1 +VULKAN_HEADERS_MD5 := 2b622628ff998288b3dd6778f63c9e2b 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) @@ -54,13 +54,13 @@ VULKAN_LOADER_CONF_TOOL := cmake VULKAN_LOADER_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ -DBUILD_TESTS=OFF \ -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_WAYLAND) \ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ + -DENABLE_WERROR=ON \ -DFALLBACK_CONFIG_DIRS=/etc/xdg \ -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ -DSYSCONFDIR= \ -- 2.30.2
[ptxdist] [PATCH 7/7] shaderc: version bump v2022.1 -> v2022.3
Signed-off-by: Philipp Zabel --- rules/shaderc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/shaderc.make b/rules/shaderc.make index 71a2454a9c21..c924ebc256fe 100644 --- a/rules/shaderc.make +++ b/rules/shaderc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc # # Paths and names # -SHADERC_VERSION:= v2022.1 -SHADERC_MD5:= dc104cea7c6dee347e326031bdb77593 +SHADERC_VERSION:= v2022.3 +SHADERC_MD5:= 5cb762af57637caf997d5f46baa4e8a4 SHADERC:= shaderc-$(SHADERC_VERSION) SHADERC_SUFFIX := tar.gz SHADERC_URL:= \ -- 2.30.2
[ptxdist] [PATCH 1/7] glslang: version bump 1.3.224.1 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- rules/host-glslang.make | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index eb35458eb2d7..7af639b9db41 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.224.1 -GLSLANG_MD5:= b91c9fbaad20e3a6415d8f236284efe9 +GLSLANG_VERSION:= 1.3.231.1 +GLSLANG_MD5:= b6308880c655a50d50e0dd0e049ba5d5 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) diff --git a/rules/host-glslang.make b/rules/host-glslang.make index 1718562d110b..dcdaa0ee27ab 100644 --- a/rules/host-glslang.make +++ b/rules/host-glslang.make @@ -23,7 +23,6 @@ HOST_GLSLANG_CONF_OPT := \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_CTEST=OFF \ -DENABLE_EXCEPTIONS=OFF \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DENABLE_GLSLANG_BINARIES=ON \ -DENABLE_GLSLANG_JS=OFF \ -DENABLE_HLSL=OFF \ -- 2.30.2
[ptxdist] [PATCH] gdb: add option for 11.1 and later
GDB requires GMP since version 11.1. Add an option to allow selecting
LIBGMP for newer toolchains. This is somewhat analogous to commit
bc5cac5c54d2 ("glibc: add option for 2.34 and later").
Signed-off-by: Philipp Zabel
---
rules/gdb.in | 8
1 file changed, 8 insertions(+)
diff --git a/rules/gdb.in b/rules/gdb.in
index 1dd2213abc8a..3014271de9c1 100644
--- a/rules/gdb.in
+++ b/rules/gdb.in
@@ -7,6 +7,7 @@ menuconfig GDB
select LIBC_DL
select GCCLIBS_GCC_S
select NCURSES
+ select LIBGMP if GDB_11_1
help
The GNU Debugger
@@ -25,5 +26,12 @@ config GDB_SHARED
If not set, the build option
LDFLAGS=-static will be activated.
+config GDB_11_1
+ bool
+ prompt "gdb-11.1 or later"
+ help
+ Since gdb-11.1, GMP is a required dependency. Enable this option
+ if your toolchain gdb version is 11.1 or later.
+
endif
--
2.30.2
[ptxdist] [PATCH 5/7] vulkan-tools: version bump 1.3.231.0 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- 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 6279efde253d..a7ed9b947177 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.3.231.0 -VULKAN_TOOLS_MD5 := 14730c9e4d46791938e0371c4de30405 +VULKAN_TOOLS_VERSION := 1.3.231.1 +VULKAN_TOOLS_MD5 := 927ccb38f18bc0af35742e81ba68b9d3 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.30.2
[ptxdist] [PATCH 3/7] spirv-tools: version bump 1.3.231.0 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index 34b4377c9ab3..6a9b3cb12fa4 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:= 1.3.231.0 -SPIRV_TOOLS_MD5:= 01c9be1dbc8a26e730b26edf92f14e19 +SPIRV_TOOLS_VERSION:= 1.3.231.1 +SPIRV_TOOLS_MD5:= 400b8ea1c96b1662cbe5668d81548a52 SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) -- 2.30.2
[ptxdist] [PATCH 4/7] vulkan-loader: version bump 1.3.231.0 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 894ed76b66de..9d537da6b7b9 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.3.231.0 -VULKAN_LOADER_MD5 := b76a1b4a2a987a4523759e58b32cacb6 +VULKAN_LOADER_VERSION := 1.3.231.1 +VULKAN_LOADER_MD5 := 1b7da12f3339204c48eafef259aad635 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.3.231.0 -VULKAN_HEADERS_MD5 := 106aa38cf8450d1bce2918770c8b1bba +VULKAN_HEADERS_VERSION := 1.3.231.1 +VULKAN_HEADERS_MD5 := 2b622628ff998288b3dd6778f63c9e2b 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) -- 2.30.2
[ptxdist] [PATCH 6/7] vulkan-validationlayers: version bump 1.3.231.0 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/vulkan-validationlayers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index d6b48a07a9cd..08648e01007f 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.3.231.0 -VULKAN_VALIDATIONLAYERS_MD5:= 1a17814d6a41f95e750c30f6d8b59417 +VULKAN_VALIDATIONLAYERS_VERSION:= 1.3.231.1 +VULKAN_VALIDATIONLAYERS_MD5:= cd1c2e8df889c392a0e41cec12b8eb00 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) -- 2.30.2
[ptxdist] [PATCH 7/7] shaderc: version bump v2022.1 -> v2022.3
Signed-off-by: Philipp Zabel --- rules/shaderc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/shaderc.make b/rules/shaderc.make index 71a2454a9c21..c924ebc256fe 100644 --- a/rules/shaderc.make +++ b/rules/shaderc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc # # Paths and names # -SHADERC_VERSION:= v2022.1 -SHADERC_MD5:= dc104cea7c6dee347e326031bdb77593 +SHADERC_VERSION:= v2022.3 +SHADERC_MD5:= 5cb762af57637caf997d5f46baa4e8a4 SHADERC:= shaderc-$(SHADERC_VERSION) SHADERC_SUFFIX := tar.gz SHADERC_URL:= \ -- 2.30.2
[ptxdist] [PATCH 2/7] spirv-headers: version bump 1.3.231.0 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index 3e26366e954e..ddf8b26049ea 100644 --- a/rules/spirv-headers.make +++ b/rules/spirv-headers.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers # # Paths and names # -SPIRV_HEADERS_VERSION := 1.3.231.0 -SPIRV_HEADERS_MD5 := 393d0f44cfda15cbdd1a2e04147946ad +SPIRV_HEADERS_VERSION := 1.3.231.1 +SPIRV_HEADERS_MD5 := 2eac8853ab6ad09a31c6464ca3051407 SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) -- 2.30.2
[ptxdist] [PATCH 1/7] glslang: version bump 1.3.231.0 -> 1.3.231.1
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index 6acd13f1b064..7af639b9db41 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.231.0 -GLSLANG_MD5:= fa0e7daeebb420f11101db0a6d3f0a97 +GLSLANG_VERSION:= 1.3.231.1 +GLSLANG_MD5:= b6308880c655a50d50e0dd0e049ba5d5 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.30.2
[ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2
Signed-off-by: Philipp Zabel --- ...yland-fix-build-against-version-1.20.patch | 45 --- patches/waffle-1.7.0/series | 4 -- rules/waffle.make | 4 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch delete mode 100644 patches/waffle-1.7.0/series diff --git a/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch b/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch deleted file mode 100644 index 8f021e23634b.. --- a/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Philipp Zabel -Date: Fri, 17 Dec 2021 13:46:40 +0100 -Subject: [PATCH] wayland: fix build against version 1.20 - -Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and -wl_proxy_marshal_array_flags, which need to be wrapped as well. - -Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76 -Link: https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/106 -Signed-off-by: Philipp Zabel - src/waffle/wayland/wayland_sym.h | 10 ++ - src/waffle/wayland/wayland_wrapper.h | 2 ++ - 2 files changed, 12 insertions(+) - -diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h -index 3d486255508f..ada78ddf47a0 100644 a/src/waffle/wayland/wayland_sym.h -+++ b/src/waffle/wayland/wayland_sym.h -@@ -26,3 +26,13 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, - WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, -(struct wl_proxy *proxy, uint32_t opcode, - const struct wl_interface *interface, uint32_t version, ...)) -+ -+WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_flags, -+ (struct wl_proxy *p, uint32_t opcode, -+const struct wl_interface *interface, uint32_t version, -+uint32_t flags, ...)) -+ -+WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_array_flags, -+ (struct wl_proxy *p, uint32_t opcode, -+const struct wl_interface *interface, uint32_t version, -+uint32_t flags, union wl_argument *args)) -diff --git a/src/waffle/wayland/wayland_wrapper.h b/src/waffle/wayland/wayland_wrapper.h -index 4af2f64f2890..6addf4ff4c1f 100644 a/src/waffle/wayland/wayland_wrapper.h -+++ b/src/waffle/wayland/wayland_wrapper.h -@@ -65,5 +65,7 @@ struct wl_display; - #define wl_proxy_marshal (*wfl_wl_proxy_marshal) - #define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor) - #define wl_proxy_marshal_constructor_versioned (*wfl_wl_proxy_marshal_constructor_versioned) -+#define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags) -+#define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags) - - #include diff --git a/patches/waffle-1.7.0/series b/patches/waffle-1.7.0/series deleted file mode 100644 index 1106ee64a93a.. --- a/patches/waffle-1.7.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-wayland-fix-build-against-version-1.20.patch -# 2ea95c3f6d7514be3a2fefe02b81c232 - git-ptx-patches magic diff --git a/rules/waffle.make b/rules/waffle.make index 108f5a7d3221..cfea0e37ebde 100644 --- a/rules/waffle.make +++ b/rules/waffle.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle # # Paths and names # -WAFFLE_VERSION := 1.7.0 -WAFFLE_MD5 := 1e77b0cd95856fc9594f556fe9e13cb9 +WAFFLE_VERSION := 1.7.2 +WAFFLE_MD5 := e5e9772fe2c1e6267794f7aba08637c8 WAFFLE := waffle-$(WAFFLE_VERSION) WAFFLE_SUFFIX := tar.xz WAFFLE_URL := https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX) -- 2.30.2
[ptxdist] [PATCH 2/2] waffle: switch to meson build system
Signed-off-by: Philipp Zabel --- rules/waffle.in | 3 +-- rules/waffle.make | 27 --- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/rules/waffle.in b/rules/waffle.in index 1a5339407f8c..a125621f9c7c 100644 --- a/rules/waffle.in +++ b/rules/waffle.in @@ -3,8 +3,7 @@ menuconfig WAFFLE tristate prompt "waffle" - select HOST_CMAKE - select HOST_NINJA + select HOST_MESON select MESALIB select LIBXCB if WAFFLE_GLX || WAFFLE_X11_EGL select XORG_LIB_X11 if WAFFLE_GLX || WAFFLE_X11_EGL diff --git a/rules/waffle.make b/rules/waffle.make index cfea0e37ebde..4c53b9116351 100644 --- a/rules/waffle.make +++ b/rules/waffle.make @@ -29,24 +29,21 @@ WAFFLE_LICENSE_FILES := \ # Prepare # -WAFFLE_CONF_TOOL := cmake +WAFFLE_CONF_TOOL := meson WAFFLE_CONF_OPT:= \ - $(CROSS_CMAKE_USR) \ - -G Ninja \ - -DVALGRIND_EXECUTABLE= \ + $(CROSS_MESON_USR) \ + -Dbuild-examples=false \ + -Dbuild-htmldocs=false \ + -Dbuild-manpages=false \ + -Dbuild-tests=false \ + -Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \ + -Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \ + -Dnacl=false \ -Dnacl_sdk_path= \ -Dnacl_version= \ - -Dwaffle_build_examples=OFF \ - -Dwaffle_build_htmldocs=OFF \ - -Dwaffle_build_manpages=OFF \ - -Dwaffle_build_tests=OFF \ - -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \ - -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \ - -Dwaffle_has_nacl=OFF \ - -Dwaffle_has_surfaceless_egl=OFF \ - -Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \ - -Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \ - -Dwaffle_xsltproc= + -Dsurfaceless_egl=disabled \ + -Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \ + -Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d # # Target-Install -- 2.30.2
[ptxdist] [PATCH] pipewire: version bump 0.3.66 -> 0.3.67
Signed-off-by: Philipp Zabel --- rules/pipewire.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index 28a89f344c0e..da7474d82e55 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.66 -PIPEWIRE_MD5 := dbcaa4aabf22fa8d34eaa2fd880e831a +PIPEWIRE_VERSION := 0.3.67 +PIPEWIRE_MD5 := 2c9807b2878418be900a220aa4ff6974 PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) -- 2.30.2
[ptxdist] [PATCH] mesalib: version bump 23.0.0 -> 23.0.1
Signed-off-by: Philipp Zabel --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 1f227cc60314..47ce7015fb62 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 23.0.0 -MESALIB_MD5:= 86d15af0f92c5102005e57a28329bcb1 +MESALIB_VERSION:= 23.0.1 +MESALIB_MD5:= a95c1528b2a5cb4d6a1a0b77554de1a6 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.30.2
[ptxdist] [PATCH] pipewire: version bump 0.3.65 -> 0.3.66
Signed-off-by: Philipp Zabel --- rules/pipewire.make | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index 96738917141d..28a89f344c0e 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.65 -PIPEWIRE_MD5 := 5c31850705cacd12398da01b9b11cfd0 +PIPEWIRE_VERSION := 0.3.66 +PIPEWIRE_MD5 := dbcaa4aabf22fa8d34eaa2fd880e831a PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) @@ -77,11 +77,14 @@ PIPEWIRE_CONF_OPT := \ -Dlibcamera=$(call ptx/endis,PTXCONF_PIPEWIRE_LIBCAMERA)d \ -Dlibcanberra=disabled \ -Dlibjack-path= \ + -Dlibmysofa=disabled \ -Dlibpulse=disabled \ -Dlibusb=disabled \ -Dlibv4l2-path= \ -Dlv2=disabled \ -Dman=disabled \ + -Dpam-defaults-install=false \ + -Dpam-memlock-default=8192 \ -Dpipewire-alsa=enabled \ -Dpipewire-jack=disabled \ -Dpipewire-v4l2=disabled \ @@ -89,6 +92,11 @@ PIPEWIRE_CONF_OPT:= \ -Dpw-cat-ffmpeg=disabled \ -Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \ -Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \ + -Drlimits-install=false \ + -Drlimits-match=@pipewire \ + -Drlimits-memlock=4194304 \ + -Drlimits-nice=-19 \ + -Drlimits-rtprio=95 \ -Droc=disabled \ -Dsdl2=disabled \ -Dsession-managers= \ @@ -123,6 +131,7 @@ PIPEWIRE_MODULES-y := \ adapter \ client-device \ client-node \ + combine-stream \ echo-cancel \ fallback-sink \ filter-chain \ -- 2.30.2
[ptxdist] [PATCH] ptxd_make_world_prepare: use meson setup command
Fixes the following warning during the prepare stage of meson based
packages:
WARNING: Running the setup command as `meson [options]` instead of `meson
setup [options]` is ambiguous and deprecated.
The meson setup command is available since 0.42 and was marked as
deprecated in Meson 0.64.
Fixes: f4c1eef53247 ("host-meson: version bump 0.61.4 -> 1.0.0")
Signed-off-by: Philipp Zabel
---
scripts/lib/ptxd_make_world_prepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_world_prepare.sh
b/scripts/lib/ptxd_make_world_prepare.sh
index b94b91edf709..591e9a1f0255 100644
--- a/scripts/lib/ptxd_make_world_prepare.sh
+++ b/scripts/lib/ptxd_make_world_prepare.sh
@@ -149,7 +149,7 @@ ptxd_make_world_prepare_meson() {
"${pkg_path}" \
"${pkg_env}" \
"${pkg_conf_env}" \
- meson \
+ meson setup \
"${pkg_conf_opt}" \
"${pkg_conf_dir}" &&
ptxd_make_world_compile_commands_filter
--
2.30.2
[ptxdist] [PATCH] mesalib: version bump 22.3.5 -> 22.3.6
https://docs.mesa3d.org/relnotes/22.3.6.html Signed-off-by: Philipp Zabel --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index fadd4f83696c..61a325287c66 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 22.3.5 -MESALIB_MD5:= fdb35ae46968ce517702037710db6a3f +MESALIB_VERSION:= 22.3.6 +MESALIB_MD5:= ed6e3e529f3ec8d802625d19cd44ea07 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.30.2
[ptxdist] [PATCH] v4l-utils: version bump 1.22.1 -> 1.24.0
v4l2-tracer currently only compiles on 64-bit architectures. Signed-off-by: Philipp Zabel --- rules/v4l-utils.in | 5 + rules/v4l-utils.make | 10 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in index 322adb316526..23d8c86d6a36 100644 --- a/rules/v4l-utils.in +++ b/rules/v4l-utils.in @@ -12,6 +12,7 @@ menuconfig V4L_UTILS select LIBC_PTHREAD if V4L_UTILS_LIBV4L2 || V4L_UTILS_MEDIACTL select GCCLIBS_GCC_Sif V4L_UTILS_V4L2CTL || V4L_UTILS_V4L2COMPLIANCE select LIBJPEG if V4L_UTILS_LIBV4LCONVERT + select JSON_C if V4L_UTILS_TRACER help Linux V4L2 and DVB API utilities and v4l libraries (libv4l). @@ -88,4 +89,8 @@ config V4L_UTILS_V4L2SYSFSPATH bool prompt "install v4l2-sysfs-path" +config V4L_UTILS_TRACER + bool + prompt "install v4l2-tracer" + endif diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make index dfb4d37a8a3c..34b13e4e9146 100644 --- a/rules/v4l-utils.make +++ b/rules/v4l-utils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils # # Paths and names # -V4L_UTILS_VERSION := 1.22.1 -V4L_UTILS_MD5 := 8aa73287320a49e9170a8255d7b2c7e6 +V4L_UTILS_VERSION := 1.24.0 +V4L_UTILS_MD5 := a454d640c9eec26098f246d5f52ef438 V4L_UTILS := v4l-utils-$(V4L_UTILS_VERSION) V4L_UTILS_SUFFIX := tar.bz2 V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX) @@ -51,6 +51,7 @@ V4L_UTILS_CONF_OPT:= \ --enable-v4l-utils \ --enable-v4l2-compliance-libv4l \ --disable-v4l2-compliance-32 \ + --$(call ptx/endis, $(call ptx/ifdef, PTXCONF_ARCH_LP64,PTXCONF_V4L_UTILS_TRACER,))-v4l2-tracer \ --enable-v4l2-ctl-libv4l \ --enable-v4l2-ctl-stream-to \ --disable-v4l2-ctl-32 \ @@ -134,6 +135,11 @@ ifdef PTXCONF_V4L_UTILS_V4L2CTL endif ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-sysfs-path) +endif +ifdef PTXCONF_V4L_UTILS_TRACER +ifdef PTXCONF_ARCH_LP64 + @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-tracer) +endif endif @$(call install_finish, v4l-utils) -- 2.30.2
[ptxdist] [PATCH] v4l-utils: version bump 1.24.0 -> 1.24.1
Fixes v4l2-tracer build on 32-bit architectures. Signed-off-by: Philipp Zabel --- rules/v4l-utils.make | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make index 34b13e4e9146..1f4c608b9a84 100644 --- a/rules/v4l-utils.make +++ b/rules/v4l-utils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils # # Paths and names # -V4L_UTILS_VERSION := 1.24.0 -V4L_UTILS_MD5 := a454d640c9eec26098f246d5f52ef438 +V4L_UTILS_VERSION := 1.24.1 +V4L_UTILS_MD5 := 8ba9c73c4319b6afab5fa4358edc43de V4L_UTILS := v4l-utils-$(V4L_UTILS_VERSION) V4L_UTILS_SUFFIX := tar.bz2 V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX) @@ -51,7 +51,7 @@ V4L_UTILS_CONF_OPT:= \ --enable-v4l-utils \ --enable-v4l2-compliance-libv4l \ --disable-v4l2-compliance-32 \ - --$(call ptx/endis, $(call ptx/ifdef, PTXCONF_ARCH_LP64,PTXCONF_V4L_UTILS_TRACER,))-v4l2-tracer \ + --$(call ptx/endis, PTXCONF_V4L_UTILS_TRACER)-v4l2-tracer \ --enable-v4l2-ctl-libv4l \ --enable-v4l2-ctl-stream-to \ --disable-v4l2-ctl-32 \ @@ -137,9 +137,7 @@ ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-sysfs-path) endif ifdef PTXCONF_V4L_UTILS_TRACER -ifdef PTXCONF_ARCH_LP64 @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-tracer) -endif endif @$(call install_finish, v4l-utils) -- 2.30.2
[ptxdist] [PATCH] mesalib: version bump 22.3.6 -> 23.0.0
https://lists.freedesktop.org/archives/mesa-dev/2023-February/225930.html Signed-off-by: Philipp Zabel --- Release notes are not up yet, I assume they should appear at https://docs.mesa3d.org/relnotes/23.0.0.html shortly. --- rules/host-mesalib.make | 1 + rules/mesalib.in| 4 rules/mesalib.make | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index 3617ded0c47a..adcd227d8e23 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -96,6 +96,7 @@ HOST_MESALIB_CONF_OPT := \ -Dvulkan-icd-dir=/etc/vulkan/icd.d \ -Dvulkan-layers=[] \ -Dxlib-lease=disabled \ + -Dxmlconfig=disabled \ -Dzlib=enabled \ -Dzstd=disabled diff --git a/rules/mesalib.in b/rules/mesalib.in index 5e89907ed955..990a205fa550 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -262,5 +262,9 @@ config MESALIB_SHADER_CACHE bool prompt "enable shader cache" +config MESALIB_XMLCONFIG + bool + prompt "build custom xmlconfig (driconf) support" + endif diff --git a/rules/mesalib.make b/rules/mesalib.make index 61a325287c66..1f227cc60314 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 22.3.6 -MESALIB_MD5:= ed6e3e529f3ec8d802625d19cd44ea07 +MESALIB_VERSION:= 23.0.0 +MESALIB_MD5:= 86d15af0f92c5102005e57a28329bcb1 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ @@ -217,6 +217,7 @@ MESALIB_CONF_OPT:= \ -Dvulkan-icd-dir=/etc/vulkan/icd.d \ -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \ -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \ + -Dxmlconfig=$(call ptx/endis, PTXCONF_MESALIB_XMLCONFIG)d \ -Dzlib=enabled \ -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d -- 2.30.2
[ptxdist] [PATCH] configure_helper: ignore new Meson 1.1.0 builtin options
Ignore new Meson builtin options "licensedir" (since 1.1.0) and "vsenv" (since 1.1.0). Signed-off-by: Philipp Zabel --- scripts/configure_helper.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py index e6907cd4eb21..d5abc5a02c1a 100755 --- a/scripts/configure_helper.py +++ b/scripts/configure_helper.py @@ -144,6 +144,7 @@ meson_blacklist = [ "install_umask", "layout", "libexecdir", + "licensedir", "localedir", "localstatedir", "mandir", @@ -160,6 +161,7 @@ meson_blacklist = [ "sysconfdir", "unity", "unity_size", + "vsenv", "warning_level", "werror", "wrap_mode", -- 2.39.2
[ptxdist] [PATCH] mesalib: intel and amd vulkan drivers require host-glslang
Add a host-glslang dependency to make glslangValidator available to the AMD and Intel Vulkan driver builds. Signed-off-by: Philipp Zabel --- rules/mesalib.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/mesalib.in b/rules/mesalib.in index 7372c2fa0c05..cf9619c85241 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -8,6 +8,8 @@ menuconfig MESALIB select HOST_MAKEDEPEND select HOST_SYSTEM_PYTHON3 select HOST_SYSTEM_PYTHON3_MAKO + select HOST_GLSLANG if MESALIB_VULKAN_AMD + select HOST_GLSLANG if MESALIB_VULKAN_INTEL select HOST_GLSLANG if MESALIB_VULKAN_OVERLAY select GCCLIBS select GCCLIBS_CXX -- 2.39.2
[ptxdist] [PATCH] pipewire: version bump 0.3.68 -> 0.3.70
https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.70#pipewire-0370-2023-04-20 Signed-off-by: Philipp Zabel --- rules/pipewire.make | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index 5f78663fc8cf..f4b3deb4112d 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.68 -PIPEWIRE_MD5 := e0572cb5ff19411fb51c88b9b156acca +PIPEWIRE_VERSION := 0.3.70 +PIPEWIRE_MD5 := 2f4f2fe2a60b72f3ead5472f9433973c PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) @@ -83,6 +83,7 @@ PIPEWIRE_CONF_OPT := \ -Dlibv4l2-path= \ -Dlv2=disabled \ -Dman=disabled \ + -Dopus=disabled \ -Dpam-defaults-install=false \ -Dpam-memlock-default=8192 \ -Dpipewire-alsa=enabled \ @@ -189,6 +190,7 @@ endif ifdef PTXCONF_PIPEWIRE_PW_CTL @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-cli) endif + @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-config) @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-dot) @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-dump) @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-link) -- 2.39.2
[ptxdist] [PATCH] pipewire: version bump 0.3.67 -> 0.3.68
https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.68 Signed-off-by: Philipp Zabel --- rules/pipewire.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index da7474d82e55..5f78663fc8cf 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.67 -PIPEWIRE_MD5 := 2c9807b2878418be900a220aa4ff6974 +PIPEWIRE_VERSION := 0.3.68 +PIPEWIRE_MD5 := e0572cb5ff19411fb51c88b9b156acca PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) @@ -146,6 +146,7 @@ PIPEWIRE_MODULES-y := \ protocol-simple \ rt \ session-manager \ + rtp-sap \ rtp-source \ rtp-sink \ spa-device \ @@ -182,7 +183,7 @@ $(STATEDIR)/pipewire.targetinstall: @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire) ifdef PTXCONF_PIPEWIRE_PULSEAUDIO - @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire-pulse) + @$(call install_link, pipewire, pipewire, /usr/bin/pipewire-pulse) endif @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-cat) ifdef PTXCONF_PIPEWIRE_PW_CTL -- 2.39.2
[ptxdist] [PATCH] host-meson: version bump 1.0.0 -> 1.1.0
https://mesonbuild.com/Release-notes-for-1-1-0.html Signed-off-by: Philipp Zabel --- rules/host-meson.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-meson.make b/rules/host-meson.make index 08b62748d8e0..e86b89e14b39 100644 --- a/rules/host-meson.make +++ b/rules/host-meson.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson # # Paths and names # -HOST_MESON_VERSION := 1.0.0 -HOST_MESON_MD5 := 009b78125467cd9ee4d467175a5c12e1 +HOST_MESON_VERSION := 1.1.0 +HOST_MESON_MD5 := 94ea898bcf799470878e60809be80467 HOST_MESON := meson-$(HOST_MESON_VERSION) HOST_MESON_SUFFIX := tar.gz HOST_MESON_URL := https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX) -- 2.39.2
[ptxdist] [PATCH] mesalib: version bump 23.0.1 -> 23.0.2
Signed-off-by: Philipp Zabel --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 47ce7015fb62..f918a4ffc316 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 23.0.1 -MESALIB_MD5:= a95c1528b2a5cb4d6a1a0b77554de1a6 +MESALIB_VERSION:= 23.0.2 +MESALIB_MD5:= ffea65f5dd7f1be1e4f941ad990a3ae7 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.39.2
[ptxdist] [PATCH v2] host-meson: version bump 1.0.0 -> 1.1.0
Signed-off-by: Philipp Zabel
---
v2: remember the patches
---
...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++---
.../0002-HACK-enable-NEON-only-for-ARMv7.patch | 4 ++--
patches/{meson-1.0.0 => meson-1.1.0}/series | 0
rules/host-meson.make | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
rename patches/{meson-1.0.0 =>
meson-1.1.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
(91%)
rename patches/{meson-1.0.0 =>
meson-1.1.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (91%)
rename patches/{meson-1.0.0 => meson-1.1.0}/series (100%)
diff --git
a/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
b/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 91%
rename from
patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to
patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index efed46c1df60..d8e2667df74e 100644
---
a/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++
b/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
-index 3385dd3dcadd..7c15a212802e 100644
+index 5799caf76ee0..f466f4eae88c 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
-@@ -660,7 +660,10 @@ class GnuLikeDynamicLinkerMixin:
+@@ -673,7 +673,10 @@ class GnuLikeDynamicLinkerMixin:
# Need to deduplicate rpaths, as macOS's install_name_tool
# is *very* allergic to duplicate -delete_rpath arguments
# when calling depfixer on installation.
@@ -26,7 +26,7 @@ index 3385dd3dcadd..7c15a212802e 100644
rpath_dirs_to_remove = set()
for p in all_paths:
rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -701,7 +704,8 @@ class GnuLikeDynamicLinkerMixin:
paths = padding
else:
paths = paths + ':' + padding
diff --git a/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
b/patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 91%
rename from patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
index 263e1a76b552..6c206ee62f51 100644
--- a/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich
1 file changed, 3 insertions(+)
diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
-index a33022d0435b..d40be3443776 100644
+index 3ee0858b3287..25add8aec18e 100644
--- a/mesonbuild/modules/simd.py
+++ b/mesonbuild/modules/simd.py
-@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
+@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
continue
iset_fname = kwargs[iset] # Might also be an array or Files.
static_library will validate.
args = compiler.get_instruction_set_args(iset)
diff --git a/patches/meson-1.0.0/series b/patches/meson-1.1.0/series
similarity index 100%
rename from patches/meson-1.0.0/series
rename to patches/meson-1.1.0/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 08b62748d8e0..e86b89e14b39 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
#
# Paths and names
#
-HOST_MESON_VERSION := 1.0.0
-HOST_MESON_MD5 := 009b78125467cd9ee4d467175a5c12e1
+HOST_MESON_VERSION := 1.1.0
+HOST_MESON_MD5 := 94ea898bcf799470878e60809be80467
HOST_MESON := meson-$(HOST_MESON_VERSION)
HOST_MESON_SUFFIX := tar.gz
HOST_MESON_URL :=
https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
--
2.39.2
[ptxdist] [PATCH] wayland: version bump 1.21.0 -> 1.22.0
Signed-off-by: Philipp Zabel --- rules/wayland.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wayland.make b/rules/wayland.make index 6c0de250a0f8..3e192f427441 100644 --- a/rules/wayland.make +++ b/rules/wayland.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND) += wayland # # Paths and names # -WAYLAND_VERSION:= 1.21.0 -WAYLAND_MD5:= f2653a2293bcd882d756c6a83d278903 +WAYLAND_VERSION:= 1.22.0 +WAYLAND_MD5:= 7410ab549e3928fce9381455b17b0803 WAYLAND:= wayland-$(WAYLAND_VERSION) WAYLAND_SUFFIX := tar.xz WAYLAND_URL:= https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(WAYLAND_VERSION)/downloads/$(WAYLAND).$(WAYLAND_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 1/8] glslang: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index da44f91231ca..5d3cb477ad1e 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.239.0 -GLSLANG_MD5:= 0d43884d4cfe1f374025ce001ed8d724 +GLSLANG_VERSION:= 1.3.243.0 +GLSLANG_MD5:= 513695ced128d1bde2726d57ad676cf6 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 3/8] spirv-tools: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index 7aafef293b6d..64ce4ae00a8b 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:= 1.3.239.0 -SPIRV_TOOLS_MD5:= 8d9ec694f0743e01c15576a80392deb9 +SPIRV_TOOLS_VERSION:= 1.3.243.0 +SPIRV_TOOLS_MD5:= 463d1144e7339a7338e69b74e01acabd SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 4/8] vulkan-headers: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- rules/vulkan-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make index 4552bff7da38..80eb4e62ef8f 100644 --- a/rules/vulkan-headers.make +++ b/rules/vulkan-headers.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers # Paths and names # -VULKAN_HEADERS_VERSION := 1.3.239.0 -VULKAN_HEADERS_MD5 := 284c313634dcda93bd1875fc3d8596b1 +VULKAN_HEADERS_VERSION := 1.3.243.0 +VULKAN_HEADERS_MD5 := 848df8eb68f8f79a2b5b39aecc0595c4 VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) VULKAN_HEADERS_SUFFIX := tar.gz VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 5/8] vulkan-loader: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index d44087f1a6ba..4a7ee72379e0 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.3.239.0 -VULKAN_LOADER_MD5 := ff690deea26c9ae4815e08c4cd24ebab +VULKAN_LOADER_VERSION := 1.3.243.0 +VULKAN_LOADER_MD5 := 87284897301309f54a14965796987764 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) @@ -42,7 +42,10 @@ VULKAN_LOADER_CONF_OPT := \ -DENABLE_WERROR=OFF \ -DFALLBACK_CONFIG_DIRS=/etc/xdg \ -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ + -DLOADER_ENABLE_ADDRESS_SANITIZER=OFF \ + -DLOADER_ENABLE_THREAD_SANITIZER=OFF \ -DSYSCONFDIR= \ + -DUPDATE_DEPS=OFF \ -DUSE_GAS=OFF # -- 2.39.2
[ptxdist] [PATCH 2/8] spirv-headers: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index b947fa11bbd2..66c8f9167adf 100644 --- a/rules/spirv-headers.make +++ b/rules/spirv-headers.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers # # Paths and names # -SPIRV_HEADERS_VERSION := 1.3.239.0 -SPIRV_HEADERS_MD5 := fc7b442c1c5eaa05e740ea3b1d7f438f +SPIRV_HEADERS_VERSION := 1.3.243.0 +SPIRV_HEADERS_MD5 := f3025c0e1a7846ac948a8118fbb85a9b SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 6/8] vulkan-tools: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- 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 562bbb795d83..57aad9d5df98 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.3.239.0 -VULKAN_TOOLS_MD5 := 7af125e5faa076f84f2cc187f5eea3bb +VULKAN_TOOLS_VERSION := 1.3.243.0 +VULKAN_TOOLS_MD5 := f2c7fd687dd526b8a077c78908d02518 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.39.2
[ptxdist] [PATCH 7/8] vulkan-validationlayers: version bump 1.3.239.0 -> 1.3.243.0
Signed-off-by: Philipp Zabel --- rules/vulkan-validationlayers.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index df543d66a623..d895cb498624 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.3.239.0 -VULKAN_VALIDATIONLAYERS_MD5:= d18d36356c30719b4e6b30bd5b781c86 +VULKAN_VALIDATIONLAYERS_VERSION:= 1.3.243.0 +VULKAN_VALIDATIONLAYERS_MD5:= 75cec7ae6450ba60db40cf1a3c84bb11 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) @@ -41,6 +41,7 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ -DUPDATE_DEPS=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \ + -DVVL_CLANG_TIDY=OFF \ -DVVL_CPP_STANDARD=20 \ -DVVL_ENABLE_ASAN=OFF \ -DVVL_ENABLE_TSAN=OFF -- 2.39.2
[ptxdist] [PATCH 8/8] shaderc: version bump v2023.2 -> v2023.3
Signed-off-by: Philipp Zabel --- rules/shaderc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/shaderc.make b/rules/shaderc.make index ffb3d3426ec3..4144ac869a43 100644 --- a/rules/shaderc.make +++ b/rules/shaderc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc # # Paths and names # -SHADERC_VERSION:= v2023.2 -SHADERC_MD5:= c0cd82a81abd77fe65af1d2685a17ab7 +SHADERC_VERSION:= v2023.3 +SHADERC_MD5:= 5149e2beb4501830218edd4cfab68db5 SHADERC:= shaderc-$(SHADERC_VERSION) SHADERC_SUFFIX := tar.gz SHADERC_URL:= \ -- 2.39.2
[ptxdist] [PATCH v2] configure_helper: ignore new Meson 0.63 builtin option
Ignore new Meson builtin option "prefer_static" (since 0.63).
Signed-off-by: Philipp Zabel
---
Changes since v1:
- Drop "pkgconfig.relocatable", which is always set since commit
cd37b00b3023 ("pre/Rules.make: let Meson generate relocatable .pc files")
---
scripts/configure_helper.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 86dee3416d08..e6907cd4eb21 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -149,6 +149,7 @@ meson_blacklist = [
"mandir",
"optimization",
"pkg_config_path",
+ "prefer_static",
"python.install_env",
"python.platlibdir",
"python.purelibdir",
--
2.30.2
[ptxdist] [PATCH] libdisplay-info: new package
Package libdisplay-info EDID / DisplayID parsing library. Announcement mail: https://lore.kernel.org/dri-devel/eUGSsAPs9QWiofs9rUjNcIffY-PZRaZwsmwUA2NYKBijdqT7cW-4Mv0Lq9k_A6ptlYC8kXnSUV257b-T8AzsfYVJK_MO9shEOyIit_HoU-g=@emersion.fr/T/#u Signed-off-by: Philipp Zabel --- rules/libdisplay-info.in | 9 ++ rules/libdisplay-info.make | 58 ++ 2 files changed, 67 insertions(+) create mode 100644 rules/libdisplay-info.in create mode 100644 rules/libdisplay-info.make diff --git a/rules/libdisplay-info.in b/rules/libdisplay-info.in new file mode 100644 index ..d3a6d0cbaa4d --- /dev/null +++ b/rules/libdisplay-info.in @@ -0,0 +1,9 @@ +## SECTION=multimedia_libs + +menuconfig LIBDISPLAY_INFO + tristate + prompt "libdisplay-info " + select HOST_MESON + select HWDATA if BUILDTIME + help + EDID and DisplayID library diff --git a/rules/libdisplay-info.make b/rules/libdisplay-info.make new file mode 100644 index ..c9b4c44d2894 --- /dev/null +++ b/rules/libdisplay-info.make @@ -0,0 +1,58 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Philipp Zabel +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBDISPLAY_INFO) += libdisplay-info + +# +# Paths and names +# +LIBDISPLAY_INFO_VERSION:= 0.1.0 +LIBDISPLAY_INFO_MD5:= a313ab3d90aa8de3b1d9bb5460c05757 +LIBDISPLAY_INFO:= libdisplay-info-$(LIBDISPLAY_INFO_VERSION) +LIBDISPLAY_INFO_SUFFIX := tar.xz +LIBDISPLAY_INFO_URL:= https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(LIBDISPLAY_INFO_VERSION)/downloads/$(LIBDISPLAY_INFO).$(LIBDISPLAY_INFO_SUFFIX) +LIBDISPLAY_INFO_SOURCE := $(SRCDIR)/$(LIBDISPLAY_INFO).$(LIBDISPLAY_INFO_SUFFIX) +LIBDISPLAY_INFO_DIR:= $(BUILDDIR)/$(LIBDISPLAY_INFO) +LIBDISPLAY_INFO_LICENSE:= MIT +LIBDISPLAY_INFO_LICENSE_FILES := \ + file://LICENSE;md5=e4426409957080ee0352128354cea2de + +# +# Prepare +# + +# +# meson +# +LIBDISPLAY_INFO_CONF_TOOL := meson +LIBDISPLAY_INFO_CONF_OPT := \ + $(CROSS_MESON_USR) + +# +# Target-Install +# + +$(STATEDIR)/libdisplay-info.targetinstall: + @$(call targetinfo) + + @$(call install_init, libdisplay-info) + @$(call install_fixup, libdisplay-info,PRIORITY,optional) + @$(call install_fixup, libdisplay-info,SECTION,base) + @$(call install_fixup, libdisplay-info,AUTHOR,"Philipp Zabel ") + @$(call install_fixup, libdisplay-info,DESCRIPTION,missing) + + @$(call install_lib, libdisplay-info, 0, 0, 0644, libdisplay-info) + + @$(call install_finish, libdisplay-info) + + @$(call touch) + +# vim: syntax=make -- 2.30.2
[ptxdist] [PATCH] libdisplay-info: version bump 0.1.0 -> 0.1.1
Renames display-info.pc to libdisplay-info.pc. Signed-off-by: Philipp Zabel --- rules/libdisplay-info.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libdisplay-info.make b/rules/libdisplay-info.make index c9b4c44d2894..b66867bf51b7 100644 --- a/rules/libdisplay-info.make +++ b/rules/libdisplay-info.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBDISPLAY_INFO) += libdisplay-info # # Paths and names # -LIBDISPLAY_INFO_VERSION:= 0.1.0 -LIBDISPLAY_INFO_MD5:= a313ab3d90aa8de3b1d9bb5460c05757 +LIBDISPLAY_INFO_VERSION:= 0.1.1 +LIBDISPLAY_INFO_MD5:= 56e8d2213d2aefd7defaaddfd9cb80e1 LIBDISPLAY_INFO:= libdisplay-info-$(LIBDISPLAY_INFO_VERSION) LIBDISPLAY_INFO_SUFFIX := tar.xz LIBDISPLAY_INFO_URL:= https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(LIBDISPLAY_INFO_VERSION)/downloads/$(LIBDISPLAY_INFO).$(LIBDISPLAY_INFO_SUFFIX) -- 2.30.2
[ptxdist] [PATCH] wayland-protocols: version bump 1.31 -> 1.32
Many fixes and clarifications. Added suspended toplevel state to xdg-shell protocol. New protocols: ext-foreign-toplevel-list, cursor-shape-v1, security-context-v1 Signed-off-by: Philipp Zabel --- rules/wayland-protocols.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make index 88b047d7662b..2396ed5cf3e1 100644 --- a/rules/wayland-protocols.make +++ b/rules/wayland-protocols.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols # # Paths and names # -WAYLAND_PROTOCOLS_VERSION := 1.31 -WAYLAND_PROTOCOLS_MD5 := 1584de13eb30a4d1f2cd06c08ee24354 +WAYLAND_PROTOCOLS_VERSION := 1.32 +WAYLAND_PROTOCOLS_MD5 := 00c2cedb0d2df714a0965a00c19385c6 WAYLAND_PROTOCOLS := wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION) WAYLAND_PROTOCOLS_SUFFIX := tar.xz WAYLAND_PROTOCOLS_URL := https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH] pipewire: version bump 0.3.72 -> 0.3.73
https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.73 Signed-off-by: Philipp Zabel --- rules/pipewire.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index d13ec03a93b0..8fbe8382c225 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.72 -PIPEWIRE_MD5 := 8e84abc4b0ef8fae254916be0f6deef5 +PIPEWIRE_VERSION := 0.3.73 +PIPEWIRE_MD5 := 64c6cfae9c29898133fe650e511b18e6 PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) -- 2.39.2
[ptxdist] [PATCH] host-meson: version bump 1.1.0 -> 1.2.0
https://mesonbuild.com/Release-notes-for-1-2-0.html
Signed-off-by: Philipp Zabel
---
...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++---
.../0002-HACK-enable-NEON-only-for-ARMv7.patch | 0
.../0003-HACK-don-t-fail-if-lrelease-is-missing.patch | 0
patches/{meson-1.1.0 => meson-1.2.0}/series | 0
rules/host-meson.make | 4 ++--
5 files changed, 5 insertions(+), 5 deletions(-)
rename patches/{meson-1.1.0 =>
meson-1.2.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
(91%)
rename patches/{meson-1.1.0 =>
meson-1.2.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (100%)
rename patches/{meson-1.1.0 =>
meson-1.2.0}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (100%)
rename patches/{meson-1.1.0 => meson-1.2.0}/series (100%)
diff --git
a/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
b/patches/meson-1.2.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 91%
rename from
patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to
patches/meson-1.2.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index d8e2667df74e..8fbe58b0cd5d 100644
---
a/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++
b/patches/meson-1.2.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
-index 5799caf76ee0..f466f4eae88c 100644
+index edd408572be0..409e12a5b0ad 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
-@@ -673,7 +673,10 @@ class GnuLikeDynamicLinkerMixin:
+@@ -676,7 +676,10 @@ class GnuLikeDynamicLinkerMixin:
# Need to deduplicate rpaths, as macOS's install_name_tool
# is *very* allergic to duplicate -delete_rpath arguments
# when calling depfixer on installation.
@@ -26,7 +26,7 @@ index 5799caf76ee0..f466f4eae88c 100644
rpath_dirs_to_remove = set()
for p in all_paths:
rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -701,7 +704,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -704,7 +707,8 @@ class GnuLikeDynamicLinkerMixin:
paths = padding
else:
paths = paths + ':' + padding
diff --git a/patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
b/patches/meson-1.2.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 100%
rename from patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.2.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
diff --git
a/patches/meson-1.1.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
b/patches/meson-1.2.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
similarity index 100%
rename from
patches/meson-1.1.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
rename to patches/meson-1.2.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
diff --git a/patches/meson-1.1.0/series b/patches/meson-1.2.0/series
similarity index 100%
rename from patches/meson-1.1.0/series
rename to patches/meson-1.2.0/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 8bbe79135e1a..fae56c539187 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
#
# Paths and names
#
-HOST_MESON_VERSION := 1.1.0
-HOST_MESON_MD5 := 94ea898bcf799470878e60809be80467
+HOST_MESON_VERSION := 1.2.0
+HOST_MESON_MD5 := 677616183f2c5e03e2139b06280129a0
HOST_MESON := meson-$(HOST_MESON_VERSION)
HOST_MESON_SUFFIX := tar.gz
HOST_MESON_URL :=
https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
--
2.39.2
[ptxdist] [PATCH] pipewire: version bump 0.3.71 -> 0.3.72
https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.72 Signed-off-by: Philipp Zabel --- rules/pipewire.make | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index b4b6a68a6012..d13ec03a93b0 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.71 -PIPEWIRE_MD5 := 6a40c2b641c7b1c42c508829e619a65e +PIPEWIRE_VERSION := 0.3.72 +PIPEWIRE_MD5 := 8e84abc4b0ef8fae254916be0f6deef5 PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) @@ -76,6 +76,7 @@ PIPEWIRE_CONF_OPT := \ -Dlegacy-rtkit=false \ -Dlibcamera=$(call ptx/endis,PTXCONF_PIPEWIRE_LIBCAMERA)d \ -Dlibcanberra=disabled \ + -Dlibffado=disabled \ -Dlibjack-path= \ -Dlibmysofa=disabled \ -Dlibpulse=disabled \ @@ -134,6 +135,8 @@ PIPEWIRE_MODULES-y := \ client-node \ combine-stream \ echo-cancel \ + netjack2-driver \ + netjack2-manager \ fallback-sink \ filter-chain \ link-factory \ -- 2.39.2
[ptxdist] [PATCH 5/7] vulkan-loader: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 01f83c3e678e..3def527d813a 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.3.250.0 -VULKAN_LOADER_MD5 := 93be6769ffcf4cd6f8d8513eec84a0ce +VULKAN_LOADER_VERSION := 1.3.250.1 +VULKAN_LOADER_MD5 := b028b31ad822e4cf918cd9c67806380b 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) -- 2.39.2
[ptxdist] [PATCH 6/7] vulkan-tools: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel
---
...Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch | 0
.../{vulkan-tools-1.3.250.0 => vulkan-tools-1.3.250.1}/series | 0
rules/vulkan-tools.make | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{vulkan-tools-1.3.250.0 =>
vulkan-tools-1.3.250.1}/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
(100%)
rename patches/{vulkan-tools-1.3.250.0 => vulkan-tools-1.3.250.1}/series (100%)
diff --git
a/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
b/patches/vulkan-tools-1.3.250.1/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
similarity index 100%
rename from
patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
rename to
patches/vulkan-tools-1.3.250.1/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
diff --git a/patches/vulkan-tools-1.3.250.0/series
b/patches/vulkan-tools-1.3.250.1/series
similarity index 100%
rename from patches/vulkan-tools-1.3.250.0/series
rename to patches/vulkan-tools-1.3.250.1/series
diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
index fb0d2ff69b27..f91efb413e50 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.3.250.0
-VULKAN_TOOLS_MD5 := 3443149cd1e65abdc4d81ff9f4a2d8ea
+VULKAN_TOOLS_VERSION := 1.3.250.1
+VULKAN_TOOLS_MD5 := 6fda3b5b1ce4731762bde59de092b20a
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.39.2
[ptxdist] [PATCH 7/7] vulkan-validationlayers: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel
---
...-Revert-cmake-Fix-find_-support-when-cross-compiling.patch | 0
.../series| 0
rules/vulkan-validationlayers.make| 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{vulkan-validationlayers-1.3.250.0 =>
vulkan-validationlayers-1.3.250.1}/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
(100%)
rename patches/{vulkan-validationlayers-1.3.250.0 =>
vulkan-validationlayers-1.3.250.1}/series (100%)
diff --git
a/patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
b/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
similarity index 100%
rename from
patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
rename to
patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
diff --git a/patches/vulkan-validationlayers-1.3.250.0/series
b/patches/vulkan-validationlayers-1.3.250.1/series
similarity index 100%
rename from patches/vulkan-validationlayers-1.3.250.0/series
rename to patches/vulkan-validationlayers-1.3.250.1/series
diff --git a/rules/vulkan-validationlayers.make
b/rules/vulkan-validationlayers.make
index 1d9361a745fa..ccf762c84f33 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.3.250.0
-VULKAN_VALIDATIONLAYERS_MD5:= 6452bc13fe2b6cb2b69641f572cb0b7a
+VULKAN_VALIDATIONLAYERS_VERSION:= 1.3.250.1
+VULKAN_VALIDATIONLAYERS_MD5:= f39e0385bd9f688487338956fe2f97c3
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)
--
2.39.2
[ptxdist] [PATCH] libjpeg: version bump 2.1.5.1 -> 3.0.0
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.90 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.0 Signed-off-by: Philipp Zabel --- rules/libjpeg.make | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rules/libjpeg.make b/rules/libjpeg.make index ca0b7735c4f0..0c7a412912d9 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg # # Paths and names # -LIBJPEG_VERSION:= 2.1.5.1 -LIBJPEG_MD5:= aed60d4d776dd5cf00b5a01c609d50f7 +LIBJPEG_VERSION:= 3.0.0 +LIBJPEG_MD5:= aa1f0a1c72cb6772e34d9d5136267f56 LIBJPEG_SUFFIX := tar.gz LIBJPEG:= libjpeg-turbo-$(LIBJPEG_VERSION) LIBJPEG_TARBALL:= $(LIBJPEG).$(LIBJPEG_SUFFIX) @@ -53,14 +53,12 @@ LIBJPEG_CONF_OPT := \ -DENABLE_STATIC=OFF \ -DFORCE_INLINE=ON \ -DREQUIRE_SIMD=OFF \ - -DWITH_12BIT=OFF \ -DWITH_ARITH_DEC=ON \ -DWITH_ARITH_ENC=ON \ -DWITH_FUZZ=OFF \ -DWITH_JAVA=OFF \ -DWITH_JPEG7=ON \ -DWITH_JPEG8=ON \ - -DWITH_MEM_SRCDST=ON \ -DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \ -DWITH_TURBOJPEG=$(call ptx/onoff,PTXCONF_LIBJPEG_TURBO) -- 2.39.2
[ptxdist] [PATCH 2/7] spirv-headers: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index 59d7734fe67d..28975c5b9d64 100644 --- a/rules/spirv-headers.make +++ b/rules/spirv-headers.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers # # Paths and names # -SPIRV_HEADERS_VERSION := 1.3.250.0 -SPIRV_HEADERS_MD5 := 86c097b6e1671344b399a5771db6ecdf +SPIRV_HEADERS_VERSION := 1.3.250.1 +SPIRV_HEADERS_MD5 := c3802825a51f8552320b5b61875bcc4c SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 3/7] spirv-tools: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index 8a4d460bc50d..0ba8e2e07d54 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:= 1.3.250.0 -SPIRV_TOOLS_MD5:= 3d9dea654f65a28285df53a65cafe252 +SPIRV_TOOLS_VERSION:= 1.3.250.1 +SPIRV_TOOLS_MD5:= 0d7431ced494b358b761948d47a8a560 SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 4/7] vulkan-headers: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel --- rules/vulkan-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make index 13aaeda147fc..9fdb9e4d0906 100644 --- a/rules/vulkan-headers.make +++ b/rules/vulkan-headers.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers # Paths and names # -VULKAN_HEADERS_VERSION := 1.3.250.0 -VULKAN_HEADERS_MD5 := 7e249b4a6d077a710dd1d6b4bab4dca6 +VULKAN_HEADERS_VERSION := 1.3.250.1 +VULKAN_HEADERS_MD5 := d325a08e8a82881029bdcde447452a75 VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) VULKAN_HEADERS_SUFFIX := tar.gz VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 1/7] glslang: version bump 1.3.250.0 -> 1.3.250.1
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index ac78dbe8db65..0a5100ca4aad 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.250.0 -GLSLANG_MD5:= e95504d25ed260c439f8031cc1d498e0 +GLSLANG_VERSION:= 1.3.250.1 +GLSLANG_MD5:= 8964663a374dfae4ed53143e909a6c44 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.39.2
[ptxdist] [PATCH] vulkan-loader: enable assembly on aarch64 and x86_64
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 02981278de60..97c57dc21313 100644 --- a/rules/vulkan-loader.make +++ b/rules/vulkan-loader.make @@ -45,8 +45,18 @@ VULKAN_LOADER_CONF_OPT := \ -DLOADER_ENABLE_ADDRESS_SANITIZER=OFF \ -DLOADER_ENABLE_THREAD_SANITIZER=OFF \ -DSYSCONFDIR= \ - -DUPDATE_DEPS=OFF \ - -DUSE_GAS=OFF + -DUPDATE_DEPS=OFF + +VULKAN_LOADER_USE_GAS := OFF +ifdef PTXCONF_ARCH_ARM64 +VULKAN_LOADER_USE_GAS := ON +endif +ifdef PTXCONF_ARCH_X86_64 +VULKAN_LOADER_USE_GAS := ON +endif + +VULKAN_LOADER_CONF_OPT += \ + -DUSE_GAS=$(VULKAN_LOADER_USE_GAS) # # Target-Install -- 2.39.2
[ptxdist] [PATCH] shaderc: version bump v2023.3 -> v2023.4
Signed-off-by: Philipp Zabel --- rules/shaderc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/shaderc.make b/rules/shaderc.make index 4144ac869a43..68660512dddb 100644 --- a/rules/shaderc.make +++ b/rules/shaderc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc # # Paths and names # -SHADERC_VERSION:= v2023.3 -SHADERC_MD5:= 5149e2beb4501830218edd4cfab68db5 +SHADERC_VERSION:= v2023.4 +SHADERC_MD5:= 6079248223fc14c77e5d3532681e7758 SHADERC:= shaderc-$(SHADERC_VERSION) SHADERC_SUFFIX := tar.gz SHADERC_URL:= \ -- 2.39.2
[ptxdist] [PATCH] mesalib: version bump 23.1.0 -> 23.1.1
https://docs.mesa3d.org/relnotes/23.1.1.html Signed-off-by: Philipp Zabel --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 379e169a0660..81fce1dabc81 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 23.1.0 -MESALIB_MD5:= 786ef9e01490654da0d4deb0f7a75700 +MESALIB_VERSION:= 23.1.1 +MESALIB_MD5:= 649177ce45f752c75b657288f3fc609a MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.39.2
[ptxdist] [PATCH 3/7] spirv-tools: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index fb469949ec9b..8a4d460bc50d 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:= 1.3.246.1 -SPIRV_TOOLS_MD5:= 9039e41e8294d1a6388935ad8d03837d +SPIRV_TOOLS_VERSION:= 1.3.250.0 +SPIRV_TOOLS_MD5:= 3d9dea654f65a28285df53a65cafe252 SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) @@ -62,8 +62,7 @@ SPIRV_TOOLS_CONF_OPT := \ -DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \ -DSPIRV_CHECK_CONTEXT=ON \ -DSPIRV_COLOR_TERMINAL=ON \ - -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ - -DSPIRV_HEADERS_SKIP_INSTALL=ON \ + -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \ -DSPIRV_LOG_DEBUG=OFF \ -DSPIRV_SKIP_EXECUTABLES=ON \ -DSPIRV_SKIP_TESTS=ON \ -- 2.39.2
[ptxdist] [PATCH 4/7] vulkan-headers: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel --- rules/vulkan-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make index 7b9bb2acbc38..13aaeda147fc 100644 --- a/rules/vulkan-headers.make +++ b/rules/vulkan-headers.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers # Paths and names # -VULKAN_HEADERS_VERSION := 1.3.246.1 -VULKAN_HEADERS_MD5 := 0b27bf3501317564abaa796adb8bfb00 +VULKAN_HEADERS_VERSION := 1.3.250.0 +VULKAN_HEADERS_MD5 := 7e249b4a6d077a710dd1d6b4bab4dca6 VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) VULKAN_HEADERS_SUFFIX := tar.gz VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 2/7] spirv-headers: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index af0770cf22b7..59d7734fe67d 100644 --- a/rules/spirv-headers.make +++ b/rules/spirv-headers.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers # # Paths and names # -SPIRV_HEADERS_VERSION := 1.3.246.1 -SPIRV_HEADERS_MD5 := 34931d32974d05449ddbbe0b86820f2e +SPIRV_HEADERS_VERSION := 1.3.250.0 +SPIRV_HEADERS_MD5 := 86c097b6e1671344b399a5771db6ecdf SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) @@ -31,7 +31,6 @@ SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae SPIRV_HEADERS_CONF_TOOL:= cmake SPIRV_HEADERS_CONF_OPT := \ $(CROSS_CMAKE_USR) \ - -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ - -DSPIRV_HEADERS_SKIP_INSTALL=OFF + -DBUILD_TESTS=OFF # vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 7/7] vulkan-validationlayers: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel
---
...r-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch | 201 --
.../vulkan-validationlayers-1.3.246.1/series | 5 -
...x-find_-support-when-cross-compiling.patch | 4 +-
.../vulkan-validationlayers-1.3.250.0/series | 4 +
rules/vulkan-validationlayers.make| 4 +-
5 files changed, 8 insertions(+), 210 deletions(-)
delete mode 100644
patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
delete mode 100644 patches/vulkan-validationlayers-1.3.246.1/series
rename patches/{vulkan-validationlayers-1.3.246.1 =>
vulkan-validationlayers-1.3.250.0}/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
(92%)
create mode 100644 patches/vulkan-validationlayers-1.3.250.0/series
diff --git
a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
b/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
deleted file mode 100644
index 3b625e31120f..
---
a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From: Niklas Haas
-Date: Thu, 20 Apr 2023 11:51:49 +0200
-Subject: [PATCH] layers: Fix UB for VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT
-
-Several codepaths in the layers called into
-vkGetPhysicalDeviceImageFormatProperties2KHR without including a valid
-VkPhysicalDeviceImageDrmFormatModifierInfoEXT, despite this being a
-requirement for images with DRM format modifier tiling.
-
-For the vkBindImageMemory check, there is a hypothetical possibility of
-the driver returning VK_ERROR_OUT_OF_HOST_MEMORY when querying the
-image's DRM format. In this case, for lack of anything better to do, we
-preserve the current behavior.
-
-It might make more sense to query the DRM format modifier immediately
-after image creation and cache it inside the image state, but I didn't
-want to make that (more invasive) change myself.
-
-As an aside, we also correctly specify the specified `sharingMode` when
-querying for DRM modifier support, which the current code failed to do
-properly.
-
-Co-authored-by: Simon Ser
-
-closes #5649
-closes #5687
-
-(cherry picked from commit ce2c6eff3457a331efd64da800c5ac393285cf40)
-
-Signed-off-by: Philipp Zabel
- layers/core_checks/device_memory_validation.cpp | 18 ++-
- layers/core_checks/image_validation.cpp | 72 -
- 2 files changed, 62 insertions(+), 28 deletions(-)
-
-diff --git a/layers/core_checks/device_memory_validation.cpp
b/layers/core_checks/device_memory_validation.cpp
-index 4a98d6f0922d..555985957dce 100644
a/layers/core_checks/device_memory_validation.cpp
-+++ b/layers/core_checks/device_memory_validation.cpp
-@@ -887,7 +887,7 @@ bool CoreChecks::PreCallValidateMapMemory(VkDevice device,
VkDeviceMemory mem, V
- return skip;
- }
-
--bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const
VkMemoryMapInfoKHR* pMemoryMapInfo, void **ppData) const {
-+bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const
VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData) const {
- bool skip = false;
- auto mem_info = Get(pMemoryMapInfo->memory);
- if (mem_info) {
-@@ -905,7 +905,7 @@ bool CoreChecks::PreCallValidateUnmapMemory(VkDevice
device, VkDeviceMemory mem)
- return skip;
- }
-
--bool CoreChecks::PreCallValidateUnmapMemory2KHR(VkDevice device, const
VkMemoryUnmapInfoKHR* pMemoryUnmapInfo) const {
-+bool CoreChecks::PreCallValidateUnmapMemory2KHR(VkDevice device, const
VkMemoryUnmapInfoKHR *pMemoryUnmapInfo) const {
- bool skip = false;
- auto mem_info = Get(pMemoryUnmapInfo->memory);
- if (mem_info && !mem_info->mapped_range.size) {
-@@ -1269,6 +1269,10 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t
bindInfoCount, const VkBindIma
-
- // Validate export memory handles
- if (mem_info->export_handle_type_flags != 0) {
-+auto drm_format_modifier =
LvlInitStruct();
-+drm_format_modifier.sharingMode =
image_state->createInfo.sharingMode;
-+drm_format_modifier.queueFamilyIndexCount =
image_state->createInfo.queueFamilyIndexCount;
-+drm_format_modifier.pQueueFamilyIndices =
image_state->createInfo.pQueueFamilyIndices;
- auto external_info =
LvlInitStruct();
- auto image_info =
LvlInitStruct(_info);
- image_info.format = image_state->createInfo.format;
-@@ -1283,6 +1287,16 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t
bindInfoCount, const VkBindIma
- // Check export operation support
- auto check_export_support =
[&](VkExternalMemoryHandleTypeFlagBits flag) {
-
[ptxdist] [PATCH 5/7] vulkan-loader: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 02981278de60..d09a78778ffe 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.3.246.1 -VULKAN_LOADER_MD5 := ff7ef0192c49f5d16883bb32f49c4adf +VULKAN_LOADER_VERSION := 1.3.250.0 +VULKAN_LOADER_MD5 := 93be6769ffcf4cd6f8d8513eec84a0ce 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) @@ -32,7 +32,6 @@ VULKAN_LOADER_CONF_TOOL := cmake VULKAN_LOADER_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross \ -DBUILD_TESTS=OFF \ -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ -- 2.39.2
[ptxdist] [PATCH 6/7] vulkan-tools: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel
---
...-CMAKE_FIND_ROOT_PATH-when-cross-com.patch | 34 +++
patches/vulkan-tools-1.3.250.0/series | 4 +++
rules/vulkan-tools.make | 8 +++--
3 files changed, 43 insertions(+), 3 deletions(-)
create mode 100644
patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
create mode 100644 patches/vulkan-tools-1.3.250.0/series
diff --git
a/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
new file mode 100644
index ..c13f0b026a84
--- /dev/null
+++
b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
@@ -0,0 +1,34 @@
+From: Philipp Zabel
+Date: Tue, 16 May 2023 10:04:03 +0200
+Subject: [PATCH] Stop overwriting CMAKE_FIND_ROOT_PATH when cross compiling
+
+PTXdist uses CMAKE_FIND_ROOT_PATH [1] to instruct CMake where to find
+package information when cross-compiling. Stop overwriting this with
+the contents of CMAKE_PREFIX_PATH [2] in the build system.
+
+[1] https://cmake.org/cmake/help/v3.25/variable/CMAKE_FIND_ROOT_PATH.html
+[2] https://cmake.org/cmake/help/v3.25/variable/CMAKE_PREFIX_PATH.html
+
+This issue was introduced with commit e99e3c640ab7 ("cmake: Add
+UPDATE_DEPS functionality"). It is similar to the same issue in
+vulkan-validationlayers.
+
+Signed-off-by: Philipp Zabel
+---
+ scripts/CMakeLists.txt | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 5b979d43de59..3b1ddbdff685 100644
+--- a/scripts/CMakeLists.txt
b/scripts/CMakeLists.txt
+@@ -113,8 +113,4 @@ if (MOLTENVK_REPO_ROOT)
+ list(APPEND CMAKE_PREFIX_PATH ${MOLTENVK_REPO_ROOT})
+ endif()
+
+-if (CMAKE_CROSSCOMPILING)
+-set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+-else()
+-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+-endif()
++set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
diff --git a/patches/vulkan-tools-1.3.250.0/series
b/patches/vulkan-tools-1.3.250.0/series
new file mode 100644
index ..3ed158f8be1d
--- /dev/null
+++ b/patches/vulkan-tools-1.3.250.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
+# ea2ba1941cc64bfae752632f0830f963 - git-ptx-patches magic
diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
index dfe608e4a389..fb0d2ff69b27 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.3.246.1
-VULKAN_TOOLS_MD5 := b6a7c6c46d9ca6c75ce6b9f3777b8e5f
+VULKAN_TOOLS_VERSION := 1.3.250.0
+VULKAN_TOOLS_MD5 := 3443149cd1e65abdc4d81ff9f4a2d8ea
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)
@@ -40,7 +40,9 @@ VULKAN_TOOLS_CONF_OPT := \
-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \
-DBUILD_WSI_XLIB_SUPPORT=OFF \
-DENABLE_ADDRESS_SANITIZER=OFF \
- -DINSTALL_ICD=OFF
+ -DINSTALL_ICD=OFF \
+ -DTOOLS_CODEGEN=OFF \
+ -DUPDATE_DEPS=OFF
ifdef PTXCONF_VULKAN_TOOLS_CUBE
VULKAN_TOOLS_CONF_OPT += \
--
2.39.2
[ptxdist] [PATCH 1/7] glslang: version bump 1.3.246.1 -> 1.3.250.0
Signed-off-by: Philipp Zabel --- rules/glslang.make | 7 +++ rules/host-glslang.make | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index f79d60f7d458..ac78dbe8db65 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.246.1 -GLSLANG_MD5:= b55b5074e5d3e587b564d9159a1551a1 +GLSLANG_VERSION:= 1.3.250.0 +GLSLANG_MD5:= e95504d25ed260c439f8031cc1d498e0 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) @@ -43,8 +43,7 @@ GLSLANG_CONF_OPT := \ -DENABLE_PCH=ON \ -DENABLE_RTTI=OFF \ -DENABLE_SPVREMAPPER=ON \ - -DSKIP_GLSLANG_INSTALL=OFF \ - -DUSE_CCACHE=OFF + -DSKIP_GLSLANG_INSTALL=OFF # # Target-Install diff --git a/rules/host-glslang.make b/rules/host-glslang.make index dcdaa0ee27ab..22a8a26b7701 100644 --- a/rules/host-glslang.make +++ b/rules/host-glslang.make @@ -30,7 +30,6 @@ HOST_GLSLANG_CONF_OPT := \ -DENABLE_PCH=ON \ -DENABLE_RTTI=OFF \ -DENABLE_SPVREMAPPER=ON \ - -DSKIP_GLSLANG_INSTALL=OFF \ - -DUSE_CCACHE=OFF + -DSKIP_GLSLANG_INSTALL=OFF # vim: syntax=make -- 2.39.2
[ptxdist] [PATCH] wayland-utils: version bump 1.1.0 -> 1.2.0
Enable libdrm dependency to support printing modifier names. Signed-off-by: Philipp Zabel --- rules/wayland-utils.in | 1 + rules/wayland-utils.make | 7 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rules/wayland-utils.in b/rules/wayland-utils.in index 49161fcc1797..65ddd9c9afe5 100644 --- a/rules/wayland-utils.in +++ b/rules/wayland-utils.in @@ -3,6 +3,7 @@ config WAYLAND_UTILS tristate select HOST_MESON + select LIBDRM select WAYLAND select WAYLAND_PROTOCOLS prompt "wayland-utils" diff --git a/rules/wayland-utils.make b/rules/wayland-utils.make index 28c2f493baa1..cc90ecc447f5 100644 --- a/rules/wayland-utils.make +++ b/rules/wayland-utils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_UTILS) += wayland-utils # # Paths and names # -WAYLAND_UTILS_VERSION := 1.1.0 -WAYLAND_UTILS_MD5 := 1a398cbb75c3ac1ac231b2a8f84bd6d6 +WAYLAND_UTILS_VERSION := 1.2.0 +WAYLAND_UTILS_MD5 := 736dbcefc534407d4e774087726844a1 WAYLAND_UTILS := wayland-utils-$(WAYLAND_UTILS_VERSION) WAYLAND_UTILS_SUFFIX := tar.xz WAYLAND_UTILS_URL := https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(WAYLAND_UTILS_VERSION)/downloads/$(WAYLAND_UTILS).$(WAYLAND_UTILS_SUFFIX) @@ -33,7 +33,8 @@ WAYLAND_UTILS_LICENSE_FILES := file://COPYING;md5=548a66038a77415e1df51118625e83 # WAYLAND_UTILS_CONF_TOOL:= meson WAYLAND_UTILS_CONF_OPT := \ - $(CROSS_MESON_USR) + $(CROSS_MESON_USR) \ + -Ddrm=enabled # # Target-Install -- 2.39.2
[ptxdist] [PATCH v2] vulkan-loader: enable assembly on aarch64 and x86_64
Fixes the following CMake warning during prepare: Assembly sources have been disabled The build will fall back on building with C code Note that this may be unsafe, as the C code requires tail-call optimizations to remove the stack frame for certain calls. If the compiler does not do this, then unknown device extensions will suffer from a corrupted stack. Signed-off-by: Philipp Zabel --- v2: move VULKAN_LOADER_USE_GAS above VULKAN_LOADER_CONF_OPT --- rules/vulkan-loader.make | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index d09a78778ffe..7e4e4df2ad5d 100644 --- a/rules/vulkan-loader.make +++ b/rules/vulkan-loader.make @@ -29,6 +29,15 @@ VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee428 # VULKAN_LOADER_CONF_TOOL:= cmake + +VULKAN_LOADER_USE_GAS := OFF +ifdef PTXCONF_ARCH_ARM64 +VULKAN_LOADER_USE_GAS := ON +endif +ifdef PTXCONF_ARCH_X86_64 +VULKAN_LOADER_USE_GAS := ON +endif + VULKAN_LOADER_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ @@ -45,7 +54,7 @@ VULKAN_LOADER_CONF_OPT:= \ -DLOADER_ENABLE_THREAD_SANITIZER=OFF \ -DSYSCONFDIR= \ -DUPDATE_DEPS=OFF \ - -DUSE_GAS=OFF + -DUSE_GAS=$(VULKAN_LOADER_USE_GAS) # # Target-Install -- 2.39.2
[ptxdist] [PATCH] seatd: version bump 0.7.0 -> 0.8.0
Signed-off-by: Philipp Zabel --- rules/seatd.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/seatd.make b/rules/seatd.make index 03795d492a30..b5bdb23a0ad1 100644 --- a/rules/seatd.make +++ b/rules/seatd.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_SEATD) += seatd # # Paths and names # -SEATD_VERSION := 0.7.0 -SEATD_MD5 := 922b8a4ca4dfdb1f43a294db9e77bcf7 a326424b2fccf8d6ae630063ba735aa1 +SEATD_VERSION := 0.8.0 +SEATD_MD5 := 7c687ded0fa4db2352a8c9a6b41abca7 SEATD := seatd-$(SEATD_VERSION) SEATD_SUFFIX := tar.gz SEATD_URL := https://git.sr.ht/~kennylevinsen/seatd/archive/$(SEATD_VERSION).$(SEATD_SUFFIX) -- 2.39.2
[ptxdist] [PATCH] configure_helper: ignore new Meson 1.2.0 builtin options
Ignore new Meson builtin options "genvslite" (since 1.2.0) and "python.bytecompile" (since 1.2.0). Signed-off-by: Philipp Zabel --- scripts/configure_helper.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py index d5abc5a02c1a..8beeaea5159a 100755 --- a/scripts/configure_helper.py +++ b/scripts/configure_helper.py @@ -139,6 +139,7 @@ meson_blacklist = [ "default_library", "errorlogs", "force_fallback_for", + "genvslite", "includedir", "infodir", "install_umask", @@ -151,6 +152,7 @@ meson_blacklist = [ "optimization", "pkg_config_path", "prefer_static", + "python.bytecompile", "python.install_env", "python.platlibdir", "python.purelibdir", -- 2.39.2
[ptxdist] [PATCH 11/11] gst-plugins-rs: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel
---
...01-allow-executing-cargo-with-frozen.patch | 2 +-
.../series| 0
rules/gst-plugins-rs.cargo.make | 746 --
rules/gst-plugins-rs.make | 4 +-
4 files changed, 331 insertions(+), 421 deletions(-)
rename patches/{gst-plugins-rs-1.22.4 =>
gst-plugins-rs-1.22.5}/0001-allow-executing-cargo-with-frozen.patch (97%)
rename patches/{gst-plugins-rs-1.22.4 => gst-plugins-rs-1.22.5}/series (100%)
diff --git
a/patches/gst-plugins-rs-1.22.4/0001-allow-executing-cargo-with-frozen.patch
b/patches/gst-plugins-rs-1.22.5/0001-allow-executing-cargo-with-frozen.patch
similarity index 97%
rename from
patches/gst-plugins-rs-1.22.4/0001-allow-executing-cargo-with-frozen.patch
rename to
patches/gst-plugins-rs-1.22.5/0001-allow-executing-cargo-with-frozen.patch
index bd7fde664032..93a33d156306 100644
--- a/patches/gst-plugins-rs-1.22.4/0001-allow-executing-cargo-with-frozen.patch
+++ b/patches/gst-plugins-rs-1.22.5/0001-allow-executing-cargo-with-frozen.patch
@@ -32,7 +32,7 @@ index c13a7b05e943..80960dc167ce 100644
cargo_cmd += ['--target', rustc_target]
if features:
diff --git a/meson.build b/meson.build
-index dfe2583870df..5b36281a9c83 100644
+index d50ce316a42c..e293c6ed11f8 100644
--- a/meson.build
+++ b/meson.build
@@ -367,6 +367,10 @@ if get_option('doc').disabled()
diff --git a/patches/gst-plugins-rs-1.22.4/series
b/patches/gst-plugins-rs-1.22.5/series
similarity index 100%
rename from patches/gst-plugins-rs-1.22.4/series
rename to patches/gst-plugins-rs-1.22.5/series
diff --git a/rules/gst-plugins-rs.cargo.make b/rules/gst-plugins-rs.cargo.make
index 348868cc1d84..849074eb4605 100644
--- a/rules/gst-plugins-rs.cargo.make
+++ b/rules/gst-plugins-rs.cargo.make
@@ -11,13 +11,13 @@
# should not be modified manually!
#
-GST_PLUGINS_RS_CARGO_LOCK_MD5 := d867595f43e91d6fc464eeeb6e7d63b0
+GST_PLUGINS_RS_CARGO_LOCK_MD5 := 9980258946c333efa7167b1a97d2a0af
-GST_PLUGINS_RS_ADDR2LINE_0_19_0_MD5:=
b8e7ee27350aad1efd1cbe7a6a32c551
-GST_PLUGINS_RS_ADDR2LINE_0_19_0_URL:=
https://crates.io/api/v1/crates/addr2line/0.19.0/download
-GST_PLUGINS_RS_ADDR2LINE_0_19_0_SOURCE := $(SRCDIR)/addr2line-0.19.0.crate
-$(GST_PLUGINS_RS_ADDR2LINE_0_19_0_SOURCE) :=
GST_PLUGINS_RS_ADDR2LINE_0_19_0
-GST_PLUGINS_RS_SOURCES +=
$(GST_PLUGINS_RS_ADDR2LINE_0_19_0_SOURCE)
+GST_PLUGINS_RS_ADDR2LINE_0_20_0_MD5:=
77f7d0562b10dd33e0f61705427d3214
+GST_PLUGINS_RS_ADDR2LINE_0_20_0_URL:=
https://crates.io/api/v1/crates/addr2line/0.20.0/download
+GST_PLUGINS_RS_ADDR2LINE_0_20_0_SOURCE := $(SRCDIR)/addr2line-0.20.0.crate
+$(GST_PLUGINS_RS_ADDR2LINE_0_20_0_SOURCE) :=
GST_PLUGINS_RS_ADDR2LINE_0_20_0
+GST_PLUGINS_RS_SOURCES +=
$(GST_PLUGINS_RS_ADDR2LINE_0_20_0_SOURCE)
GST_PLUGINS_RS_ADLER_1_0_2_MD5 := 669215548c64019c08c92b2c1afd3deb
GST_PLUGINS_RS_ADLER_1_0_2_URL :=
https://crates.io/api/v1/crates/adler/1.0.2/download
@@ -73,11 +73,11 @@ GST_PLUGINS_RS_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE
:= $(SRCDIR)/android_syste
$(GST_PLUGINS_RS_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) :=
GST_PLUGINS_RS_ANDROID_SYSTEM_PROPERTIES_0_1_5
GST_PLUGINS_RS_SOURCES +=
$(GST_PLUGINS_RS_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE)
-GST_PLUGINS_RS_ANYHOW_1_0_71_MD5 :=
4c9a1214cc77912e9a91eb20314da961
-GST_PLUGINS_RS_ANYHOW_1_0_71_URL :=
https://crates.io/api/v1/crates/anyhow/1.0.71/download
-GST_PLUGINS_RS_ANYHOW_1_0_71_SOURCE:= $(SRCDIR)/anyhow-1.0.71.crate
-$(GST_PLUGINS_RS_ANYHOW_1_0_71_SOURCE) := GST_PLUGINS_RS_ANYHOW_1_0_71
-GST_PLUGINS_RS_SOURCES +=
$(GST_PLUGINS_RS_ANYHOW_1_0_71_SOURCE)
+GST_PLUGINS_RS_ANYHOW_1_0_72_MD5 :=
b889f8d54e2eab956d0bd28715c34a2c
+GST_PLUGINS_RS_ANYHOW_1_0_72_URL :=
https://crates.io/api/v1/crates/anyhow/1.0.72/download
+GST_PLUGINS_RS_ANYHOW_1_0_72_SOURCE:= $(SRCDIR)/anyhow-1.0.72.crate
+$(GST_PLUGINS_RS_ANYHOW_1_0_72_SOURCE) := GST_PLUGINS_RS_ANYHOW_1_0_72
+GST_PLUGINS_RS_SOURCES +=
$(GST_PLUGINS_RS_ANYHOW_1_0_72_SOURCE)
GST_PLUGINS_RS_ARBITRARY_0_4_7_MD5 :=
8b691942e7e4e57e24d5c4421c050491
GST_PLUGINS_RS_ARBITRARY_0_4_7_URL :=
https://crates.io/api/v1/crates/arbitrary/0.4.7/download
@@ -103,17 +103,17 @@ GST_PLUGINS_RS_ASYNC_ATTRIBUTES_1_1_2_SOURCE :=
$(SRCDIR)/async-attributes-1.1.2
$(GST_PLUGINS_RS_ASYNC_ATTRIBUTES_1_1_2_SOURCE):=
GST_PLUGINS_RS_ASYNC_ATTRIBUTES_1_1_2
GST_PLUGINS_RS_SOURCES +=
$(GST_PLUGINS_RS_ASYNC_ATTRIBUTES_1_1_2_SOURCE)
-GST_PLUGINS_RS_ASYNC_CHANNEL_1_8_0_MD5 :=
3b66520f824a5a16dbb507acdcf897d3
-GST_PLUGINS_RS_ASYNC_CHANNEL_1_8_0_URL :=
https://crates.io/api/v1/crates/async-channel/1.8.0/download
-GST_PLUGINS_RS_ASYNC_CHANNEL_1_8_0_
[ptxdist] [PATCH 09/11] gstreamer-vaapi1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gstreamer-vaapi1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gstreamer-vaapi1.make b/rules/gstreamer-vaapi1.make index b3f492c4cdfc..fa051d9bf3e2 100644 --- a/rules/gstreamer-vaapi1.make +++ b/rules/gstreamer-vaapi1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GSTREAMER_VAAPI1) += gstreamer-vaapi1 # # Paths and names # -GSTREAMER_VAAPI1_VERSION := 1.22.4 -GSTREAMER_VAAPI1_MD5 := 5521a495f1f3de5be8f3abb1c37b80a1 +GSTREAMER_VAAPI1_VERSION := 1.22.5 +GSTREAMER_VAAPI1_MD5 := 362ecdcfb23a7cf73e757c7692153279 GSTREAMER_VAAPI1 := gstreamer-vaapi-$(GSTREAMER_VAAPI1_VERSION) GSTREAMER_VAAPI1_SUFFIX:= tar.xz GSTREAMER_VAAPI1_URL := http://gstreamer.freedesktop.org/src/gstreamer-vaapi/$(GSTREAMER_VAAPI1).$(GSTREAMER_VAAPI1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 07/11] gst-python1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-python1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-python1.make b/rules/gst-python1.make index d7ece8466c74..d63df11457fb 100644 --- a/rules/gst-python1.make +++ b/rules/gst-python1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PYTHON1) += gst-python1 # # Paths and names # -GST_PYTHON1_VERSION:= 1.22.4 -GST_PYTHON1_MD5:= 93e6a1aa5bee6343ab26928ce91a8ea9 +GST_PYTHON1_VERSION:= 1.22.5 +GST_PYTHON1_MD5:= d68ad23bea368c3a6aa0f60799cb72fb GST_PYTHON1:= gst-python-$(GST_PYTHON1_VERSION) GST_PYTHON1_SUFFIX := tar.xz GST_PYTHON1_URL:= http://gstreamer.freedesktop.org/src/gst-python/$(GST_PYTHON1).$(GST_PYTHON1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 10/11] gstreamer1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gstreamer1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make index 7db66741e9a5..6381ca857c07 100644 --- a/rules/gstreamer1.make +++ b/rules/gstreamer1.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GSTREAMER1) += gstreamer1 # # Paths and names # -GSTREAMER1_VERSION := 1.22.4 -GSTREAMER1_MD5 := 04e1a3ce2a5b107b67892a7c7de5b326 +GSTREAMER1_VERSION := 1.22.5 +GSTREAMER1_MD5 := b138307f1f84ed3a77a22a337e2af398 GSTREAMER1 := gstreamer-$(GSTREAMER1_VERSION) GSTREAMER1_SUFFIX := tar.xz GSTREAMER1_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER1).$(GSTREAMER1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 08/11] gst-rtsp-server1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-rtsp-server1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-rtsp-server1.make b/rules/gst-rtsp-server1.make index c92a3d19fa28..a5547d52762e 100644 --- a/rules/gst-rtsp-server1.make +++ b/rules/gst-rtsp-server1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_RTSP_SERVER1) += gst-rtsp-server1 # # Paths and names # -GST_RTSP_SERVER1_VERSION := 1.22.4 -GST_RTSP_SERVER1_MD5 := ffc6db39b72e836e5b99124b7876dc4c +GST_RTSP_SERVER1_VERSION := 1.22.5 +GST_RTSP_SERVER1_MD5 := 5548b0d70823eb7cc44410b40d90e1e4 GST_RTSP_SERVER1 := gst-rtsp-server-$(GST_RTSP_SERVER1_VERSION) GST_RTSP_SERVER1_SUFFIX:= tar.xz GST_RTSP_SERVER1_URL := http://gstreamer.freedesktop.org/src/gst-rtsp/$(GST_RTSP_SERVER1).$(GST_RTSP_SERVER1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 06/11] gst-plugins-ugly1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-plugins-ugly1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-plugins-ugly1.make b/rules/gst-plugins-ugly1.make index c4891b7e4ba7..c1a74f90c56e 100644 --- a/rules/gst-plugins-ugly1.make +++ b/rules/gst-plugins-ugly1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_UGLY1) += gst-plugins-ugly1 # # Paths and names # -GST_PLUGINS_UGLY1_VERSION := 1.22.4 -GST_PLUGINS_UGLY1_MD5 := 2beed209d131fb4b997183b11ced9fce +GST_PLUGINS_UGLY1_VERSION := 1.22.5 +GST_PLUGINS_UGLY1_MD5 := 8649b3c009336f1ebfeb1b7e3931a3a0 GST_PLUGINS_UGLY1 := gst-plugins-ugly-$(GST_PLUGINS_UGLY1_VERSION) GST_PLUGINS_UGLY1_SUFFIX := tar.xz GST_PLUGINS_UGLY1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY1).$(GST_PLUGINS_UGLY1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 02/11] gst-libav1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-libav1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-libav1.make b/rules/gst-libav1.make index ab833e12cc53..617c8d55a43b 100644 --- a/rules/gst-libav1.make +++ b/rules/gst-libav1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_LIBAV1) += gst-libav1 # # Paths and names # -GST_LIBAV1_VERSION := 1.22.4 -GST_LIBAV1_MD5 := b6cdc8d1580df63f4dd3ac6dc1eb0e85 +GST_LIBAV1_VERSION := 1.22.5 +GST_LIBAV1_MD5 := 311e8ee493124a739ca937fbb3d1ae88 GST_LIBAV1 := gst-libav-$(GST_LIBAV1_VERSION) GST_LIBAV1_SUFFIX := tar.xz GST_LIBAV1_URL := http://gstreamer.freedesktop.org/src/gst-libav/$(GST_LIBAV1).$(GST_LIBAV1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 03/11] gst-plugins-bad1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-plugins-bad1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make index 111e31608353..d4c198b8a59c 100644 --- a/rules/gst-plugins-bad1.make +++ b/rules/gst-plugins-bad1.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BAD1) += gst-plugins-bad1 # # Paths and names # -GST_PLUGINS_BAD1_VERSION := 1.22.4 -GST_PLUGINS_BAD1_MD5 := 1fc0788308eeaa9f3af8c69c9577caa8 +GST_PLUGINS_BAD1_VERSION := 1.22.5 +GST_PLUGINS_BAD1_MD5 := d18cde538d5c954e94f888143e703a52 GST_PLUGINS_BAD1 := gst-plugins-bad-$(GST_PLUGINS_BAD1_VERSION) GST_PLUGINS_BAD1_SUFFIX:= tar.xz GST_PLUGINS_BAD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD1).$(GST_PLUGINS_BAD1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 04/11] gst-plugins-base1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-plugins-base1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make index fe7571e9e697..795814d3296e 100644 --- a/rules/gst-plugins-base1.make +++ b/rules/gst-plugins-base1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BASE1) += gst-plugins-base1 # # Paths and names # -GST_PLUGINS_BASE1_VERSION := 1.22.4 -GST_PLUGINS_BASE1_MD5 := 7d495970b0b7078c50d064d228b8d93f +GST_PLUGINS_BASE1_VERSION := 1.22.5 +GST_PLUGINS_BASE1_MD5 := cc16aeaefdfd3917e009412a22d07fac GST_PLUGINS_BASE1 := gst-plugins-base-$(GST_PLUGINS_BASE1_VERSION) GST_PLUGINS_BASE1_SUFFIX := tar.xz GST_PLUGINS_BASE1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 05/11] gst-plugins-good1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-plugins-good1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make index 988cc6820ebc..5cd5d79285d6 100644 --- a/rules/gst-plugins-good1.make +++ b/rules/gst-plugins-good1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1 # # Paths and names # -GST_PLUGINS_GOOD1_VERSION := 1.22.4 -GST_PLUGINS_GOOD1_MD5 := 6d8134ee72fd3e0fd5d92640e149721f +GST_PLUGINS_GOOD1_VERSION := 1.22.5 +GST_PLUGINS_GOOD1_MD5 := 8c5a67f702ff5f30290be35ac27b3ac9 GST_PLUGINS_GOOD1 := gst-plugins-good-$(GST_PLUGINS_GOOD1_VERSION) GST_PLUGINS_GOOD1_SUFFIX := tar.xz GST_PLUGINS_GOOD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 01/11] gst-devtools1: version bump 1.22.4 -> 1.22.5
Signed-off-by: Philipp Zabel --- rules/gst-devtools1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-devtools1.make b/rules/gst-devtools1.make index b83a528ffb59..ce7483ec6ba7 100644 --- a/rules/gst-devtools1.make +++ b/rules/gst-devtools1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_DEVTOOLS1) += gst-devtools1 # # Paths and names # -GST_DEVTOOLS1_VERSION := 1.22.4 -GST_DEVTOOLS1_MD5 := 53c732ff505ecee9b61158d95d2b53de +GST_DEVTOOLS1_VERSION := 1.22.5 +GST_DEVTOOLS1_MD5 := 6274b3c926e14c269aece3cbbefdce00 GST_DEVTOOLS1 := gst-devtools-$(GST_DEVTOOLS1_VERSION) GST_DEVTOOLS1_SUFFIX := tar.xz GST_DEVTOOLS1_URL := http://gstreamer.freedesktop.org/data/src/gst-devtools/$(GST_DEVTOOLS1).$(GST_DEVTOOLS1_SUFFIX) -- 2.39.2
[ptxdist] [PATCH] pipewire: version bump 0.3.73 -> 0.3.76
https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.76 Signed-off-by: Philipp Zabel --- rules/pipewire.make | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index 8fbe8382c225..fa8e88ed228a 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 0.3.73 -PIPEWIRE_MD5 := 64c6cfae9c29898133fe650e511b18e6 +PIPEWIRE_VERSION := 0.3.76 +PIPEWIRE_MD5 := 10bf151d8a790f8684c9c85eb18507f9 PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) @@ -156,7 +156,9 @@ PIPEWIRE_MODULES-y := \ spa-device \ spa-device-factory \ spa-node \ - spa-node-factory + spa-node-factory \ + vban-send \ + vban-recv PIPEWIRE_MODULES-$(PTXCONF_PIPEWIRE_RAOP) += raop-sink -- 2.39.2
[ptxdist] [PATCH] mesalib: version bump 23.1.2 -> 23.1.3
https://docs.mesa3d.org/relnotes/23.1.3.html Signed-off-by: Philipp Zabel --- rules/host-mesalib.make | 1 + rules/mesalib.make | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index 3412cdb3db11..8bf018168bbb 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -34,6 +34,7 @@ HOST_MESALIB_CONF_OPT := \ -Degl-lib-suffix= \ -Degl-native-platform=auto \ -Dexecmem=true \ + -Dexpat=disabled \ -Dfreedreno-kmds= \ -Dgallium-d3d10umd=false \ -Dgallium-d3d12-video=disabled \ diff --git a/rules/mesalib.make b/rules/mesalib.make index e76f17cea391..12632fb162d9 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 23.1.2 -MESALIB_MD5:= 0e9859110df4425e83186e0645452daa +MESALIB_VERSION:= 23.1.3 +MESALIB_MD5:= 0dce0342dbf08dc5afbaf51e729da1a1 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ @@ -156,6 +156,7 @@ MESALIB_CONF_OPT:= \ -Degl-native-platform=auto \ -Denable-glcpp-tests=false \ -Dexecmem=true \ + -Dexpat=enabled \ -Dfreedreno-kmds=msm \ -Dgallium-d3d10umd=false \ -Dgallium-d3d12-video=disabled \ -- 2.39.2
[ptxdist] [PATCH v2] wayland-utils: version bump 1.1.0 -> 1.2.0
Enable libdrm dependency to support printing modifier names. Signed-off-by: Philipp Zabel --- v2: drop mainlined patch --- ...ayland-info-Fix-build-without-libdrm.patch | 38 --- patches/wayland-utils-1.1.0/series| 4 -- rules/wayland-utils.in| 1 + rules/wayland-utils.make | 7 ++-- 4 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch delete mode 100644 patches/wayland-utils-1.1.0/series diff --git a/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch b/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch deleted file mode 100644 index 2b994421aed7.. --- a/patches/wayland-utils-1.1.0/0001-wayland-info-Fix-build-without-libdrm.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Olivier Fourdan -Date: Wed, 14 Sep 2022 09:07:10 +0200 -Subject: [PATCH] wayland-info: Fix build without libdrm - -wayland-info can optionally use libdrm to provide a description of the -dmabuf format modifiers. - -When not using libdrm however, the build fails because "dev_t" is not -defined. - -The definition of "dev_t" comes from which is included -from , which is not included without libdrm support, hence the -build failure. - -Simply include unconditionally to make sure "dev_t" is -defined regardless of libdrm support, to fix the build failure. - -Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6 -Signed-off-by: Olivier Fourdan -Fixes: 240cb739 - "Add support for linux_dmabuf version 4" -Reviewed-by: Simon Ser -Reviewed-by: Pekka Paalanen - wayland-info/wayland-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c -index 53cd04bcb95e..98ff2052add7 100644 a/wayland-info/wayland-info.c -+++ b/wayland-info/wayland-info.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include - #if HAVE_HUMAN_FORMAT_MODIFIER diff --git a/patches/wayland-utils-1.1.0/series b/patches/wayland-utils-1.1.0/series deleted file mode 100644 index 21f38d9d7b38.. --- a/patches/wayland-utils-1.1.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-wayland-info-Fix-build-without-libdrm.patch -# bcd03cd405a631566145d1b0ddee2dc4 - git-ptx-patches magic diff --git a/rules/wayland-utils.in b/rules/wayland-utils.in index 49161fcc1797..65ddd9c9afe5 100644 --- a/rules/wayland-utils.in +++ b/rules/wayland-utils.in @@ -3,6 +3,7 @@ config WAYLAND_UTILS tristate select HOST_MESON + select LIBDRM select WAYLAND select WAYLAND_PROTOCOLS prompt "wayland-utils" diff --git a/rules/wayland-utils.make b/rules/wayland-utils.make index 28c2f493baa1..cc90ecc447f5 100644 --- a/rules/wayland-utils.make +++ b/rules/wayland-utils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_UTILS) += wayland-utils # # Paths and names # -WAYLAND_UTILS_VERSION := 1.1.0 -WAYLAND_UTILS_MD5 := 1a398cbb75c3ac1ac231b2a8f84bd6d6 +WAYLAND_UTILS_VERSION := 1.2.0 +WAYLAND_UTILS_MD5 := 736dbcefc534407d4e774087726844a1 WAYLAND_UTILS := wayland-utils-$(WAYLAND_UTILS_VERSION) WAYLAND_UTILS_SUFFIX := tar.xz WAYLAND_UTILS_URL := https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(WAYLAND_UTILS_VERSION)/downloads/$(WAYLAND_UTILS).$(WAYLAND_UTILS_SUFFIX) @@ -33,7 +33,8 @@ WAYLAND_UTILS_LICENSE_FILES := file://COPYING;md5=548a66038a77415e1df51118625e83 # WAYLAND_UTILS_CONF_TOOL:= meson WAYLAND_UTILS_CONF_OPT := \ - $(CROSS_MESON_USR) + $(CROSS_MESON_USR) \ + -Ddrm=enabled # # Target-Install -- 2.30.2
[ptxdist] [PATCH] nvtop: new package
Only supports AMD (amdgpu), Intel (i915), and Adreno (msm) GPUs for now. NVIDIA support would require libnvml. Signed-off-by: Philipp Zabel --- rules/nvtop.in | 34 ++ rules/nvtop.make | 62 2 files changed, 96 insertions(+) create mode 100644 rules/nvtop.in create mode 100644 rules/nvtop.make diff --git a/rules/nvtop.in b/rules/nvtop.in new file mode 100644 index ..af42874156aa --- /dev/null +++ b/rules/nvtop.in @@ -0,0 +1,34 @@ +## SECTION=shell_and_console + +menuconfig NVTOP + bool + prompt "nvtop" + select HOST_CMAKE + select NCURSES + select LIBDRM if NVTOP_AMDGPU || NVTOP_MSM + select LIBDRM_AMDGPUif NVTOP_AMDGPU + select SYSTEMD if NVTOP_AMDGPU || NVTOP_INTEL + help + Interactive GPU process monitor + +if NVTOP + +config NVTOP_NVIDIA + bool + # needs libnvml + depends on BROKEN + prompt "build support for NVIDIA GPUs" + +config NVTOP_AMDGPU + bool + prompt "build support for AMD GPUs using the amdgpu driver" + +config NVTOP_INTEL + bool + prompt "build support for Intel GPUs using the i915 driver" + +config NVTOP_MSM + bool + prompt "build support for Adreno GPUs using the msm driver" + +endif diff --git a/rules/nvtop.make b/rules/nvtop.make new file mode 100644 index ..738b7a013032 --- /dev/null +++ b/rules/nvtop.make @@ -0,0 +1,62 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Philipp Zabel +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_NVTOP) += nvtop + +# +# Paths and names +# +NVTOP_VERSION := 3.0.2 +NVTOP_MD5 := fdf9bc33c2240ba99cee0d726d267427 +NVTOP := nvtop-$(NVTOP_VERSION) +NVTOP_SUFFIX := tar.gz +NVTOP_URL := https://github.com/Syllo/nvtop/archive/refs/tags/$(NVTOP_VERSION).$(NVTOP_SUFFIX) +NVTOP_SOURCE := $(SRCDIR)/$(NVTOP).$(NVTOP_SUFFIX) +NVTOP_DIR := $(BUILDDIR)/$(NVTOP) +NVTOP_LICENSE := GPL-3.0-or-later +NVTOP_LICENSE_FILES := \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 + +# +# Prepare +# + +# +# cmake +# +NVTOP_CONF_TOOL:= cmake +NVTOP_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DNVIDIA_SUPPORT=$(call ptx/onoff, PTXCONF_NVTOP_NVIDIA) \ + -DAMDGPU_SUPPORT=$(call ptx/onoff, PTXCONF_NVTOP_AMDGPU) \ + -DINTEL_SUPPORT=$(call ptx/onoff, PTXCONF_NVTOP_INTEL) \ + -DMSM_SUPPORT=$(call ptx/onoff, PTXCONF_NVTOP_MSM) + +# +# Target-Install +# + +$(STATEDIR)/nvtop.targetinstall: + @$(call targetinfo) + + @$(call install_init, nvtop) + @$(call install_fixup, nvtop, PRIORITY, optional) + @$(call install_fixup, nvtop, SECTION, base) + @$(call install_fixup, nvtop, AUTHOR, "Philipp Zabel ") + @$(call install_fixup, nvtop, DESCRIPTION, missing) + + @$(call install_copy, nvtop, 0, 0, 0755, -, /usr/bin/nvtop) + + @$(call install_finish, nvtop) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH] barebox: inject firmware before prepare for i.MX8M on 2023.06.0
Since Barebox 2023.06.0, specifically commit 624962fb45c6 ("ARM: i.MX:
make boards selectable only when firmware files are present"), some
i.MX8M boards will be dropped from the configuration, if required DDR
training and TF-A firmware files are not already present in the source
tree.
To fix this, inject them before calling prepare.
Signed-off-by: Philipp Zabel
---
rules/barebox.make | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/rules/barebox.make b/rules/barebox.make
index 6383e1c72f52..c0d9c5744e4a 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -80,6 +80,9 @@ endif
$(STATEDIR)/barebox.prepare:
@$(call targetinfo)
+ifdef PTXCONF_BAREBOX_FIRMWARE
+ @$(call world/inject, BAREBOX)
+endif
@$(call world/prepare, BAREBOX)
ifdef PTXCONF_BAREBOX_EXTRA_ENV
@@ -95,11 +98,6 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV
fi;)
@rm -rf $(BAREBOX_BUILD_DIR)/defaultenv/barebox_default_env
endif
-
-ifdef PTXCONF_BAREBOX_FIRMWARE
- @$(call world/inject, BAREBOX)
-endif
-
@$(call touch)
#
--
2.39.2
[ptxdist] [PATCH] fbtest: version bump 2014-08-11-g29ab066 -> 2023-03-28-g47f6351
Add a patch to fix build with GCC 13.
Signed-off-by: Philipp Zabel
---
...nerated-penguin.c-to-get-rid-of-this.patch | 2 +-
.../0002-add-install-target.patch | 4 +--
.../0003-Initialize-ticks-in-benchmark.patch | 29 +++
.../series| 3 +-
rules/fbtest.make | 4 +--
5 files changed, 36 insertions(+), 6 deletions(-)
rename patches/{fbtest-2014-08-11-g29ab066 =>
fbtest-2023-03-28-g47f6351}/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
(99%)
rename patches/{fbtest-2014-08-11-g29ab066 =>
fbtest-2023-03-28-g47f6351}/0002-add-install-target.patch (83%)
create mode 100644
patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch
rename patches/{fbtest-2014-08-11-g29ab066 =>
fbtest-2023-03-28-g47f6351}/series (60%)
diff --git
a/patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
b/patches/fbtest-2023-03-28-g47f6351/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
similarity index 99%
rename from
patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
rename to
patches/fbtest-2023-03-28-g47f6351/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
index 0baef3cd7b85..97b5d1c82a94 100644
---
a/patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
+++
b/patches/fbtest-2023-03-28-g47f6351/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
@@ -19,7 +19,7 @@ Signed-off-by: Marc Kleine-Budde
create mode 100644 images/penguin.c
diff --git a/Makefile b/Makefile
-index 9a0a7ad95d9b..1557199d1fb5 100644
+index 5041f6ca5ca1..512a684f5f32 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ TOPDIR = .
diff --git a/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch
b/patches/fbtest-2023-03-28-g47f6351/0002-add-install-target.patch
similarity index 83%
rename from patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch
rename to patches/fbtest-2023-03-28-g47f6351/0002-add-install-target.patch
index 636226d537f8..3e65cbaa4b0d 100644
--- a/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch
+++ b/patches/fbtest-2023-03-28-g47f6351/0002-add-install-target.patch
@@ -9,10 +9,10 @@ Signed-off-by: Markus Niebel
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
-index 1557199d1fb5..1f926b4cf6be 100644
+index 512a684f5f32..c20376dccf70 100644
--- a/Makefile
+++ b/Makefile
-@@ -12,3 +12,5 @@ include $(TOPDIR)/Rules.make
+@@ -13,3 +13,5 @@ include $(TOPDIR)/Rules.make
images: pnmtohex
diff --git
a/patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch
b/patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch
new file mode 100644
index ..0360f05b9cf6
--- /dev/null
+++
b/patches/fbtest-2023-03-28-g47f6351/0003-Initialize-ticks-in-benchmark.patch
@@ -0,0 +1,29 @@
+From: Philipp Zabel
+Date: Thu, 29 Jun 2023 10:28:40 +0200
+Subject: [PATCH] Initialize ticks in benchmark()
+
+Fixes a build error with GCC 13:
+
+ util.c: In function 'benchmark':
+ util.c:177:17: error: 'ticks' may be used uninitialized
[-Werror=maybe-uninitialized]
+ util.c:161:14: note: 'ticks' was declared here
+
+Link: https://lore.kernel.org/r/20230629082840.888110-1-p.za...@pengutronix.de
+Signed-off-by: Philipp Zabel
+---
+ util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index cdf89b38618a..1193523990e7 100644
+--- a/util.c
b/util.c
+@@ -158,7 +158,7 @@ static uint64_t get_ticks(void)
+
+ double benchmark(void (*func)(unsigned long n, void *data), void *data)
+ {
+-uint64_t ticks;
++uint64_t ticks = 0;
+ unsigned long n = 1;
+
+ printf("Benchmarking... ");
diff --git a/patches/fbtest-2014-08-11-g29ab066/series
b/patches/fbtest-2023-03-28-g47f6351/series
similarity index 60%
rename from patches/fbtest-2014-08-11-g29ab066/series
rename to patches/fbtest-2023-03-28-g47f6351/series
index af761ac8d633..d3af842b3291 100644
--- a/patches/fbtest-2014-08-11-g29ab066/series
+++ b/patches/fbtest-2023-03-28-g47f6351/series
@@ -2,4 +2,5 @@
#tag:base --start-number 1
0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
0002-add-install-target.patch
-# 96842eebf8f8f3ef2bf71367ce23f9cd - git-ptx-patches magic
+0003-Initialize-ticks-in-benchmark.patch
+# 552895bf186281b657d9f116ef4cae0d - git-ptx-patches magic
diff --git a/rules/fbtest.make b/rules/fbtest.make
index 16d9941c9256..5d0810bf9389 100644
--- a/rules/fbtest.make
+++ b/rules/fbtest.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FBTEST) += fbtest
#
# Paths and names
#
-FBTEST_VERSION := 2014-08-11-g29ab066
-FBTEST_MD5 := 48d1f4e6450ded48c44733539c1c9614
+FBTEST_VERSION := 2023-03-28-g47f6351
+FBTEST_MD5 := 3523551d53c89c83505cad8d9cbf2bfe
FBTES
[ptxdist] [PATCH] mesalib: version bump 23.0.0 -> 23.1.0
Enable a gallium driver (swrast) in host-mesalib to keep the build system from deactivating the glsl_compiler target. Add an option to build the Intel hasvk Vulkan driver for gfx7/8 platforms. Signed-off-by: Philipp Zabel --- rules/host-mesalib.make | 10 +- rules/mesalib.in| 5 + rules/mesalib.make | 13 +++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index adcd227d8e23..3412cdb3db11 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -18,6 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib HOST_MESALIB_CONF_TOOL := meson HOST_MESALIB_CONF_OPT := \ $(HOST_MESON_OPT) \ + -Dallow-kcmp=enabled \ + -Dandroid-libbacktrace=disabled \ -Dandroid-stub=false \ -Dbuild-aco-tests=false \ -Dbuild-tests=false \ @@ -25,7 +27,6 @@ HOST_MESALIB_CONF_OPT := \ -Dd3d-drivers-path=/usr/lib/d3d \ -Ddatasources=auto \ -Ddraw-use-llvm=false \ - -Ddri-drivers= \ -Ddri-drivers-path=/usr/lib/dri \ -Ddri-search-path=/usr/lib/dri \ -Ddri3=disabled \ @@ -33,11 +34,10 @@ HOST_MESALIB_CONF_OPT := \ -Degl-lib-suffix= \ -Degl-native-platform=auto \ -Dexecmem=true \ - -Dfreedreno-kgsl=false \ - -Dfreedreno-virtio=false \ + -Dfreedreno-kmds= \ -Dgallium-d3d10umd=false \ -Dgallium-d3d12-video=disabled \ - -Dgallium-drivers= \ + -Dgallium-drivers=swrast \ -Dgallium-extra-hud=false \ -Dgallium-nine=false \ -Dgallium-omx=disabled \ @@ -60,6 +60,7 @@ HOST_MESALIB_CONF_OPT := \ -Dimagination-srv=false \ -Dinstall-intel-gpu-tests=false \ -Dintel-clc=disabled \ + -Dintel-xe-kmd=disabled \ -Dlibunwind=disabled \ -Dllvm=disabled \ -Dlmsensors=disabled \ @@ -70,7 +71,6 @@ HOST_MESALIB_CONF_OPT := \ -Dopencl-spirv=false \ -Dopengl=true \ -Dosmesa=false \ - -Dosmesa-bits=unspecified \ -Dperfetto=false \ -Dplatform-sdk-version=25 \ -Dplatforms= \ diff --git a/rules/mesalib.in b/rules/mesalib.in index cf9619c85241..6f68c3ceebf5 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -237,6 +237,11 @@ config MESALIB_VULKAN_INTEL select MESALIB_XMLCONFIG prompt "Intel (Anvil)" +config MESALIB_VULKAN_INTEL_HASVK + bool + select MESALIB_XMLCONFIG + prompt "Intel (hasvk)" + config MESALIB_VULKAN_FREEDRENO bool prompt "Freedreno (Turnip)" diff --git a/rules/mesalib.make b/rules/mesalib.make index f918a4ffc316..379e169a0660 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 23.0.2 -MESALIB_MD5:= ffea65f5dd7f1be1e4f941ad990a3ae7 +MESALIB_VERSION:= 23.1.0 +MESALIB_MD5:= 786ef9e01490654da0d4deb0f7a75700 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ @@ -101,6 +101,7 @@ MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC) += h265enc ifdef PTXCONF_ARCH_X86 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel +MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL_HASVK) += intel_hasvk endif ifdef PTXCONF_ARCH_ARM_NEON MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM) += broadcom @@ -138,6 +139,8 @@ endif MESALIB_CONF_TOOL := meson MESALIB_CONF_OPT := \ $(CROSS_MESON_USR) \ + -Dallow-kcmp=enabled \ + -Dandroid-libbacktrace=disabled \ -Dandroid-stub=false \ -Dbuild-aco-tests=false \ -Dbuild-tests=false \ @@ -145,7 +148,6 @@ MESALIB_CONF_OPT:= \ -Dd3d-drivers-path=/usr/lib/d3d \ -Ddatasources=auto \ -Ddraw-use-llvm=true \ - -Ddri-drivers=[] \ -Ddri-drivers-path=/usr/lib/dri \ -Ddri-search-path=/usr/lib/dri \ -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ @@ -154,8 +156,7 @@ MESALIB_CONF_OPT:= \ -Degl-native-platform=auto \ -Denable-glcpp-tests=false \ -Dexecmem=true \ - -Dfreedreno-kgsl=false \ - -Dfreedreno-virtio=false \ + -Dfreedreno-kmds=msm \ -Dgallium-d3d10umd=false \ -Dgallium-d3d12-video=disabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \ @@ -181,6 +182,7 @@ MESALIB_CONF_OPT:= \ -Dimagination-srv=false \ -Dinstall-intel-gpu-tests=false \ -Dintel-clc=disabled \ + -Dintel-xe-kmd=disabled \ -Dlibunwind=disabled \ -Dllvm=disabled \ -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \ @@ -191,7 +193,6 @@ MESALIB_CONF_OPT:= \ -Dopencl-spirv=false \
[ptxdist] [PATCH 7/7] vulkan-validationlayers: version bump 1.3.243.0 -> 1.3.246.1
Signed-off-by: Philipp Zabel
---
...x-find_-support-when-cross-compiling.patch | 32 +++
...r-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch | 201 ++
.../vulkan-validationlayers-1.3.246.1/series | 5 +
rules/vulkan-validationlayers.make| 7 +-
4 files changed, 241 insertions(+), 4 deletions(-)
create mode 100644
patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
create mode 100644
patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
create mode 100644 patches/vulkan-validationlayers-1.3.246.1/series
diff --git
a/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
b/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
new file mode 100644
index ..c3e3338b0009
--- /dev/null
+++
b/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
@@ -0,0 +1,32 @@
+From: Philipp Zabel
+Date: Tue, 16 May 2023 10:04:03 +0200
+Subject: [PATCH] Revert "cmake: Fix find_* support when cross compiling"
+
+PTXdist uses CMAKE_FIND_ROOT_PATH [1] to instruct CMake where to find
+package information when cross-compiling. Stop overwriting this with
+the contents of CMAKE_PREFIX_PATH [2] in the build system.
+
+[1] https://cmake.org/cmake/help/v3.25/variable/CMAKE_FIND_ROOT_PATH.html
+[2] https://cmake.org/cmake/help/v3.25/variable/CMAKE_PREFIX_PATH.html
+
+This reverts commit b7c5ad2eed4405140fd062e5b915950011f4d7d0.
+
+Signed-off-by: Philipp Zabel
+---
+ scripts/CMakeLists.txt | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index f3536cc2a05e..a71de73111a2 100644
+--- a/scripts/CMakeLists.txt
b/scripts/CMakeLists.txt
+@@ -127,8 +127,4 @@ if (MIMALLOC_INSTALL_DIR)
+ list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR})
+ endif()
+
+-if (CMAKE_CROSSCOMPILING)
+-set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+-else()
+-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+-endif()
++set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
diff --git
a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
b/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
new file mode 100644
index ..3b625e31120f
--- /dev/null
+++
b/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
@@ -0,0 +1,201 @@
+From: Niklas Haas
+Date: Thu, 20 Apr 2023 11:51:49 +0200
+Subject: [PATCH] layers: Fix UB for VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT
+
+Several codepaths in the layers called into
+vkGetPhysicalDeviceImageFormatProperties2KHR without including a valid
+VkPhysicalDeviceImageDrmFormatModifierInfoEXT, despite this being a
+requirement for images with DRM format modifier tiling.
+
+For the vkBindImageMemory check, there is a hypothetical possibility of
+the driver returning VK_ERROR_OUT_OF_HOST_MEMORY when querying the
+image's DRM format. In this case, for lack of anything better to do, we
+preserve the current behavior.
+
+It might make more sense to query the DRM format modifier immediately
+after image creation and cache it inside the image state, but I didn't
+want to make that (more invasive) change myself.
+
+As an aside, we also correctly specify the specified `sharingMode` when
+querying for DRM modifier support, which the current code failed to do
+properly.
+
+Co-authored-by: Simon Ser
+
+closes #5649
+closes #5687
+
+(cherry picked from commit ce2c6eff3457a331efd64da800c5ac393285cf40)
+
+Signed-off-by: Philipp Zabel
+---
+ layers/core_checks/device_memory_validation.cpp | 18 ++-
+ layers/core_checks/image_validation.cpp | 72 -
+ 2 files changed, 62 insertions(+), 28 deletions(-)
+
+diff --git a/layers/core_checks/device_memory_validation.cpp
b/layers/core_checks/device_memory_validation.cpp
+index 4a98d6f0922d..555985957dce 100644
+--- a/layers/core_checks/device_memory_validation.cpp
b/layers/core_checks/device_memory_validation.cpp
+@@ -887,7 +887,7 @@ bool CoreChecks::PreCallValidateMapMemory(VkDevice device,
VkDeviceMemory mem, V
+ return skip;
+ }
+
+-bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const
VkMemoryMapInfoKHR* pMemoryMapInfo, void **ppData) const {
++bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const
VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData) const {
+ bool skip = false;
+ auto mem_info = Get(pMemoryMapInfo->memory);
+ if (mem_info) {
+@@ -905,7 +905,7 @@ bool CoreChecks::PreCallValidateUnmapMemory(VkDevice
device, VkDeviceMemory mem)
+ return skip;
+ }
+
+-bool CoreChecks::PreCallValidateUnmapMemory2KHR(Vk
[ptxdist] [PATCH 1/7] glslang: version bump 1.3.243.0 -> 1.3.246.1
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index 5d3cb477ad1e..f79d60f7d458 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.243.0 -GLSLANG_MD5:= 513695ced128d1bde2726d57ad676cf6 +GLSLANG_VERSION:= 1.3.246.1 +GLSLANG_MD5:= b55b5074e5d3e587b564d9159a1551a1 GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 2/7] spirv-headers: version bump 1.3.243.0 -> 1.3.246.1
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index 66c8f9167adf..af0770cf22b7 100644 --- a/rules/spirv-headers.make +++ b/rules/spirv-headers.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers # # Paths and names # -SPIRV_HEADERS_VERSION := 1.3.243.0 -SPIRV_HEADERS_MD5 := f3025c0e1a7846ac948a8118fbb85a9b +SPIRV_HEADERS_VERSION := 1.3.246.1 +SPIRV_HEADERS_MD5 := 34931d32974d05449ddbbe0b86820f2e SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 3/7] spirv-tools: version bump 1.3.243.0 -> 1.3.246.1
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index 64ce4ae00a8b..fb469949ec9b 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:= 1.3.243.0 -SPIRV_TOOLS_MD5:= 463d1144e7339a7338e69b74e01acabd +SPIRV_TOOLS_VERSION:= 1.3.246.1 +SPIRV_TOOLS_MD5:= 9039e41e8294d1a6388935ad8d03837d SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) -- 2.39.2
