gentoo resync : 02.06.2018

5 files changed, 158 insertions, 0 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
new file mode 100644
index 000000000000..8245a479840b
--- /dev/null
+++ b/dev-util/vulkan-tools/Manifest
@@ -0,0 +1,5 @@
+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 1481 BLAKE2B 9c4721737812adc65849caf875b2f3537891a7f262c9edcec63d26a441c2687c73f3afbe55621d5437c743b915b642eadfa0006b0c2efda72b03033e62ac6770 SHA512 0c2213ab958601328942132d9b42ae884926ed7d132719bf205b040f55fa7da1590f678663b83032bd8da34234566d1ff43a5c2652cc8f4bc1dbdee9bd53c4fa
+EBUILD vulkan-tools-9999.ebuild 1481 BLAKE2B 9c4721737812adc65849caf875b2f3537891a7f262c9edcec63d26a441c2687c73f3afbe55621d5437c743b915b642eadfa0006b0c2efda72b03033e62ac6770 SHA512 0c2213ab958601328942132d9b42ae884926ed7d132719bf205b040f55fa7da1590f678663b83032bd8da34234566d1ff43a5c2652cc8f4bc1dbdee9bd53c4fa
+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
new file mode 100644
index 000000000000..b9797e19ad2f
--- /dev/null
+++ b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch
@@ -0,0 +1,35 @@
+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/metadata.xml b/dev-util/vulkan-tools/metadata.xml
new file mode 100644
index 000000000000..a670686d9eb6
--- /dev/null
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
new file mode 100644
index 000000000000..38d11f8da2a8
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
@@ -0,0 +1,51 @@
+# 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? ( 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
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
new file mode 100644
index 000000000000..38d11f8da2a8
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -0,0 +1,51 @@
+# 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? ( 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
+}