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 1A8C61382C5 for ; Wed, 10 Mar 2021 15:06:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F6DFE0831; Wed, 10 Mar 2021 15:06:36 +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 208D7E0831 for ; Wed, 10 Mar 2021 15:06:36 +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 B528E340D40 for ; Wed, 10 Mar 2021 15:06:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3671573 for ; Wed, 10 Mar 2021 15:06:32 +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: <1615388787.d3ff9b98f75ebcb9a2822ac2a485a78eb71aab76.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/, media-libs/mesa/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/mesa/files/mesa-20.3.4-intel-git_sha1.patch media-libs/mesa/mesa-20.3.4.ebuild X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: d3ff9b98f75ebcb9a2822ac2a485a78eb71aab76 X-VCS-Branch: master Date: Wed, 10 Mar 2021 15:06:32 +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: 9b3ee6e3-4925-4081-9839-c0ce56b3137b X-Archives-Hash: cbd6cb6d84a0da7ada0be29c6a6d527b commit: d3ff9b98f75ebcb9a2822ac2a485a78eb71aab76 Author: Jory Pratt gentoo org> AuthorDate: Wed Mar 10 15:06:27 2021 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Mar 10 15:06:27 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d3ff9b98 media-libs/mesa: unbreak intel users build Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Jory Pratt gentoo.org> .../mesa/files/mesa-20.3.4-intel-git_sha1.patch | 25 ++++++++++++++++++++++ media-libs/mesa/mesa-20.3.4.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/media-libs/mesa/files/mesa-20.3.4-intel-git_sha1.patch b/media-libs/mesa/files/mesa-20.3.4-intel-git_sha1.patch new file mode 100644 index 0000000..2919d57 --- /dev/null +++ b/media-libs/mesa/files/mesa-20.3.4-intel-git_sha1.patch @@ -0,0 +1,25 @@ +From 4ffaff669266dd5b633d2e44ca842c49f0a1d2fb Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Wed, 10 Mar 2021 08:48:37 -0600 +Subject: [PATCH] ensure git_sha1.h is generated for use + +--- + src/intel/common/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build +index 66e0967..422d22a 100644 +--- a/src/intel/common/meson.build ++++ b/src/intel/common/meson.build +@@ -42,7 +42,7 @@ files_libintel_common = files( + ) + + libintel_common = static_library( +- ['intel_common', genX_xml_h], ++ ['intel_common', genX_xml_h, sha1_h], + files_libintel_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], + c_args : [no_override_init_args], +-- +2.26.2 + diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-20.3.4.ebuild index 1810be3..acdeb09 100644 --- a/media-libs/mesa/mesa-20.3.4.ebuild +++ b/media-libs/mesa/mesa-20.3.4.ebuild @@ -243,6 +243,7 @@ x86? ( PATCHES=( "${FILESDIR}"/${PN}-20.2.0-add-disable-tls-support.patch + "${FILESDIR}"/${PN}-20.3.4-intel-git_sha1.patch ) llvm_check_deps() {