dev-util/spirv-tools: Uprev to 2020.6
Required by uprev of vulkan-layers.
This is a copy of the upstream ebuild with the following change:
- Add python_36 to PYTHON_COMPAT.
BUG=b:195986385
TEST=emerge-$BOARD spirv-tools
Change-Id: Ie5aacf9cd851e8f81a454207469191ae01a27974
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3098399
Tested-by: Chad Versace <chadversary@chromium.org>
Auto-Submit: Chad Versace <chadversary@chromium.org>
Reviewed-by: Chia-I Wu <olv@google.com>
Reviewed-by: Matt Turner <msturner@google.com>
Commit-Queue: Chad Versace <chadversary@chromium.org>
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index ab2ae6d..d32cb5f 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1 +1 @@
-DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
+DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
diff --git a/dev-util/spirv-tools/OWNERS b/dev-util/spirv-tools/OWNERS
index 3f0223d..25664ce 100644
--- a/dev-util/spirv-tools/OWNERS
+++ b/dev-util/spirv-tools/OWNERS
@@ -1,2 +1,3 @@
chadversary@chromium.org
+msturner@google.com
olv@google.com
diff --git a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
similarity index 78%
rename from dev-util/spirv-tools/spirv-tools-2020.6.ebuild
rename to dev-util/spirv-tools/spirv-tools-2021.1.ebuild
index 78f6fca..e564c87 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
@@ -12,8 +12,8 @@
EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
inherit git-r3
else
- EGIT_COMMIT="${PV}"
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ EGIT_COMMIT="c2d5375fa7cc87c93f692e7200d5d974283d4391"
+ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="*"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
@@ -26,7 +26,7 @@
# Tests fail upon finding symbols that do not match a regular expression
# in the generated library. Easily hit with non-standard compiler flags
RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
@@ -34,7 +34,7 @@
multilib_src_configure() {
local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=/usr/"
+ "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
"-DSPIRV_WERROR=OFF"
"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
"-DBUILD_SHARED_LIBS=ON"
