commit:     38052d48e474e46936b5af491b0698fb768c2c03
Author:     Nick Sarnie <commendsarnex <AT> gmail <DOT> com>
AuthorDate: Sat Apr 14 19:48:05 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 19:50:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38052d48

media-libs/vulkan-loader: Version bump to 1.1.70

Closes: https://bugs.gentoo.org/652322

 media-libs/vulkan-loader/Manifest                  |  1 +
 ...nt-require-glslang-if-not-building-layers.patch | 45 ++++++++++++++++
 .../vulkan-loader/vulkan-loader-1.1.70.0.ebuild    | 63 ++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/media-libs/vulkan-loader/Manifest 
b/media-libs/vulkan-loader/Manifest
index cf90c8b575b..c53ca107c93 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -4,3 +4,4 @@ DIST vulkan-loader-1.0.46.0.tar.gz 3732605 BLAKE2B 
364f6a763d016bebb1100dc594a00
 DIST vulkan-loader-1.0.51.0.tar.gz 3796337 BLAKE2B 
9a418e6e4cfe1f19c8716788452f4ed219be14fcdadf3c5cb983d031f3a95a7f6322a94aced391711ba486274611ff5ea2ae87c2116a6c16b9aa0b2f97e10c72
 SHA512 
5d198fc9537c8fa3cbde19fc74f8d47595fabcb52c8db1c626fa157f171ed74ad202e086f7c9e94827c1ab682d03bae58af690c510c6705ca92db0548ee575f6
 DIST vulkan-loader-1.0.54.0.tar.gz 3842785 BLAKE2B 
72b14546859f38f090554a9ff04dce91fb0764f5180ca22a3e863e992276c4c4e9a85ca946b18a0c54fed99b58a39b9c65a67c4302aa337e89a04d435a606df2
 SHA512 
f5478e1a7f966a2d09b97a3b47a04b4c9ccd68b88126fefcd6f97bfd0347c5a5bebf52e1cdfccc4863d22dd3b875e04cddf406e3e546eb3dc50d2ef61d85a21f
 DIST vulkan-loader-1.0.61.1.tar.gz 3889453 BLAKE2B 
0d5f1335e874294350e02063b11e5efb3d1f3bb69a7c970f2b6a6cbe9b78651c7810644d30b404016ed126ad63c4ab46b017c2ef033ba1c45046fd310218cd55
 SHA512 
e16599ca458dc1c636c80a03693edc4a24563e08768de95e7711cd7927d7cfdcd0ce14d16d938ca066bfe4ce8fe43836d2b61973bc2a7ba6ad14ab5f18166e0e
+DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 
86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063
 SHA512 
ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26

diff --git 
a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
 
b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
new file mode 100644
index 00000000000..3c5a30b10a0
--- /dev/null
+++ 
b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
@@ -0,0 +1,45 @@
+From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <ch...@gentoo.org>
+Date: Thu, 15 Mar 2018 22:25:19 +0000
+Subject: [PATCH] build: Don't require glslang if not building layers
+
+---
+ CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713a9cdfd3..c9f73ce965 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir 
symbol_name output)
+ endmacro()
+ 
+ # Custom target for generated vulkan helper file dependencies
++set(generate_helper_files_DEPENDS)
++if(BUILD_LAYERS)
++    LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h)
++endif()
+ add_custom_target(generate_helper_files DEPENDS
+     vk_enum_string_helper.h
+     vk_safe_struct.h
+@@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS
+     vk_dispatch_table_helper.h
+     vk_extension_helper.h
+     vk_typemap_helper.h
+-    spirv_tools_commit_id.h
++    ${generate_helper_files_DEPENDS}
+     )
+ set_target_properties(generate_helper_files PROPERTIES FOLDER 
${LVL_TARGET_FOLDER})
+ 
+@@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py 
vk_enum_string_helper.h)
+ run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
+ run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
+ run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
+-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools
 SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
++if(BUILD_LAYERS)
++    
run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools
 SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
++endif()
+ 
+ 
+ 
+

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild
new file mode 100644
index 00000000000..05bb1fc476f
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+       
EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git";
+       inherit git-r3
+else
+       KEYWORDS="~amd64"
+       
SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz
 -> ${P}.tar.gz"
+       S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="demos layers wayland X"
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+       demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+       layers? (
+                       dev-util/glslang:=[${MULTILIB_USEDEP}]
+                       >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
+               )
+       wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+       X? (
+               x11-libs/libX11:=[${MULTILIB_USEDEP}]
+               x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+       )"
+
+PATCHES=(
+               
"${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
+               
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+       )
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_SKIP_RPATH=True
+               -DBUILD_TESTS=False
+               -DBUILD_LAYERS=$(usex layers)
+               -DBUILD_DEMOS=$(usex demos)
+               -DBUILD_VKJSON=False
+               -DBUILD_LOADER=True
+               -DBUILD_WSI_MIR_SUPPORT=False
+               -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+               -DBUILD_WSI_XCB_SUPPORT=$(usex X)
+               -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+       )
+       cmake-utils_src_configure
+}
+
+multilib_src_install() {
+       keepdir /etc/vulkan/icd.d
+
+       default
+}

Reply via email to