Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Dec 2021 00:31:34 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 653cd5df958e - main - graphics/mesa-devel: update to 21.3.b.1729
Message-ID:  <202112090031.1B90VYre073942@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=653cd5df958e98d557cc190838e61c66b168b267

commit 653cd5df958e98d557cc190838e61c66b168b267
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-20 00:03:45 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-09 00:29:53 +0000

    graphics/mesa-devel: update to 21.3.b.1729
    
    Changes:        https://gitlab.freedesktop.org/mesa/mesa/-/compare/cdeecadcb6e...ff74d5dd1b8
---
 graphics/mesa-devel/Makefile  | 15 +++++----------
 graphics/mesa-devel/distinfo  | 12 +++++-------
 graphics/mesa-devel/pkg-plist |  1 -
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 5d48c8b0703b..993019e036a4 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	mesa
-DISTVERSION=	21.3-branchpoint-1187
-DISTVERSIONSUFFIX=	-gcdeecadcb6e
+DISTVERSION=	21.3-branchpoint-1729
+DISTVERSIONSUFFIX=	-gff74d5dd1b8
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cb8f7a253934.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3568
 PATCHFILES+=	700efacda59c.patch:-p1
-PATCHFILES+=	e141af3ac859.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512
 PATCHFILES+=	50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881
+PATCHFILES+=	e3ef7eedc94f.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14120
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenGL, Vulkan)
@@ -48,14 +47,13 @@ PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 
 OPTIONS_DEFINE=		LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_DEFAULT=	LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
-OPTIONS_GROUP=		DRI GALLIUM VULKAN
-OPTIONS_GROUP_DRI=	i965
+OPTIONS_GROUP=		GALLIUM VULKAN
 OPTIONS_GROUP_GALLIUM=	crocus iris r600 radeonsi
 OPTIONS_GROUP_VULKAN=	anv radv
 OPTIONS_EXCLUDE_DragonFly=	LIBUNWIND anv
 OPTIONS_EXCLUDE_i386=	LTO # anv: vkcube fails on vkCreateSwapchainKHR
 OPTIONS_EXCLUDE_powerpc64=	${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLVM bug 47353
-OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv crocus i965 iris/}
+OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv crocus iris/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/}
 OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:}
 OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:}
@@ -70,9 +68,6 @@ ${j}_VARS+=		${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/}
 . endfor
 .endfor
 
-DRI_DESC=		Classic OpenGL drivers
-i965_DESC=		GMA 3000 (Gen4) and newer
-
 GALLIUM_DESC=		Unified OpenGL drivers
 crocus_DESC=		Broadwater, Eaglelake, Ironlake, Sandybridge, Ivybridge, Haswell
 iris_DESC=		Broadwell and newer
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 91f0225a5049..7305ebe8f924 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1637366625
-SHA256 (mesa3d-mesa-21.3-branchpoint-1187-gcdeecadcb6e_GH0.tar.gz) = 1a026c35ee6cbcc6b0ea113cd55dfb7c25a02d35033cab4743bebc8fdd34542b
-SIZE (mesa3d-mesa-21.3-branchpoint-1187-gcdeecadcb6e_GH0.tar.gz) = 25546336
-SHA256 (cb8f7a253934.patch) = 9e914ac8325ce15ab0cc38610e72b683f958114c57402d3a948c7533fce65393
-SIZE (cb8f7a253934.patch) = 3512
+TIMESTAMP = 1639004372
+SHA256 (mesa3d-mesa-21.3-branchpoint-1729-gff74d5dd1b8_GH0.tar.gz) = 641257e8ac760a77f843254b71a94e6af04af5a508c36e35699f347acd010fed
+SIZE (mesa3d-mesa-21.3-branchpoint-1729-gff74d5dd1b8_GH0.tar.gz) = 23813578
 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5
 SIZE (700efacda59c.patch) = 981
-SHA256 (e141af3ac859.patch) = b547f7389a9ea7f9d69e32e86854b291f04b2f2f5738cd87b2aa73507ab60456
-SIZE (e141af3ac859.patch) = 2379
 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470
 SIZE (50433886a3e3.patch) = 2008
+SHA256 (e3ef7eedc94f.patch) = b1e97ab254156a5616bd39e816e3c1d048b84f883170d1ddda7d93271f2fb5d3
+SIZE (e3ef7eedc94f.patch) = 2053
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index fd66c9eaeb42..9d795ca0130f 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -4,7 +4,6 @@
 %%NO_COINST%%include/EGL/eglmesaext.h
 %%NO_COINST%%include/GL/internal/dri_interface.h
 %%NO_COINST%%include/gbm.h
-%%i965%%lib/dri%%SUFFIX%%/i965_dri.so
 %%crocus%%lib/dri%%SUFFIX%%/crocus_dri.so
 %%iris%%lib/dri%%SUFFIX%%/iris_dri.so
 %%r600%%lib/dri%%SUFFIX%%/r600_dri.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112090031.1B90VYre073942>