Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 99F3C84FBB for ; Fri, 14 Jul 2023 06:27:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YR_9YmVMhhB4 for ; Fri, 14 Jul 2023 06:27:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 00ACD84CEB for ; Fri, 14 Jul 2023 06:27:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E8834FBDB; Fri, 14 Jul 2023 06:27:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168931607278020" MIME-Version: 1.0 Date: Fri, 14 Jul 2023 06:27:52 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/graphics/MesaLib To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20230714062752.E8834FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168931607278020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Fri Jul 14 06:27:52 UTC 2023 Modified Files: pkgsrc/graphics/MesaLib: Makefile distinfo Added Files: pkgsrc/graphics/MesaLib/patches: patch-src_glx_glx__pbuffer.c Log Message: graphics/MesaLib: Work around an issue with xf86-video-vmware To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 pkgsrc/graphics/MesaLib/Makefile cvs rdiff -u -r1.164 -r1.165 pkgsrc/graphics/MesaLib/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/MesaLib/patches/patch-src_glx_glx__pbuffer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168931607278020 Content-Disposition: inline Content-Length: 3092 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/MesaLib/Makefile diff -u pkgsrc/graphics/MesaLib/Makefile:1.206 pkgsrc/graphics/MesaLib/Makefile:1.207 --- pkgsrc/graphics/MesaLib/Makefile:1.206 Mon Jul 10 03:16:45 2023 +++ pkgsrc/graphics/MesaLib/Makefile Fri Jul 14 06:27:52 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.206 2023/07/10 03:16:45 pho Exp $ +# $NetBSD: Makefile,v 1.207 2023/07/14 06:27:52 pho Exp $ DISTNAME= mesa-21.3.9 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://mesa.freedesktop.org/archive/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/graphics/MesaLib/distinfo diff -u pkgsrc/graphics/MesaLib/distinfo:1.164 pkgsrc/graphics/MesaLib/distinfo:1.165 --- pkgsrc/graphics/MesaLib/distinfo:1.164 Thu Jul 7 14:05:25 2022 +++ pkgsrc/graphics/MesaLib/distinfo Fri Jul 14 06:27:52 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.164 2022/07/07 14:05:25 wiz Exp $ +$NetBSD: distinfo,v 1.165 2023/07/14 06:27:52 pho Exp $ BLAKE2s (mesa-21.3.9.tar.xz) = e948a37881a088c0df4df880e3d1218b874ed5a8cac951a109249b3648519472 SHA512 (mesa-21.3.9.tar.xz) = 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684 @@ -20,6 +20,7 @@ SHA1 (patch-src_gallium_frontends_clover SHA1 (patch-src_gallium_frontends_osmesa_osmesa.c) = 36631301b02cf89f152925b62f538a3c0b6ab601 SHA1 (patch-src_glx_dri__common.c) = 7fa80f8da89ba90649db170e45c8e842cf69c1eb SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e +SHA1 (patch-src_glx_glx__pbuffer.c) = 92844cfa08dc33047326ecc818d77e8d48f03303 SHA1 (patch-src_glx_glxclient.h) = 7b59d5632e35aa945ad77cd5d1d2fc2e7711e82b SHA1 (patch-src_glx_glxcurrent.c) = bc844ab6bfe32c0a322ff0fc2c1405b67b90b64a SHA1 (patch-src_glx_glxext.c) = 1eacf9062b5926ea6c756e769bf6eebc7671ccba Added files: Index: pkgsrc/graphics/MesaLib/patches/patch-src_glx_glx__pbuffer.c diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-src_glx_glx__pbuffer.c:1.1 --- /dev/null Fri Jul 14 06:27:52 2023 +++ pkgsrc/graphics/MesaLib/patches/patch-src_glx_glx__pbuffer.c Fri Jul 14 06:27:52 2023 @@ -0,0 +1,21 @@ +$NetBSD: patch-src_glx_glx__pbuffer.c,v 1.1 2023/07/14 06:27:52 pho Exp $ + +GLX_EXT_swap_control doesn't work on systems running on vmwgfx. I don't +think this is a proper fix, and the upstream bug report has been seemingly +stuck, but is still necessary for VMware guests. glxgear(1) from +graphics/glx-utils crashes on startup without this workaround. + +https://gitlab.freedesktop.org/mesa/mesa/-/issues/4495 + +--- src/glx/glx_pbuffer.c.orig 2023-07-12 04:37:57.945531844 +0000 ++++ src/glx/glx_pbuffer.c +@@ -309,7 +309,8 @@ __glXGetDrawableAttribute(Display * dpy, + } + + if (pdraw) { +- if (attribute == GLX_SWAP_INTERVAL_EXT) { ++ if (attribute == GLX_SWAP_INTERVAL_EXT ++ && pdraw->psc->driScreen->getSwapInterval != NULL) { + *value = pdraw->psc->driScreen->getSwapInterval(pdraw); + return 0; + } else if (attribute == GLX_MAX_SWAP_INTERVAL_EXT) { --_----------=_168931607278020--