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 7EDE01382C5 for ; Wed, 10 Mar 2021 15:19:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C90EAE084A; Wed, 10 Mar 2021 15:19:52 +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 9F661E084A for ; Wed, 10 Mar 2021 15:19:52 +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 75040335D42 for ; Wed, 10 Mar 2021 15:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25009573 for ; Wed, 10 Mar 2021 15:19:50 +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: <1615389583.412af79d1e12ddca4d625dde09e24f9e02726f04.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.3.4-intel-git_sha1.patch media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch media-libs/mesa/mesa-20.3.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: 412af79d1e12ddca4d625dde09e24f9e02726f04 X-VCS-Branch: master Date: Wed, 10 Mar 2021 15:19:50 +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: 2ade3f5d-13af-41fe-9aa8-16313867a387 X-Archives-Hash: 7ff796fb3d2029f6a21ee955fd1720ba commit: 412af79d1e12ddca4d625dde09e24f9e02726f04 Author: Jory Pratt gentoo org> AuthorDate: Wed Mar 10 15:19:43 2021 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Mar 10 15:19:43 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=412af79d media-libs/mesa: use upstream patch for git_sha1 generation missing 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 ---------- .../mesa/files/mesa-20.3.4-missing-git_sha1.patch | 57 ++++++++++++++++++++++ media-libs/mesa/mesa-20.3.4.ebuild | 2 +- 3 files changed, 58 insertions(+), 26 deletions(-) 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 deleted file mode 100644 index 2919d57..0000000 --- a/media-libs/mesa/files/mesa-20.3.4-intel-git_sha1.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/files/mesa-20.3.4-missing-git_sha1.patch b/media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch new file mode 100644 index 0000000..c994a7a --- /dev/null +++ b/media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch @@ -0,0 +1,57 @@ +From 434da21a7c81acbe03f0e1621e80904313c0b05c Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Wed, 16 Dec 2020 00:48:25 -0800 +Subject: [PATCH] meson: add missing dependency on generated git_sha1.h + +Reviewed-by: Lionel Landwerlin +Reviewed-by: Eric Anholt +Part-of: +--- + src/freedreno/common/meson.build | 1 + + src/gallium/frontends/lavapipe/meson.build | 2 +- + src/intel/common/meson.build | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/freedreno/common/meson.build b/src/freedreno/common/meson.build +index 2da6c1eacf8..30ef23043a7 100644 +--- a/src/freedreno/common/meson.build ++++ b/src/freedreno/common/meson.build +@@ -27,6 +27,7 @@ libfreedreno_common = static_library( + 'freedreno_uuid.c', + 'freedreno_uuid.h', + 'freedreno_guardband.h', ++ sha1_h, + ], + include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium], + c_args : [no_override_init_args], +diff --git a/src/gallium/frontends/lavapipe/meson.build b/src/gallium/frontends/lavapipe/meson.build +index 972735fcff9..94c68d14d23 100644 +--- a/src/gallium/frontends/lavapipe/meson.build ++++ b/src/gallium/frontends/lavapipe/meson.build +@@ -57,7 +57,7 @@ endif + + liblavapipe_st = static_library( + 'lavapipe_st', +- [liblvp_files, lvp_entrypoints, lvp_extensions_c ], ++ [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h], + link_with : [ libvulkan_wsi ], + c_args : [ lvp_flags ], + gnu_symbol_visibility : 'hidden', +diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build +index 2586b4cf956..53c458f447d 100644 +--- a/src/intel/common/meson.build ++++ b/src/intel/common/meson.build +@@ -42,8 +42,8 @@ files_libintel_common = files( + ) + + libintel_common = static_library( +- ['intel_common', genX_xml_h], +- files_libintel_common, ++ 'intel_common', ++ [files_libintel_common, genX_xml_h, sha1_h], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], + c_args : [no_override_init_args], + gnu_symbol_visibility : 'hidden', +-- +GitLab + diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-20.3.4.ebuild index acdeb09..001daa0 100644 --- a/media-libs/mesa/mesa-20.3.4.ebuild +++ b/media-libs/mesa/mesa-20.3.4.ebuild @@ -243,7 +243,7 @@ x86? ( PATCHES=( "${FILESDIR}"/${PN}-20.2.0-add-disable-tls-support.patch - "${FILESDIR}"/${PN}-20.3.4-intel-git_sha1.patch + "${FILESDIR}"/${PN}-20.3.4-missing-git_sha1.patch ) llvm_check_deps() {