[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-tools/

2018-05-26 Thread Nick Sarnie 
commit: 6d9abbc186bebdc5c2a00edc01082840bf740ce7
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sun May 27 01:57:59 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sun May 27 02:01:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9abbc1

media-libs/vulkan-tools: Block against old vulkan-loader packaging

Reported-by: [Arfrever] on IRC

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild | 3 ++-
 media-libs/vulkan-tools/vulkan-tools-.ebuild| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
index 97eb0ccd27b..143583c65a5 100644
--- a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
@@ -24,7 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="X wayland"
 
-RDEPEND=""
+# 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

diff --git a/media-libs/vulkan-tools/vulkan-tools-.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-.ebuild
index 97eb0ccd27b..143583c65a5 100644
--- a/media-libs/vulkan-tools/vulkan-tools-.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-.ebuild
@@ -24,7 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="X wayland"
 
-RDEPEND=""
+# 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

[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-tools/

2018-05-26 Thread Nick Sarnie 
commit: 5042169104a5e650053b8d7798be88fc3d17c6a9
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat May 26 23:24:08 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sat May 26 23:26:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50421691

media-libs/vulkan-tools: Depend on media-libs/vulkan-loader

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild | 1 +
 media-libs/vulkan-tools/vulkan-tools-.ebuild| 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
index 2e4086150cd..97eb0ccd27b 100644
--- a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
@@ -28,6 +28,7 @@ RDEPEND=""
 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}]

diff --git a/media-libs/vulkan-tools/vulkan-tools-.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-.ebuild
index d009fa4f314..97eb0ccd27b 100644
--- a/media-libs/vulkan-tools/vulkan-tools-.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "" ]]; then
EGIT_SUBMODULES=()
inherit git-r3
 else
-   EGIT_COMMIT="51dfb7b8a19820d6716190dd7e45cd6e861e1f1a"
+   EGIT_COMMIT="5e1623ca6860f3e393b1dabbdd19ba216871fa61"
KEYWORDS="~amd64"

SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -28,6 +28,7 @@ RDEPEND=""
 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}]

[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-tools/, media-libs/vulkan-tools/files/

2018-05-26 Thread Nick Sarnie 
commit: 3c713645a0c679996bd74717f99ff9f08ef129b1
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat May 26 22:42:25 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sat May 26 22:58:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c713645

media-libs/vulkan-tools: Initial version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-tools/Manifest   |  1 +
 .../vulkan-tools-Use-usr-for-vulkan-headers.patch  | 35 
 media-libs/vulkan-tools/metadata.xml   | 16 +++
 .../vulkan-tools/vulkan-tools-0_p20180526.ebuild   | 49 ++
 media-libs/vulkan-tools/vulkan-tools-.ebuild   | 49 ++
 5 files changed, 150 insertions(+)

diff --git a/media-libs/vulkan-tools/Manifest b/media-libs/vulkan-tools/Manifest
new file mode 100644
index 000..c0732f87ba3
--- /dev/null
+++ b/media-libs/vulkan-tools/Manifest
@@ -0,0 +1 @@
+DIST vulkan-tools-0_p20180526.tar.gz 437094 BLAKE2B 
95e738567ee041730ce94aaf02e543cbb3d1e838af2de41cd0bd56069703f5b8250ca4e45c2bd3d9c4314b388b7aa6379b4778c52c01f3de43789d3b84a8fe8d
 SHA512 
b9319f1baaa8e9ae42579608dabaeee3c0503192e3469d82cbad2a550f9fa78b3a19b37426e0391d2ce308a44e63b6a2deff32917995edc07c5cd65f87465222

diff --git 
a/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch 
b/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch
new file mode 100644
index 000..b9797e19ad2
--- /dev/null
+++ 
b/media-libs/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 
+Date: Tue, 22 May 2018 19:55:59 -0400
+Subject: [PATCH] Use usr for vulkan headers
+
+Signed-off-by: Nick Sarnie 
+---
+ 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/media-libs/vulkan-tools/metadata.xml 
b/media-libs/vulkan-tools/metadata.xml
new file mode 100644
index 000..a670686d9eb
--- /dev/null
+++ b/media-libs/vulkan-tools/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   x...@gentoo.org
+   X11
+   
+   
+   sar...@gentoo.org
+   Nick Sarnie
+   
+   
+   KhronosGroup/Vulkan-Tools
+   
+
+

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
new file mode 100644
index 000..2e4086150cd
--- /dev/null
+++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
@@ -0,0 +1,49 @@
+# 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}" == "" ]]; then
+   EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git;
+   EGIT_SUBMODULES=()
+   inherit git-r3
+else
+   EGIT_COMMIT="5e1623ca6860f3e393b1dabbdd19ba216871fa61"
+   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"
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+   dev-util/glslang:=[${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" )
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_SKIP_RPATH=True
+