diff options
Diffstat (limited to 'dev-util/vulkan-tools')
| -rw-r--r-- | dev-util/vulkan-tools/Manifest | 7 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch | 35 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild (renamed from dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild) | 5 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 2 |
4 files changed, 6 insertions, 43 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 257a3cb27944..e15448b7f3a3 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,5 +1,4 @@ -AUX vulkan-tools-Use-usr-for-vulkan-headers.patch 1240 BLAKE2B 2206e0777c2c7fea95a1e0b43e09de372b6a898275b3dbfa3bc1cac84125be42ade8834ffb8b2fd872f8d8ffa64aa70b456ad5c2e63c98c9aa4abd1995777043 SHA512 c96da656fe2d32af3ea5fbf348e6297be88b1581bda55e65a97d8d96229363b26285495929d5fa749b8e8fc9c20aa16ee529bcdf020191d46eac9bf97bab4511 -DIST vulkan-tools-0_pre20180601.tar.gz 421373 BLAKE2B d7c6870cf27397800a2af512b0bf05919b01dc30d84961d8a8dceacf005be461a8b250ef65cbfee8b070ef7f6fe8544deb855c06aee99f6b5175f4073b5a051c SHA512 f41517c22fb06aee07d40b947c756d97453810998ccb6e8cf8c48a439de1826361fcd84f0e96eaf3898e373e732d3b938c807da6fc2a736d3b986c2d30778ba2 -EBUILD vulkan-tools-0_pre20180601.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f -EBUILD vulkan-tools-9999.ebuild 1465 BLAKE2B 4100099eb8fedd15c99eb4ee6ef33137421bd6f996dd19bca8f3e575240dbbe02b8ce27ded58dfff1a8faffbf0b17902269bf0bd5c5275d08dc43e41ff5b7150 SHA512 cc72acc0b479694f8742c9cd8d05aa66c470734d9bcedde58d7d8a68c762e0bbe47520c089e33f8a5493047ff4392ba5f447bb2510441c9f954e0639b657e9db +DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725 +EBUILD vulkan-tools-1.1.77.0.ebuild 1465 BLAKE2B bd973e88e2bc8ad9a843f6e732233a74977acee79183f7ffbc57ebfccacb80caf6967025f6f7fc59683ffcd289b84b8d517a1221c18c979322099df6d605b404 SHA512 e9f0af61f4f1e1c686e7e9b0d4bf6864114db3dc781a6e60392e66a912d88cf55d18c14e309b7c35ebf2a835ddcb6feb51c503b574b411078b184126af1760ad +EBUILD vulkan-tools-9999.ebuild 1465 BLAKE2B bd973e88e2bc8ad9a843f6e732233a74977acee79183f7ffbc57ebfccacb80caf6967025f6f7fc59683ffcd289b84b8d517a1221c18c979322099df6d605b404 SHA512 e9f0af61f4f1e1c686e7e9b0d4bf6864114db3dc781a6e60392e66a912d88cf55d18c14e309b7c35ebf2a835ddcb6feb51c503b574b411078b184126af1760ad MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668 diff --git a/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch deleted file mode 100644 index b9797e19ad2f..000000000000 --- a/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9498942c820525dc531f643696b7938d3f5fa482 Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <sarnex@gentoo.org> -Date: Tue, 22 May 2018 19:55:59 -0400 -Subject: [PATCH] Use usr for vulkan headers - -Signed-off-by: Nick Sarnie <sarnex@gentoo.org> ---- - CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa9a3d3b..2998edfa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,13 +29,15 @@ endif() - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - set(TOOLS_TARGET_FOLDER lvl_cmake_targets) - -+set(HEADERS_DIR "/usr") -+ - # Output warning if vulkan headers submodule contents are not present --if (NOT EXISTS "${PROJECT_SOURCE_DIR}/Vulkan-Headers/include/vulkan/vulkan_core.h") -+if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h") - message(FATAL_ERROR "Please run 'git submodule update --init' before running cmake") - endif() - - # Header file for CMake settings --include_directories("${PROJECT_SOURCE_DIR}/Vulkan-Headers/include") -+include_directories("${HEADERS_DIR}/include") - - if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") - set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers") --- -2.17.0 - diff --git a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild index 42876e8f5904..3ffd734f550b 100644 --- a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad" + EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" @@ -36,8 +36,6 @@ DEPEND="${PYTHON_DEPS} x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" -PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" ) - multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True @@ -46,6 +44,7 @@ multilib_src_configure() { -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DGLSLANG_INSTALL_DIR="/usr" + -DVULKAN_HEADERS_INSTALL_DIR="/usr" ) cmake-utils_src_configure } diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 86e63d7def66..3ffd734f550b 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad" + EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" |