Attachment 244752 Details for Bug 273703 – update to 23.1.7

[patch] update to 23.1.7

patch-mesa (text/plain), 22.46 KB, created by gnikl on 2023-09-10 15:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gnikl

Created: 2023-09-10 15:30:05 UTC

Size: 22.46 KB

patch

obsolete

>diff -rupN mesa-22/graphics/libosmesa/Makefile mesa-23/graphics/libosmesa/Makefile
>--- mesa-22/graphics/libosmesa/Makefile	2023-03-20 17:36:22.000000000 +0100
>+++ mesa-23/graphics/libosmesa/Makefile	2023-09-10 12:44:46.748494000 +0200
>@@ -23,6 +23,7 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgallium-drivers="swrast" \
> 		-Dvulkan-drivers="" \
> 		-Dplatforms="" \
>+		-Dandroid-libbacktrace=disabled \
> 		-Dgallium-vdpau=disabled \
> 		-Dgallium-omx=disabled \
> 		-Dgallium-va=disabled \
>@@ -31,12 +32,14 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgallium-nine=false \
> 		-Dgles1=disabled \
> 		-Dgles2=disabled \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
> 		-Dopengl=true \
> 		-Dglx=disabled \
> 		-Degl=disabled \
> 		-Dgbm=disabled \
> 		-Dtools="" \
>+		-Dvalgrind=disabled \
> 		-Dzstd=disabled
> LDFLAGS_i386=		-Wl,-znotext
> 
>diff -rupN mesa-22/graphics/mesa-dri/Makefile mesa-23/graphics/mesa-dri/Makefile
>--- mesa-22/graphics/mesa-dri/Makefile	2023-09-09 17:37:22.248726000 +0200
>+++ mesa-23/graphics/mesa-dri/Makefile	2023-09-09 17:37:22.000000000 +0200
>@@ -1,6 +1,5 @@
> PORTNAME=	mesa-dri
> PORTVERSION=	${MESAVERSION}
>-PORTREVISION=	3
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
>@@ -73,14 +72,17 @@ MESON_ARGS+=	-Dgallium-drivers="${GALLIU
> 		-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
> 
> # Disable some options
>-MESON_ARGS+=	-Dgallium-xa=disabled \
>+MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
>+		-Dgallium-xa=disabled \
> 		-Dgallium-vdpau=disabled \
> 		-Dgallium-va=disabled \
> 		-Dgles1=disabled \
> 		-Dgles2=disabled \
> 		-Dglx=disabled \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
>-		-Dosmesa=false
>+		-Dosmesa=false \
>+		-Dvalgrind=disabled
> 
> .for _gd in ${ALL_GALLIUM_DRIVERS}
> . if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}
>diff -rupN mesa-22/graphics/mesa-dri/Makefile.common mesa-23/graphics/mesa-dri/Makefile.common
>--- mesa-22/graphics/mesa-dri/Makefile.common	2023-09-09 17:44:26.752627000 +0200
>+++ mesa-23/graphics/mesa-dri/Makefile.common	2023-09-09 17:44:26.000000000 +0200
>@@ -12,7 +12,7 @@
> MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
> MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
> 
>-MESABASEVERSION=	22.3.7
>+MESABASEVERSION=	23.1.7
> # if there is a subversion, don't include the '-' between 7.11-rc2.
> MESASUBVERSION=
> 
>diff -rupN mesa-22/graphics/mesa-dri/distinfo mesa-23/graphics/mesa-dri/distinfo
>--- mesa-22/graphics/mesa-dri/distinfo	2023-03-09 09:02:35.000000000 +0100
>+++ mesa-23/graphics/mesa-dri/distinfo	2023-09-09 17:34:15.000000000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1678348804
>-SHA256 (mesa-22.3.7.tar.xz) = 894ce2f4a1c2e76177cdd2284620192d0da3066b243eec2fbb1d7cf37f13042c
>-SIZE (mesa-22.3.7.tar.xz) = 17136476
>+TIMESTAMP = 1694273655
>+SHA256 (mesa-23.1.7.tar.xz) = 409641eadf0ed1c7794797a6f5a0b0195b5580b282166e5ec5629c6bcda6acd3
>+SIZE (mesa-23.1.7.tar.xz) = 18544916
>diff -rupN mesa-22/graphics/mesa-dri/files/patch-include_drm-uapi_dma-buf.h mesa-23/graphics/mesa-dri/files/patch-include_drm-uapi_dma-buf.h
>--- mesa-22/graphics/mesa-dri/files/patch-include_drm-uapi_dma-buf.h	2022-10-14 15:12:10.000000000 +0200
>+++ mesa-23/graphics/mesa-dri/files/patch-include_drm-uapi_dma-buf.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,198 +0,0 @@
>---- include/drm-uapi/dma-buf.h.orig	2022-10-14 14:21:26 UTC
>-+++ include/drm-uapi/dma-buf.h
>-@@ -0,0 +1,195 @@
>-+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>-+/*
>-+ * Framework for buffer objects that can be shared across devices/subsystems.
>-+ *
>-+ * Copyright(C) 2015 Intel Ltd
>-+ *
>-+ * This program is free software; you can redistribute it and/or modify it
>-+ * under the terms of the GNU General Public License version 2 as published by
>-+ * the Free Software Foundation.
>-+ *
>-+ * This program is distributed in the hope that it will be useful, but WITHOUT
>-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
>-+ * more details.
>-+ *
>-+ * You should have received a copy of the GNU General Public License along with
>-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
>-+ */
>-+
>-+#ifndef _DMA_BUF_UAPI_H_
>-+#define _DMA_BUF_UAPI_H_
>-+
>-+#ifdef __linux__
>-+#include <linux/types.h>
>-+#else
>-+#include <sys/types.h>
>-+
>-+typedef int8_t   __s8;
>-+typedef uint8_t  __u8;
>-+typedef int16_t  __s16;
>-+typedef uint16_t __u16;
>-+typedef int32_t  __s32;
>-+typedef uint32_t __u32;
>-+typedef int64_t  __s64;
>-+typedef uint64_t __u64;
>-+#endif
>-+
>-+/**
>-+ * struct dma_buf_sync - Synchronize with CPU access.
>-+ *
>-+ * When a DMA buffer is accessed from the CPU via mmap, it is not always
>-+ * possible to guarantee coherency between the CPU-visible map and underlying
>-+ * memory.  To manage coherency, DMA_BUF_IOCTL_SYNC must be used to bracket
>-+ * any CPU access to give the kernel the chance to shuffle memory around if
>-+ * needed.
>-+ *
>-+ * Prior to accessing the map, the client must call DMA_BUF_IOCTL_SYNC
>-+ * with DMA_BUF_SYNC_START and the appropriate read/write flags.  Once the
>-+ * access is complete, the client should call DMA_BUF_IOCTL_SYNC with
>-+ * DMA_BUF_SYNC_END and the same read/write flags.
>-+ *
>-+ * The synchronization provided via DMA_BUF_IOCTL_SYNC only provides cache
>-+ * coherency.  It does not prevent other processes or devices from
>-+ * accessing the memory at the same time.  If synchronization with a GPU or
>-+ * other device driver is required, it is the client's responsibility to
>-+ * wait for buffer to be ready for reading or writing before calling this
>-+ * ioctl with DMA_BUF_SYNC_START.  Likewise, the client must ensure that
>-+ * follow-up work is not submitted to GPU or other device driver until
>-+ * after this ioctl has been called with DMA_BUF_SYNC_END?
>-+ *
>-+ * If the driver or API with which the client is interacting uses implicit
>-+ * synchronization, waiting for prior work to complete can be done via
>-+ * poll() on the DMA buffer file descriptor.  If the driver or API requires
>-+ * explicit synchronization, the client may have to wait on a sync_file or
>-+ * other synchronization primitive outside the scope of the DMA buffer API.
>-+ */
>-+struct dma_buf_sync {
>-+	/**
>-+	 * @flags: Set of access flags
>-+	 *
>-+	 * DMA_BUF_SYNC_START:
>-+	 *     Indicates the start of a map access session.
>-+	 *
>-+	 * DMA_BUF_SYNC_END:
>-+	 *     Indicates the end of a map access session.
>-+	 *
>-+	 * DMA_BUF_SYNC_READ:
>-+	 *     Indicates that the mapped DMA buffer will be read by the
>-+	 *     client via the CPU map.
>-+	 *
>-+	 * DMA_BUF_SYNC_WRITE:
>-+	 *     Indicates that the mapped DMA buffer will be written by the
>-+	 *     client via the CPU map.
>-+	 *
>-+	 * DMA_BUF_SYNC_RW:
>-+	 *     An alias for DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE.
>-+	 */
>-+	__u64 flags;
>-+};
>-+
>-+#define DMA_BUF_SYNC_READ      (1 << 0)
>-+#define DMA_BUF_SYNC_WRITE     (2 << 0)
>-+#define DMA_BUF_SYNC_RW        (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE)
>-+#define DMA_BUF_SYNC_START     (0 << 2)
>-+#define DMA_BUF_SYNC_END       (1 << 2)
>-+#define DMA_BUF_SYNC_VALID_FLAGS_MASK \
>-+	(DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END)
>-+
>-+#define DMA_BUF_NAME_LEN	32
>-+
>-+/**
>-+ * struct dma_buf_export_sync_file - Get a sync_file from a dma-buf
>-+ *
>-+ * Userspace can perform a DMA_BUF_IOCTL_EXPORT_SYNC_FILE to retrieve the
>-+ * current set of fences on a dma-buf file descriptor as a sync_file.  CPU
>-+ * waits via poll() or other driver-specific mechanisms typically wait on
>-+ * whatever fences are on the dma-buf at the time the wait begins.  This
>-+ * is similar except that it takes a snapshot of the current fences on the
>-+ * dma-buf for waiting later instead of waiting immediately.  This is
>-+ * useful for modern graphics APIs such as Vulkan which assume an explicit
>-+ * synchronization model but still need to inter-operate with dma-buf.
>-+ *
>-+ * The intended usage pattern is the following:
>-+ *
>-+ *  1. Export a sync_file with flags corresponding to the expected GPU usage
>-+ *     via DMA_BUF_IOCTL_EXPORT_SYNC_FILE.
>-+ *
>-+ *  2. Submit rendering work which uses the dma-buf.  The work should wait on
>-+ *     the exported sync file before rendering and produce another sync_file
>-+ *     when complete.
>-+ *
>-+ *  3. Import the rendering-complete sync_file into the dma-buf with flags
>-+ *     corresponding to the GPU usage via DMA_BUF_IOCTL_IMPORT_SYNC_FILE.
>-+ *
>-+ * Unlike doing implicit synchronization via a GPU kernel driver's exec ioctl,
>-+ * the above is not a single atomic operation.  If userspace wants to ensure
>-+ * ordering via these fences, it is the respnosibility of userspace to use
>-+ * locks or other mechanisms to ensure that no other context adds fences or
>-+ * submits work between steps 1 and 3 above.
>-+ */
>-+struct dma_buf_export_sync_file {
>-+	/**
>-+	 * @flags: Read/write flags
>-+	 *
>-+	 * Must be DMA_BUF_SYNC_READ, DMA_BUF_SYNC_WRITE, or both.
>-+	 *
>-+	 * If DMA_BUF_SYNC_READ is set and DMA_BUF_SYNC_WRITE is not set,
>-+	 * the returned sync file waits on any writers of the dma-buf to
>-+	 * complete.  Waiting on the returned sync file is equivalent to
>-+	 * poll() with POLLIN.
>-+	 *
>-+	 * If DMA_BUF_SYNC_WRITE is set, the returned sync file waits on
>-+	 * any users of the dma-buf (read or write) to complete.  Waiting
>-+	 * on the returned sync file is equivalent to poll() with POLLOUT.
>-+	 * If both DMA_BUF_SYNC_WRITE and DMA_BUF_SYNC_READ are set, this
>-+	 * is equivalent to just DMA_BUF_SYNC_WRITE.
>-+	 */
>-+	__u32 flags;
>-+	/** @fd: Returned sync file descriptor */
>-+	__s32 fd;
>-+};
>-+
>-+/**
>-+ * struct dma_buf_import_sync_file - Insert a sync_file into a dma-buf
>-+ *
>-+ * Userspace can perform a DMA_BUF_IOCTL_IMPORT_SYNC_FILE to insert a
>-+ * sync_file into a dma-buf for the purposes of implicit synchronization
>-+ * with other dma-buf consumers.  This allows clients using explicitly
>-+ * synchronized APIs such as Vulkan to inter-op with dma-buf consumers
>-+ * which expect implicit synchronization such as OpenGL or most media
>-+ * drivers/video.
>-+ */
>-+struct dma_buf_import_sync_file {
>-+	/**
>-+	 * @flags: Read/write flags
>-+	 *
>-+	 * Must be DMA_BUF_SYNC_READ, DMA_BUF_SYNC_WRITE, or both.
>-+	 *
>-+	 * If DMA_BUF_SYNC_READ is set and DMA_BUF_SYNC_WRITE is not set,
>-+	 * this inserts the sync_file as a read-only fence.  Any subsequent
>-+	 * implicitly synchronized writes to this dma-buf will wait on this
>-+	 * fence but reads will not.
>-+	 *
>-+	 * If DMA_BUF_SYNC_WRITE is set, this inserts the sync_file as a
>-+	 * write fence.  All subsequent implicitly synchronized access to
>-+	 * this dma-buf will wait on this fence.
>-+	 */
>-+	__u32 flags;
>-+	/** @fd: Sync file descriptor */
>-+	__s32 fd;
>-+};
>-+
>-+#define DMA_BUF_BASE		'b'
>-+#define DMA_BUF_IOCTL_SYNC	_IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
>-+
>-+/* 32/64bitness of this uapi was botched in android, there's no difference
>-+ * between them in actual uapi, they're just different numbers.
>-+ */
>-+#define DMA_BUF_SET_NAME	_IOW(DMA_BUF_BASE, 1, const char *)
>-+#define DMA_BUF_SET_NAME_A	_IOW(DMA_BUF_BASE, 1, u32)
>-+#define DMA_BUF_SET_NAME_B	_IOW(DMA_BUF_BASE, 1, u64)
>-+#define DMA_BUF_IOCTL_EXPORT_SYNC_FILE	_IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file)
>-+#define DMA_BUF_IOCTL_IMPORT_SYNC_FILE	_IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file)
>-+
>-+#endif
>diff -rupN mesa-22/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h mesa-23/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h
>--- mesa-22/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h	2022-10-14 15:12:10.000000000 +0200
>+++ mesa-23/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/gallium/include/pipe/p_compiler.h.orig	2022-10-11 18:53:31 UTC
>-+++ src/gallium/include/pipe/p_compiler.h
>-@@ -125,7 +125,7 @@ typedef unsigned char boolean;
>-  *       aligned, but we only want to align the field.
>-  */
>- #define EXCLUSIVE_CACHELINE(decl) \
>--   union { char __cl_space[CACHE_LINE_SIZE]; \
>-+   union { char __cl_space[MESA_CACHE_LINE_SIZE]; \
>-            decl; }
>- 
>- #if defined(__cplusplus)
>diff -rupN mesa-22/graphics/mesa-dri/files/patch-src_util_macros.h mesa-23/graphics/mesa-dri/files/patch-src_util_macros.h
>--- mesa-22/graphics/mesa-dri/files/patch-src_util_macros.h	2022-10-14 15:12:10.000000000 +0200
>+++ mesa-23/graphics/mesa-dri/files/patch-src_util_macros.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/util/macros.h.orig	2022-10-11 18:53:31 UTC
>-+++ src/util/macros.h
>-@@ -448,7 +448,7 @@ typedef int lock_cap_t;
>- #endif
>- 
>- /* TODO: this could be different on non-x86 architectures. */
>--#define CACHE_LINE_SIZE 64
>-+#define MESA_CACHE_LINE_SIZE 64
>- 
>- #define DO_PRAGMA(X) _Pragma (#X)
>- 
>diff -rupN mesa-22/graphics/mesa-dri/files/patch-src_util_u__memory.h mesa-23/graphics/mesa-dri/files/patch-src_util_u__memory.h
>--- mesa-22/graphics/mesa-dri/files/patch-src_util_u__memory.h	2022-12-01 13:16:06.000000000 +0100
>+++ mesa-23/graphics/mesa-dri/files/patch-src_util_u__memory.h	2023-09-09 18:29:45.000000000 +0200
>@@ -1,7 +1,21 @@
>---- src/util/u_memory.h.orig	2022-12-01 11:58:25 UTC
>+--- src/util/u_memory.h.orig	2023-09-06 23:29:52 UTC
> +++ src/util/u_memory.h
>-@@ -91,8 +91,8 @@ mem_dup(const void *src, size_t size)
>+@@ -90,7 +90,7 @@ mem_dup(const void *src, size_t size)
>+ #define Offset(TYPE, MEMBER) ((uintptr_t)&(((TYPE *)NULL)->MEMBER))
>  
>+ /* TODO: this could be different on non-x86 architectures. */
>+-#define CACHE_LINE_SIZE 64
>++#define MESA_CACHE_LINE_SIZE 64
>+ 
>+ /**
>+  * Declare a variable on its own cache line.
>+@@ -107,12 +107,12 @@ mem_dup(const void *src, size_t size)
>+  *       aligned, but we only want to align the field.
>+  */
>+ #define EXCLUSIVE_CACHELINE(decl) \
>+-   union { char __cl_space[CACHE_LINE_SIZE]; \
>++   union { char __cl_space[MESA_CACHE_LINE_SIZE]; \
>+            decl; }
>  
>  /* Allocate a structure aligned to a cache line. (used to make atomic ops faster) */
> -#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), CACHE_LINE_SIZE)
>diff -rupN mesa-22/graphics/mesa-dri/files/patch-src_vulkan_wsi_wsi__common__drm.c mesa-23/graphics/mesa-dri/files/patch-src_vulkan_wsi_wsi__common__drm.c
>--- mesa-22/graphics/mesa-dri/files/patch-src_vulkan_wsi_wsi__common__drm.c	2022-10-14 15:12:10.000000000 +0200
>+++ mesa-23/graphics/mesa-dri/files/patch-src_vulkan_wsi_wsi__common__drm.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,61 +0,0 @@
>---- src/vulkan/wsi/wsi_common_drm.c.orig	2022-10-11 18:53:31 UTC
>-+++ src/vulkan/wsi/wsi_common_drm.c
>-@@ -30,29 +30,15 @@
>- #include "vk_physical_device.h"
>- #include "vk_util.h"
>- #include "drm-uapi/drm_fourcc.h"
>-+#include "drm-uapi/dma-buf.h"
>- 
>- #include <errno.h>
>--#include <linux/dma-buf.h>
>--#include <linux/sync_file.h>
>- #include <time.h>
>- #include <unistd.h>
>- #include <stdlib.h>
>- #include <stdio.h>
>- #include <xf86drm.h>
>- 
>--struct dma_buf_export_sync_file_wsi {
>--   __u32 flags;
>--   __s32 fd;
>--};
>--
>--struct dma_buf_import_sync_file_wsi {
>--   __u32 flags;
>--   __s32 fd;
>--};
>--
>--#define DMA_BUF_IOCTL_EXPORT_SYNC_FILE_WSI   _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file_wsi)
>--#define DMA_BUF_IOCTL_IMPORT_SYNC_FILE_WSI   _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file_wsi)
>--
>- static VkResult
>- wsi_dma_buf_export_sync_file(int dma_buf_fd, int *sync_file_fd)
>- {
>-@@ -61,11 +47,11 @@ wsi_dma_buf_export_sync_file(int dma_buf_fd, int *sync
>-    if (no_dma_buf_sync_file)
>-       return VK_ERROR_FEATURE_NOT_PRESENT;
>- 
>--   struct dma_buf_export_sync_file_wsi export = {
>-+   struct dma_buf_export_sync_file export = {
>-       .flags = DMA_BUF_SYNC_RW,
>-       .fd = -1,
>-    };
>--   int ret = drmIoctl(dma_buf_fd, DMA_BUF_IOCTL_EXPORT_SYNC_FILE_WSI, &export);
>-+   int ret = drmIoctl(dma_buf_fd, DMA_BUF_IOCTL_EXPORT_SYNC_FILE, &export);
>-    if (ret) {
>-       if (errno == ENOTTY || errno == EBADF || errno == ENOSYS) {
>-          no_dma_buf_sync_file = true;
>-@@ -88,11 +74,11 @@ wsi_dma_buf_import_sync_file(int dma_buf_fd, int sync_
>-    if (no_dma_buf_sync_file)
>-       return VK_ERROR_FEATURE_NOT_PRESENT;
>- 
>--   struct dma_buf_import_sync_file_wsi import = {
>-+   struct dma_buf_import_sync_file import = {
>-       .flags = DMA_BUF_SYNC_RW,
>-       .fd = sync_file_fd,
>-    };
>--   int ret = drmIoctl(dma_buf_fd, DMA_BUF_IOCTL_IMPORT_SYNC_FILE_WSI, &import);
>-+   int ret = drmIoctl(dma_buf_fd, DMA_BUF_IOCTL_IMPORT_SYNC_FILE, &import);
>-    if (ret) {
>-       if (errno == ENOTTY || errno == EBADF || errno == ENOSYS) {
>-          no_dma_buf_sync_file = true;
>diff -rupN mesa-22/graphics/mesa-dri/files/patch-wayland-1.22 mesa-23/graphics/mesa-dri/files/patch-wayland-1.22
>--- mesa-22/graphics/mesa-dri/files/patch-wayland-1.22	2023-02-28 17:15:31.000000000 +0100
>+++ mesa-23/graphics/mesa-dri/files/patch-wayland-1.22	1970-01-01 01:00:00.000000000 +0100
>@@ -1,44 +0,0 @@
>-https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee5d2250fd15
>-https://gitlab.freedesktop.org/mesa/mesa/-/commit/689ce66a4332
>-
>---- src/egl/drivers/dri2/platform_wayland.c.orig	2023-03-08 18:37:09 UTC
>-+++ src/egl/drivers/dri2/platform_wayland.c
>-@@ -2789,10 +2789,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dp
>-       wl_shm_destroy(dri2_dpy->wl_shm);
>-    if (dri2_dpy->wl_registry)
>-       wl_registry_destroy(dri2_dpy->wl_registry);
>--   if (dri2_dpy->wl_queue)
>--      wl_event_queue_destroy(dri2_dpy->wl_queue);
>-    if (dri2_dpy->wl_dpy_wrapper)
>-       wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
>-+   if (dri2_dpy->wl_queue)
>-+      wl_event_queue_destroy(dri2_dpy->wl_queue);
>- 
>-    if (dri2_dpy->own_device)
>-       wl_display_disconnect(dri2_dpy->wl_dpy);
>---- src/vulkan/wsi/wsi_common_wayland.c.orig	2023-03-08 18:37:09 UTC
>-+++ src/vulkan/wsi/wsi_common_wayland.c
>-@@ -1156,17 +1156,17 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, 
>-    struct wsi_wl_surface *wsi_wl_surface =
>-       wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
>- 
>--   if (wsi_wl_surface->surface)
>--      wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
>--
>--   if (wsi_wl_surface->display)
>--      wsi_wl_display_destroy(wsi_wl_surface->display);
>--
>-    if (wsi_wl_surface->wl_dmabuf_feedback) {
>-       zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
>-       dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
>-       dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
>-    }
>-+
>-+   if (wsi_wl_surface->surface)
>-+      wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
>-+
>-+   if (wsi_wl_surface->display)
>-+      wsi_wl_display_destroy(wsi_wl_surface->display);
>- 
>-    vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
>- }
>diff -rupN mesa-22/graphics/mesa-gallium-va/Makefile mesa-23/graphics/mesa-gallium-va/Makefile
>--- mesa-22/graphics/mesa-gallium-va/Makefile	2023-03-20 17:36:22.000000000 +0100
>+++ mesa-23/graphics/mesa-gallium-va/Makefile	2023-09-10 12:33:29.259038000 +0200
>@@ -28,6 +28,7 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc" \
> 		-Dgallium-drivers="radeonsi,r600" \
> 		-Dvulkan-drivers="" \
>+		-Dandroid-libbacktrace=disabled \
> 		-Dgallium-vdpau=disabled \
> 		-Dgallium-omx=disabled \
> 		-Dgallium-xa=disabled \
>@@ -36,8 +37,10 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgbm=disabled \
> 		-Dgles1=disabled \
> 		-Dgles2=disabled \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
> 		-Dosmesa=false \
>+		-Dvalgrind=disabled \
> 		-Dglx=disabled \
> 		-Ddri3=enabled
> 
>diff -rupN mesa-22/graphics/mesa-gallium-vdpau/Makefile mesa-23/graphics/mesa-gallium-vdpau/Makefile
>--- mesa-22/graphics/mesa-gallium-vdpau/Makefile	2023-03-20 17:36:22.000000000 +0100
>+++ mesa-23/graphics/mesa-gallium-vdpau/Makefile	2023-09-10 12:34:38.105534000 +0200
>@@ -28,6 +28,7 @@ X11_USE=		xorg=xorgproto,x11,xcb,xdamage
> MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgallium-drivers="r300,r600,radeonsi" \
> 		-Dvulkan-drivers="" \
>+		-Dandroid-libbacktrace=disabled \
> 		-Dgallium-va=disabled \
> 		-Dgallium-omx=disabled \
> 		-Dgallium-xa=disabled \
>@@ -36,8 +37,10 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgbm=disabled \
> 		-Dgles1=disabled \
> 		-Dgles2=disabled \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
> 		-Dosmesa=false \
>+		-Dvalgrind=disabled \
> 		-Dglx=disabled \
> 		-Ddri3=enabled
> 
>diff -rupN mesa-22/graphics/mesa-gallium-xa/Makefile mesa-23/graphics/mesa-gallium-xa/Makefile
>--- mesa-22/graphics/mesa-gallium-xa/Makefile	2023-03-20 17:36:22.000000000 +0100
>+++ mesa-23/graphics/mesa-gallium-xa/Makefile	2023-09-10 12:36:23.199355000 +0200
>@@ -23,6 +23,7 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgallium-drivers="svga" \
> 		-Dvulkan-drivers="" \
> 		-Dplatforms="" \
>+		-Dandroid-libbacktrace=disabled \
> 		-Dgallium-vdpau=disabled \
> 		-Dgallium-omx=disabled \
> 		-Dgallium-va=disabled \
>@@ -33,10 +34,12 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgles1=disabled \
> 		-Dgles2=disabled \
> 		-Dglx=disabled \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
> 		-Dopengl=false \
> 		-Dshared-glapi=disabled \
>-		-Dosmesa=false
>+		-Dosmesa=false \
>+		-Dvalgrind=disabled
> 
> LDFLAGS_i386=		-Wl,-znotext
> 
>diff -rupN mesa-22/graphics/mesa-libs/Makefile mesa-23/graphics/mesa-libs/Makefile
>--- mesa-22/graphics/mesa-libs/Makefile	2023-09-10 12:19:09.609411000 +0200
>+++ mesa-23/graphics/mesa-libs/Makefile	2023-09-10 12:29:48.000000000 +0200
>@@ -1,6 +1,5 @@
> PORTNAME=	mesa-libs
> PORTVERSION=	${MESAVERSION}
>-PORTREVISION=	2
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL libraries that support GLX and EGL clients
>@@ -35,14 +34,17 @@ USE_LDCONFIG=		yes
> .include <bsd.port.options.mk>
> .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
> 
>-MESON_ARGS+=	-Dgallium-vdpau=disabled \
>+MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
>+		-Dgallium-vdpau=disabled \
> 		-Dgallium-omx=disabled \
> 		-Dgallium-va=disabled \
> 		-Dgallium-xa=disabled \
> 		-Dgallium-nine=false \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
> 		-Dosmesa=false \
> 		-Dtools="" \
>+		-Dvalgrind=disabled \
> 		-Degl=enabled \
> 		-Dgbm=enabled \
> 		-Dvulkan-drivers="" \
>diff -rupN mesa-22/lang/clover/Makefile mesa-23/lang/clover/Makefile
>--- mesa-22/lang/clover/Makefile	2023-03-20 17:59:14.000000000 +0100
>+++ mesa-23/lang/clover/Makefile	2023-09-10 17:03:25.848903000 +0200
>@@ -25,6 +25,7 @@ RUN_DEPENDS=	libclc>=0.3.0:devel/libclc 
> MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dplatforms="" \
> 		-Dvulkan-drivers="" \
>+		-Dandroid-libbacktrace=disabled \
> 		-Dgallium-nine=false \
> 		-Dgallium-omx=disabled \
> 		-Dgallium-opencl=disabled \
>@@ -33,12 +34,14 @@ MESON_ARGS+=	-Ddri-drivers="" \
> 		-Dgallium-xa=disabled \
> 		-Dgles1=disabled \
> 		-Dgles2=disabled \
>+		-Dlmsensors=disabled \
> 		-Dmicrosoft-clc=disabled \
> 		-Dopengl=false \
> 		-Dglx=disabled \
> 		-Degl=disabled \
> 		-Dgbm=disabled \
> 		-Dtools="" \
>+		-Dvalgrind=disabled \
> 		-Dgallium-opencl=icd \
> 		-Dgallium-drivers=r600,radeonsi
>

Actions: View | Diff

Attachments on bug 273703: 244752 | 244817 | 244859 | 245135