From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- media-libs/vulkan-layers/Manifest | 6 +++ ...e-a-file-to-get-the-spirv-tools-commit-ID.patch | 40 +++++++++++++++ .../vulkan-layers-Use-usr-for-vulkan-headers.patch | 57 ++++++++++++++++++++++ media-libs/vulkan-layers/metadata.xml | 16 ++++++ .../vulkan-layers-0_pre20180526.ebuild | 55 +++++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 55 +++++++++++++++++++++ 6 files changed, 229 insertions(+) create mode 100644 media-libs/vulkan-layers/Manifest create mode 100644 media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch create mode 100644 media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch create mode 100644 media-libs/vulkan-layers/metadata.xml create mode 100644 media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-9999.ebuild (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest new file mode 100644 index 000000000000..99175be6f267 --- /dev/null +++ b/media-libs/vulkan-layers/Manifest @@ -0,0 +1,6 @@ +AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b +AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 2610 BLAKE2B a7ae2f31d1eed1bf0120d09e91b67a45a3ef3dae62e19221185eab7edbf7a23bcd6397cea2153ef893e3e958c70a165fbaecb9192c69e81f586c06cb04e124dd SHA512 f55ab09cdaa10562a472001be4613ab2eaf3fed97bd77618d13047d5040d2181236dd8d0366ea13494dcd37abc535448493a9521006bcfd95e89b0bdc57ad51c +DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1 +EBUILD vulkan-layers-0_pre20180526.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8 +EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8 +MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch new file mode 100644 index 000000000000..7688eb8d5cf6 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch @@ -0,0 +1,40 @@ +From 2bcf0e5097070532ebfb0bf0ee0b28e1065be1e8 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Tue, 22 May 2018 20:11:17 -0400 +Subject: [PATCH] Use a file to get the spirv-tools commit ID + +Signed-off-by: Nick Sarnie +--- + layers/CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 5b3758d1..2a9c2f32 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -51,6 +51,13 @@ macro(run_external_revision_generate symbol_name output) + ) + endmacro() + ++macro(run_external_revision_generate_spirv_tools source_dir symbol_name output) ++ add_custom_command(OUTPUT ${output} ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h ++ ) ++endmacro() ++ + # Custom targets for generated validation layer helper file dependencies + add_custom_target(spirv_tools_revision_file DEPENDS + spirv_tools_commit_id.h +@@ -78,7 +85,7 @@ 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) + if(BUILD_LAYERS) +- run_external_revision_generate(SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++ run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) + endif() + + # Layer Utils Library +-- +2.17.0 + diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch new file mode 100644 index 000000000000..a4829d9997a7 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch @@ -0,0 +1,57 @@ +From 42fb7b4c73b0cae196a2eb6d97bfa6cc635f23fb Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Sat, 26 May 2018 17:39:08 -0400 +Subject: [PATCH] Use usr for vulkan headers + +Signed-off-by: Nick Sarnie +--- + CMakeLists.txt | 2 +- + layers/CMakeLists.txt | 5 +++-- + scripts/lvl_genvk.py | 2 +- + 3 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 178debdd..dc742304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + find_package(PythonInterp 3 REQUIRED) + + # TODO: Add option to override this with env var, or even to use SDK +-set(VULKAN_HEADERS_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") ++set(VULKAN_HEADERS_LOCATION "/usr") + + # Output warning if vulkan headers submodule contents are not present + if (NOT EXISTS "${VULKAN_HEADERS_LOCATION}/include/vulkan/vulkan_core.h") +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 962c4be6..26e5abaf 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") + # Define macro used for building vkxml generated files + macro(run_vk_xml_generate dependency output) + add_custom_command(OUTPUT ${output} +- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${output} +- DEPENDS ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${VULKAN_HEADERS_LOCATION}/registry/reg.py ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${output} ++ DEPENDS ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ++${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/reg.py + ) + endmacro() + +diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py +index 4dac9ca2..6ea83ddb 100644 +--- a/scripts/lvl_genvk.py ++++ b/scripts/lvl_genvk.py +@@ -16,7 +16,7 @@ + + import argparse, cProfile, pdb, string, sys, time, os + scripts_directory_path = os.path.dirname(os.path.abspath(__file__)) +-registry_headers_path = os.path.join(scripts_directory_path, '../Vulkan-Headers/registry') ++registry_headers_path = os.path.join(scripts_directory_path, '/usr/include/vulkan/registry') + sys.path.insert(0, registry_headers_path) + + from reg import * +-- +2.17.0 + diff --git a/media-libs/vulkan-layers/metadata.xml b/media-libs/vulkan-layers/metadata.xml new file mode 100644 index 000000000000..d87b452b7dbc --- /dev/null +++ b/media-libs/vulkan-layers/metadata.xml @@ -0,0 +1,16 @@ + + + + + x11@gentoo.org + X11 + + + sarnex@gentoo.org + Nick Sarnie + + + KhronosGroup/Vulkan-ValidationLayers + + + diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild new file mode 100644 index 000000000000..ca8180bed039 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild @@ -0,0 +1,55 @@ +# 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-ValidationLayers.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=False + -DGLSLANG_INSTALL_DIR="/usr" + ) + cmake-utils_src_configure +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild new file mode 100644 index 000000000000..ca8180bed039 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -0,0 +1,55 @@ +# 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-ValidationLayers.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=False + -DGLSLANG_INSTALL_DIR="/usr" + ) + cmake-utils_src_configure +} -- cgit v1.2.3