From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2531C1382C5 for ; Thu, 11 Mar 2021 16:43:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F13B1E075F; Thu, 11 Mar 2021 16:43:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D667CE075F for ; Thu, 11 Mar 2021 16:43:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9F18335D0D for ; Thu, 11 Mar 2021 16:43:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EEC44AF for ; Thu, 11 Mar 2021 16:43:07 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1615480680.de371306554b093d175fa9e12163b2e377d17762.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-20.3.4.ebuild media-libs/mesa/mesa-21.0.0_rc5.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: de371306554b093d175fa9e12163b2e377d17762 X-VCS-Branch: master Date: Thu, 11 Mar 2021 16:43:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ca392bc9-6038-490d-b84e-84d8db5a5eb2 X-Archives-Hash: 546b66f4cbb73ad7834b263418c74f70 commit: de371306554b093d175fa9e12163b2e377d17762 Author: Matt Turner gentoo org> AuthorDate: Thu Mar 11 16:36:22 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Mar 11 16:38:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de371306 media-libs/mesa: Check for CONFIG_KCMP on appropriate kernel versions Closes: https://bugs.gentoo.org/775095 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-20.3.4.ebuild | 10 +++++++++- media-libs/mesa/mesa-21.0.0_rc5.ebuild | 12 ++++++++++-- media-libs/mesa/mesa-9999.ebuild | 12 ++++++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-20.3.4.ebuild index 25e12ae1cd2..3bcef8c1917 100644 --- a/media-libs/mesa/mesa-20.3.4.ebuild +++ b/media-libs/mesa/mesa-20.3.4.ebuild @@ -333,7 +333,15 @@ pkg_setup() { if use video_cards_i965 || use video_cards_iris || use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi linux-info_pkg_setup fi diff --git a/media-libs/mesa/mesa-21.0.0_rc5.ebuild b/media-libs/mesa/mesa-21.0.0_rc5.ebuild index 8aeb115afdd..9eb4c982078 100644 --- a/media-libs/mesa/mesa-21.0.0_rc5.ebuild +++ b/media-libs/mesa/mesa-21.0.0_rc5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -337,7 +337,15 @@ pkg_setup() { if use video_cards_i965 || use video_cards_iris || use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi linux-info_pkg_setup fi diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index c004f76fad6..9aa7c68c80f 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -337,7 +337,15 @@ pkg_setup() { if use video_cards_i965 || use video_cards_iris || use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi linux-info_pkg_setup fi