git: 0067155b45c4 - 2023Q1 - x11-drivers/xf86-video-intel: switch to crocus DRI after 23e4dce35c4a
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 05 Feb 2023 06:14:55 UTC
The branch 2023Q1 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0067155b45c4cce26acccf954dabdf1d7857a367
commit 0067155b45c4cce26acccf954dabdf1d7857a367
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-03 04:18:40 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-05 06:14:33 +0000
x11-drivers/xf86-video-intel: switch to crocus DRI after 23e4dce35c4a
PR: 269291
Tested by: nogueira@tuta.io
Approved by: manu
(cherry picked from commit 5c430b858589919a9074afc86ef818a030ec1f81)
---
x11-drivers/xf86-video-intel/Makefile | 2 +-
x11-drivers/xf86-video-intel/files/patch-prefer-iris | 17 +++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 9811c6e012f4..e4cea9dc4886 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -1,7 +1,7 @@
PORTNAME= xf86-video-intel
DISTVERSION= 2.99.917-916
DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-intel/files/patch-prefer-iris b/x11-drivers/xf86-video-intel/files/patch-prefer-iris
index 4c10f2e66fc0..753bd029eb3e 100644
--- a/x11-drivers/xf86-video-intel/files/patch-prefer-iris
+++ b/x11-drivers/xf86-video-intel/files/patch-prefer-iris
@@ -1,29 +1,30 @@
Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/adaa3583f507
+Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/cdde031ac2c8
---- src/sna/sna_dri2.c.orig 2020-11-16 15:23:28 UTC
+--- src/sna/sna_dri2.c.orig 2021-01-15 20:59:05 UTC
+++ src/sna/sna_dri2.c
@@ -3707,8 +3707,10 @@ static const char *dri_driver_name(struct sna *sna)
return has_i830_dri() ? "i830" : "i915";
else if (sna->kgem.gen < 040)
return "i915";
-- else
+ else if (sna->kgem.gen < 0100)
- return "i965";
-+ else
++ return "crocus";
+ else
+- return "i965";
+ return "iris";
}
return s;
---- src/uxa/intel_dri.c.orig 2020-11-16 15:23:28 UTC
+--- src/uxa/intel_dri.c.orig 2021-01-15 20:59:05 UTC
+++ src/uxa/intel_dri.c
@@ -1540,8 +1540,10 @@ static const char *dri_driver_name(intel_screen_privat
return has_i830_dri() ? "i830" : "i915";
else if (INTEL_INFO(intel)->gen < 040)
return "i915";
-- else
+ else if (INTEL_INFO(intel)->gen < 0100)
- return "i965";
-+ else
++ return "crocus";
+ else
+- return "i965";
+ return "iris";
}