Attachment 220642 Details for Bug 251836 – Exclude GLX_EXT_buffer_age on iris under kwin_x11 (workaround), v2

[patch] Exclude GLX_EXT_buffer_age on iris under kwin_x11 (workaround), v2

bug251836.diff (text/plain), 2.24 KB, created by Jan Beich on 2020-12-16 19:56:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-12-16 19:56:17 UTC

Size: 2.24 KB

patch

obsolete

>From 525e8710c4db5db9b23de67089acf0d705aadfbb Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 16 Dec 2020 19:12:22 +0000
>Subject: [PATCH] graphics/mesa-dri: exclude buffer age on iris under kwin
>
>Freeze in OpenGL initialization detected
>
>PR:		251836
>Approved by:	manu
>---
> graphics/mesa-dri/Makefile              |  3 +++
> graphics/mesa-dri/files/01-freebsd.conf | 10 ++++++++++
> graphics/mesa-dri/pkg-plist             |  1 +
> 3 files changed, 14 insertions(+)
> create mode 100644 graphics/mesa-dri/files/01-freebsd.conf
>
>diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
>index 57798fcf8358..c9739f93106f 100644
>--- a/graphics/mesa-dri/Makefile
>+++ b/graphics/mesa-dri/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mesa-dri
> PORTVERSION=	${MESAVERSION}
>+PORTREVISION=	1
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
>@@ -112,5 +113,7 @@ PLIST_SUB+=	${_vd}_VDRIVER="@comment "
> 
> post-install:
> 	@${RM} -r ${STAGEDIR}/etc/OpenCL
>+	${INSTALL_DATA} ${FILESDIR}/01-freebsd.conf \
>+		${STAGEDIR}${PREFIX}/share/drirc.d
> 
> .include <bsd.port.post.mk>
>diff --git a/graphics/mesa-dri/files/01-freebsd.conf b/graphics/mesa-dri/files/01-freebsd.conf
>new file mode 100644
>index 000000000000..02282ee9e1cb
>--- /dev/null
>+++ b/graphics/mesa-dri/files/01-freebsd.conf
>@@ -0,0 +1,10 @@
>+<driconf>
>+    <device driver="iris">
>+        <application name="kwin_x11" executable="kwin_x11">
>+            
>+            <option name="glx_extension_override" value="-GLX_EXT_buffer_age" />
>+            
>+            <option name="glx_disable_ext_buffer_age" value="true" />
>+        </application>
>+    </device>
>+</driconf>
>diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
>index f004c141ad61..d0020d968ba9 100644
>--- a/graphics/mesa-dri/pkg-plist
>+++ b/graphics/mesa-dri/pkg-plist
>@@ -33,5 +33,6 @@ include/GL/internal/dri_interface.h
> libdata/pkgconfig/dri.pc
> @comment libdata/pkgconfig/gbm.pc
> share/drirc.d/00-mesa-defaults.conf
>+share/drirc.d/01-freebsd.conf
> %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
> %%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json

Flags:

jbeich: maintainer-approval? (x11)
manu: maintainer-approval+

Actions: View | Diff

Attachments on bug 251836: 220627 | 220641 | 220642