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 5E78A138350 for ; Mon, 13 Apr 2020 16:32:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B1ADE0C22; Mon, 13 Apr 2020 16:32:54 +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 6E5ABE0C22 for ; Mon, 13 Apr 2020 16:32:54 +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 B534834F273 for ; Mon, 13 Apr 2020 16:32:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39D4A150 for ; Mon, 13 Apr 2020 16:32:51 +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: <1586795564.a117c20f1b3127d4c397dddef4a7680359f1c9a3.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/files/, media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch media-libs/mesa/mesa-20.0.4-r1.ebuild media-libs/mesa/mesa-20.0.4.ebuild X-VCS-Directories: media-libs/mesa/files/ media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a117c20f1b3127d4c397dddef4a7680359f1c9a3 X-VCS-Branch: master Date: Mon, 13 Apr 2020 16:32:51 +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: 17486181-57e6-4950-ac74-93b3ffd1ef6c X-Archives-Hash: 1a610062458f9bbcee158cae435f5e40 commit: a117c20f1b3127d4c397dddef4a7680359f1c9a3 Author: Matt Turner gentoo org> AuthorDate: Mon Apr 13 16:06:42 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Apr 13 16:32:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a117c20f media-libs/mesa: Revbump in order to rebuild against libdrm And patch the libdrm version requirement so we don't have this problem again. Signed-off-by: Matt Turner gentoo.org> ...ify-the-maximum-required-libdrm-in-dri.pc.patch | 33 ++++++++++++++++++++++ .../{mesa-20.0.4.ebuild => mesa-20.0.4-r1.ebuild} | 4 +++ 2 files changed, 37 insertions(+) diff --git a/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch b/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch new file mode 100644 index 00000000000..09897526a65 --- /dev/null +++ b/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch @@ -0,0 +1,33 @@ +From 316b352e946a9993a20f28abc741d34455a957a8 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Mon, 13 Apr 2020 09:20:18 -0700 +Subject: [PATCH] meson: Specify the maximum required libdrm in dri.pc + +When dealing with a regression in libdrm-2.4.101, I masked the package +in Gentoo. In doing so, we discovered that Mesa's dri.pc specifies a +version requirement in dri.pc for >= the version of libdrm Mesa was +built against, thus preventing packages from being rebuilt with the +older version of libdrm installed. + +Let's reduce this version requirement to the latest libdrm required by +Mesa instead, since libdrm is backward compatible. +--- + src/mesa/drivers/dri/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build +index acf7d2eb128..b09ca16e38a 100644 +--- a/src/mesa/drivers/dri/meson.build ++++ b/src/mesa/drivers/dri/meson.build +@@ -86,7 +86,7 @@ endif + if with_dri + dri_req_private = [] + if dep_libdrm.found() +- dri_req_private = ['libdrm >= ' + dep_libdrm.version()] ++ dri_req_private = ['libdrm >= ' + _drm_ver] + endif + + pkg.generate( +-- +2.24.1 + diff --git a/media-libs/mesa/mesa-20.0.4.ebuild b/media-libs/mesa/mesa-20.0.4-r1.ebuild similarity index 99% rename from media-libs/mesa/mesa-20.0.4.ebuild rename to media-libs/mesa/mesa-20.0.4-r1.ebuild index 18accf194ed..a0d7a8ff5ca 100644 --- a/media-libs/mesa/mesa-20.0.4.ebuild +++ b/media-libs/mesa/mesa-20.0.4-r1.ebuild @@ -246,6 +246,10 @@ x86? ( libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) )" +PATCHES=( + "${FILESDIR}"/${P}-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch +) + llvm_check_deps() { local flags=${MULTILIB_USEDEP} if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi