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 2E071138350 for ; Tue, 14 Apr 2020 12:40:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77D1AE09D6; Tue, 14 Apr 2020 12:40:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 55BECE09D6 for ; Tue, 14 Apr 2020 12:40:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E3A7234F2DA for ; Tue, 14 Apr 2020 12:40:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9CE6197 for ; Tue, 14 Apr 2020 12:40:01 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1586867994.987bbf44350beea8c805775f0e8bc7fcd7df0b30.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: proj/musl 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: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 987bbf44350beea8c805775f0e8bc7fcd7df0b30 X-VCS-Branch: master Date: Tue, 14 Apr 2020 12:40:01 +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: 438dc6d6-4c31-4b23-8aaa-3d0c2318e5c7 X-Archives-Hash: 06578cdaab7c540d409f7a7504c43be0 commit: 987bbf44350beea8c805775f0e8bc7fcd7df0b30 Author: Jory Pratt gentoo org> AuthorDate: Tue Apr 14 12:39:54 2020 +0000 Commit: Jory Pratt gentoo org> CommitDate: Tue Apr 14 12:39:54 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=987bbf44 media-libs/mesa: Revbump in order to rebuild against libdrm Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Jory Pratt gentoo.org> ...ify-the-maximum-required-libdrm-in-dri.pc.patch | 33 ++++++++++++++++++++++ .../{mesa-20.0.4.ebuild => mesa-20.0.4-r1.ebuild} | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) 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 0000000..0989752 --- /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 2861ed0..0f4c37a 100644 --- a/media-libs/mesa/mesa-20.0.4.ebuild +++ b/media-libs/mesa/mesa-20.0.4-r1.ebuild @@ -98,7 +98,7 @@ RDEPEND=" ) lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( - dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] + >=virtual/opencl-3[${MULTILIB_USEDEP}] dev-libs/libclc virtual/libelf:0=[${MULTILIB_USEDEP}] ) @@ -248,6 +248,7 @@ x86? ( PATCHES=( "${FILESDIR}"/${PN}-19.3.0-add-disable-tls-support.patch + "${FILESDIR}"/${P}-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch ) llvm_check_deps() {