From nobody Sun Feb 5 06:14:55 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8fHz4cYyz3mvsZ; Sun, 5 Feb 2023 06:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8fHz48Kmz3Dff; Sun, 5 Feb 2023 06:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675577695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e3jwcQS5HQ+jNMgLXVW+SG7yO3g1uLOFT4eUN/MdK0Y=; b=i/+Q4pBnYg5xYbQ0iJja7DViKG/dsPclbVRfD0XVJDwPvOKFyfHMBUuj+pRa5xEBO9/6F5 Lg+tkzVfquLQLhh2MZrrOA0bDFbyl8gW3CFueOHiv4QoHECciZ7i1+oBNo6ichHdABJwow mRO/FLdgfNl9OFhF+wcFPDaGrY7wk/bcrNz9lwmPhYkLNwh8uzwTPVz4GjIB7gkPtYU5/m 2aLgkX2vhOAWlFGeHDW1d+AOUWKkOEFldtOHbHpeFWTWqPwJEP3Ggr3Qj1mwvnoXQCTLiK sD0UQLdVD6UjhTkhEGPv5VRTlORx92KZ4ZAyNVSCJhKDXPIjK0LVyC1GDT2wdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675577695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e3jwcQS5HQ+jNMgLXVW+SG7yO3g1uLOFT4eUN/MdK0Y=; b=tGLOBf3Y2etA4LbktSptR+Pn6QNluVo75BUgRt2GBbqNEoHqRpTS176j3CcxUS8UtMeFLe 9uZqQvoZcIbJWfUW2zWc5+44hZGC5hjaJDfwDwdHbakGHhlLWIwsczl7aUkwU7LLgYEajR 8z1g3+47aTs110Leys8CJkSiei8pbYTwbGHYk8X5Nkn+m1VJT8a3k4gpOabXiJgIkPAMpN sVVDnlFR89bNgiBm+IO0ZBjqAsr8XalWm87diUu32eSzD8YgjFo+WTXIKl7EftxWlkAYuo 5g6tylIjXF/lD1sp10FMJSULBxpoZCyGsr+/o9MjuRc+kOB/k4EFjB0cejEOzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675577695; a=rsa-sha256; cv=none; b=k6Jy3t7++Y+q3xqAQD4oFMzlZyXkOh1/UjoLn0bjyPke9FVoDlqH86YlJbjhsG5uOHcjVb UUHGSjhJKnYvvkditinSpdK2RRVF1h7HnHRshkjHtu8SsY4dmbmDUb5u9YfZ8hluJGvkPq xO5jyjxdK6E712TvkHyReQVTAlglT++Ihh2C3/QFbkDErEyGBgSin/N4kiYEBY41SR70Hk Lufw+fbiinASnGkQ4WTgWf1PXyPzlgDUjFSdR6rlH8DTVpULAOdqxDXX77XTqchiNEfvnu Xq8ehWugwxS5cPeNUgPzfzVkAwssWSvx1Hjz7byFMCDWiM5iRlwqaHQhsHXk4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P8fHz3CNbzkQ7; Sun, 5 Feb 2023 06:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3156EtDV000538; Sun, 5 Feb 2023 06:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3156EtxH000537; Sun, 5 Feb 2023 06:14:55 GMT (envelope-from git) Date: Sun, 5 Feb 2023 06:14:55 GMT Message-Id: <202302050614.3156EtxH000537@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 0067155b45c4 - 2023Q1 - x11-drivers/xf86-video-intel: switch to crocus DRI after 23e4dce35c4a List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 0067155b45c4cce26acccf954dabdf1d7857a367 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0067155b45c4cce26acccf954dabdf1d7857a367 commit 0067155b45c4cce26acccf954dabdf1d7857a367 Author: Jan Beich AuthorDate: 2023-02-03 04:18:40 +0000 Commit: Jan Beich 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"; }