diff options
author | Nick Sarnie <sarnex@gentoo.org> | 2018-06-23 19:00:04 -0400 |
---|---|---|
committer | Nick Sarnie <sarnex@gentoo.org> | 2018-06-23 19:01:24 -0400 |
commit | 33a8f94bbf6eec0ab029e28dd1e8d3178a1dc856 (patch) | |
tree | ebbc216fb7493acfd994f30d7bb2e4a59954cff9 /dev-util/vulkan-tools | |
parent | dev-util/vulkan-tools: Bump to 1.1.77.0 (diff) | |
download | gentoo-33a8f94bbf6eec0ab029e28dd1e8d3178a1dc856.tar.gz gentoo-33a8f94bbf6eec0ab029e28dd1e8d3178a1dc856.tar.bz2 gentoo-33a8f94bbf6eec0ab029e28dd1e8d3178a1dc856.zip |
dev-util/vulkan-tools: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r-- | dev-util/vulkan-tools/Manifest | 1 | ||||
-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-0_pre20180601.ebuild | 51 |
3 files changed, 0 insertions, 87 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 1a9ce5e6f3d7..1fa7abf7d1cb 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,2 +1 @@ -DIST vulkan-tools-0_pre20180601.tar.gz 421373 BLAKE2B d7c6870cf27397800a2af512b0bf05919b01dc30d84961d8a8dceacf005be461a8b250ef65cbfee8b070ef7f6fe8544deb855c06aee99f6b5175f4073b5a051c SHA512 f41517c22fb06aee07d40b947c756d97453810998ccb6e8cf8c48a439de1826361fcd84f0e96eaf3898e373e732d3b938c807da6fc2a736d3b986c2d30778ba2 DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725 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-0_pre20180601.ebuild deleted file mode 100644 index 42876e8f5904..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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-Tools.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad" - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" - -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/vulkan-headers - media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] - 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" ) - -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) - -DGLSLANG_INSTALL_DIR="/usr" - ) - cmake-utils_src_configure -} |