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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2023-05-17 23:35 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2023-05-17 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     5780ed2299604e39d4687fc9ae744bf9c390f84c
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 23:13:56 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed May 17 23:24:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5780ed22

media-libs/vulkan-layers: add 1.3.246

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 +
 .../files/vulkan-layers-1.3.246-Fix-build.patch    | 12 +++++
 .../vulkan-layers/vulkan-layers-1.3.246.ebuild     | 60 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 57b88025edf1..002f314f576d 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1,2 @@
 DIST vulkan-layers-1.3.243.tar.gz 4624249 BLAKE2B d358ccf3dbe690d7f30e153271602b4ab14d55a854169fa828a4bc8ffeb688531b4b4703dbe7ea4e038237db650a923ab9f618178a5edf304fc4a3170be57238 SHA512 d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19
+DIST vulkan-layers-1.3.246.tar.gz 4750578 BLAKE2B df6c51756231d50866b8a676ae6f62f79ba361155c7c1009fa4e62b921aa4ef7434140ec6ae82ab773e3e01c74b1213175ac2156a8a79adf212760786853aa5e SHA512 2c0f9ed198a1a806e564072057d2d0e42eb8e42ae5fc847399fa5eb8227ef52a0114f47569fa49f0bfbcb210530bea658558fbc27451c972681eb9ee79099c6d

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch
new file mode 100644
index 000000000000..2b9210cbed68
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch
@@ -0,0 +1,12 @@
+diff --git a/layers/external/vma/vk_mem_alloc.h b/layers/external/vma/vk_mem_alloc.h
+index b47bd730c..b3ed1a951 100644
+--- a/layers/external/vma/vk_mem_alloc.h
++++ b/layers/external/vma/vk_mem_alloc.h
+@@ -2580,6 +2580,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+ 
+ #include <cstdint>
+ #include <cstdlib>
++#include <cstdio>
+ #include <cstring>
+ #include <utility>
+ #include <type_traits>

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild
new file mode 100644
index 000000000000..3b9b94d64bf7
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+PATCHES="${FILESDIR}/${PN}-1.3.239-r2-Build-shared-libs.patch
+	${FILESDIR}/${P}-Fix-build.patch"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2023-08-16 22:07 Matt Turner
  0 siblings, 0 replies; 11+ messages in thread
From: Matt Turner @ 2023-08-16 22:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c587f549faa6123e77a309f776bd6e6877132328
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 21:53:51 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 22:07:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c587f549

media-libs/vulkan-layers: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  2 -
 ...ulkan-layers-1.3.239-r2-Build-shared-libs.patch | 13 -----
 .../files/vulkan-layers-1.3.246-Fix-build.patch    | 12 -----
 .../vulkan-layers/vulkan-layers-1.3.243.ebuild     | 59 ---------------------
 .../vulkan-layers/vulkan-layers-1.3.246.ebuild     | 60 ----------------------
 5 files changed, 146 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 1a62bfabe200..3e2c615525d1 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,3 +1 @@
-DIST vulkan-layers-1.3.243.tar.gz 4624249 BLAKE2B d358ccf3dbe690d7f30e153271602b4ab14d55a854169fa828a4bc8ffeb688531b4b4703dbe7ea4e038237db650a923ab9f618178a5edf304fc4a3170be57238 SHA512 d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19
-DIST vulkan-layers-1.3.246.tar.gz 4750578 BLAKE2B df6c51756231d50866b8a676ae6f62f79ba361155c7c1009fa4e62b921aa4ef7434140ec6ae82ab773e3e01c74b1213175ac2156a8a79adf212760786853aa5e SHA512 2c0f9ed198a1a806e564072057d2d0e42eb8e42ae5fc847399fa5eb8227ef52a0114f47569fa49f0bfbcb210530bea658558fbc27451c972681eb9ee79099c6d
 DIST vulkan-layers-1.3.250.tar.gz 4829919 BLAKE2B 9e05c53d283df1d57c20574224333249e468242eb73f7feb9ce47b4d194a80a1b1958bc71743eed3d108cedba972eeb9aa27ef33e838828e8a0baefe85254613 SHA512 5e8aef501961b49d7b4390d8c8ce09fe0b7657d323859d2052a8a14b042da69d7b1387a8aadede8372711313518b6d75fb78f41e2e0c1ad69c99a5b58524fb82

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch
deleted file mode 100644
index 58973fa70e0d..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 640ac8471..19caed0ed 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -158,7 +158,7 @@ else()
-     message(NOTICE "VulkanVL_generated_source target requires python 3")
- endif()
- 
--add_library(VkLayer_khronos_validation MODULE)
-+add_library(VkLayer_khronos_validation SHARED)
- 
- target_sources(VkLayer_khronos_validation PRIVATE
-     generated/best_practices.cpp

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch
deleted file mode 100644
index 2b9210cbed68..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/layers/external/vma/vk_mem_alloc.h b/layers/external/vma/vk_mem_alloc.h
-index b47bd730c..b3ed1a951 100644
---- a/layers/external/vma/vk_mem_alloc.h
-+++ b/layers/external/vma/vk_mem_alloc.h
-@@ -2580,6 +2580,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
- 
- #include <cstdint>
- #include <cstdlib>
-+#include <cstdio>
- #include <cstring>
- #include <utility>
- #include <type_traits>

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.243.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.243.ebuild
deleted file mode 100644
index 1aa41c4269c0..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.243.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${PN}-1.3.239-r2-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name \*.a -delete || die
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild
deleted file mode 100644
index a0d442639037..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${PN}-1.3.239-r2-Build-shared-libs.patch
-	${FILESDIR}/${P}-Fix-build.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name \*.a -delete || die
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2023-03-29 18:31 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2023-03-29 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     d0cffb70348274f15547d351e015f43cb71edcf9
Author:     Nikita Romanyuk <kelvium <AT> yahoo <DOT> com>
AuthorDate: Wed Mar 29 03:55:16 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 18:28:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cffb70

media-libs/vulkan-layers: build utils as a static lib, then remove it

Validation layers do not support being compiled as a shared library.
It caused them to break, as I reported in bug #895348.

vkLayer_utils.a is not required to be present in runtime, so we just
delete it.

Closes: https://bugs.gentoo.org/895348
Signed-off-by: Nikita Romanyuk <kelvium <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/30382
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch  | 13 +++++++++++++
 ...n-layers-9999.ebuild => vulkan-layers-1.3.239-r2.ebuild} | 10 ++++++----
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild          |  8 +++++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch
new file mode 100644
index 000000000000..58973fa70e0d
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 640ac8471..19caed0ed 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -158,7 +158,7 @@ else()
+     message(NOTICE "VulkanVL_generated_source target requires python 3")
+ endif()
+ 
+-add_library(VkLayer_khronos_validation MODULE)
++add_library(VkLayer_khronos_validation SHARED)
+ 
+ target_sources(VkLayer_khronos_validation PRIVATE
+     generated/best_practices.cpp

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
similarity index 87%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
index 3bdb7b185bb7..fa2ffd709370 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
@@ -37,9 +37,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch
-${FILESDIR}/${PN}-1.3.239-Export-symbols.patch
-"
+PATCHES="${FILESDIR}/${PF}-Build-shared-libs.patch"
 
 multilib_src_configure() {
 	local mycmakeargs=(
@@ -55,3 +53,7 @@ multilib_src_configure() {
 	)
 	cmake_src_configure
 }
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 3bdb7b185bb7..fad8788c59bc 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,9 +37,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch
-${FILESDIR}/${PN}-1.3.239-Export-symbols.patch
-"
+PATCHES="${FILESDIR}/${PN}-1.3.239-r2-Build-shared-libs.patch"
 
 multilib_src_configure() {
 	local mycmakeargs=(
@@ -55,3 +53,7 @@ multilib_src_configure() {
 	)
 	cmake_src_configure
 }
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2023-03-04 22:40 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2023-03-04 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     554537543019b09b8cc14841a1ae43389313d2ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 13:40:14 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 22:40:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55453754

media-libs/vulkan-layers: drop 1.3.236-r1

Bug: https://bugs.gentoo.org/898954
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 -
 .../vulkan-layers-1.3.236-Build-shared-libs.patch  | 26 ----------
 .../vulkan-layers/vulkan-layers-1.3.236-r1.ebuild  | 57 ----------------------
 3 files changed, 84 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 66ffb0374465..3e30ee3cd9fb 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1 @@
-DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479
 DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
deleted file mode 100644
index 18cedb517b09..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f29022f96..cf34d8e21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -255,7 +255,7 @@ endif()
- # files directly in layers.
- 
- add_library(VkLayer_utils
--            STATIC
-+            SHARED
-             layers/vk_layer_config.cpp
-             layers/vk_layer_extension_utils.cpp
-             layers/vk_layer_utils.cpp
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 96d52b5f8..3f75aa3a8 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -226,7 +226,7 @@ if (NOT BUILD_LAYERS)
-     return()
- endif()
- 
--add_library(VkLayer_khronos_validation MODULE)
-+add_library(VkLayer_khronos_validation SHARED)
- 
- target_sources(VkLayer_khronos_validation PRIVATE
-     ${CHASSIS_LIBRARY_FILES}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
deleted file mode 100644
index a7c08b8ebe2e..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2023-02-04 17:07 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2023-02-04 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     01207ba90844fa5372e8be43d01e7b84f27a0221
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 16:44:08 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 17:07:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01207ba9

media-libs/vulkan-layers: add 1.3.239

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 +
 .../vulkan-layers-1.3.239-Build-shared-libs.patch  | 22 ++++++++++++++++++++++
 ...rs-9999.ebuild => vulkan-layers-1.3.239.ebuild} |  4 ++--
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 3074cdc9ac80..15bba64d83c7 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606
 DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479
+DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch
new file mode 100644
index 000000000000..f290164555a5
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch
@@ -0,0 +1,22 @@
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 640ac8471..19caed0ed 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
+ add_compile_definitions(XXH_NO_LONG_LONG)
+ 
+-add_library(VkLayer_utils STATIC)
++add_library(VkLayer_utils SHARED)
+ target_sources(VkLayer_utils PRIVATE
+     generated/vk_format_utils.h
+     generated/vk_format_utils.cpp
+@@ -158,7 +158,7 @@ else()
+     message(NOTICE "VulkanVL_generated_source target requires python 3")
+ endif()
+ 
+-add_library(VkLayer_khronos_validation MODULE)
++add_library(VkLayer_khronos_validation SHARED)
+ 
+ target_sources(VkLayer_khronos_validation PRIVATE
+     generated/best_practices.cpp

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
similarity index 92%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
index 27cb0fa07484..d1fb64baadfb 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.236-Build-shared-libs.patch"
+PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
 
 multilib_src_configure() {
 	local mycmakeargs=(

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 27cb0fa07484..edcb48708e16 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.236-Build-shared-libs.patch"
+PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch"
 
 multilib_src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2022-11-02  0:21 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2022-11-02  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4c2467c716fd7ee60423fed9f73c8ebe2c7a7623
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 23:08:34 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 00:20:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2467c7

media-libs/vulkan-layers: add 1.3.231

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |   1 +
 ...231-cmake-Cleanup-find_package-SPIRV-code.patch | 101 +++++++++++++++++++++
 ...rs-9999.ebuild => vulkan-layers-1.3.231.ebuild} |   7 +-
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |   3 +-
 4 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index ebc9df448199..1c33d034ff28 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1,2 @@
 DIST vulkan-layers-1.3.224.tar.gz 4193501 BLAKE2B 84982d63339a2ef101cf9e1e9038e94415326a4a8a46b47d0a913bd0d35fa333dd35579f96536c6e147bf37ccdee0a8de12c1c13b74d3529f34645f8e10f0fa2 SHA512 c7d4f6df4bf0cbb970b36cff9197306769bf3f86ea98496b93e8c1779a905966f6b2303b04ba84099ce9c12e828633e2e0db22e49060393335312508b3540488
+DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch
new file mode 100644
index 000000000000..bd17c69315e0
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch
@@ -0,0 +1,101 @@
+From 836a09267fe034ce783570e6920e1b638c0bd212 Mon Sep 17 00:00:00 2001
+From: Juan Ramos <juan@lunarg.com>
+Date: Fri, 21 Oct 2022 17:43:23 -0600
+Subject: [PATCH] cmake: Cleanup find_package SPIRV code
+
+- Use get_target_property instead of relying on passed in var
+- Remove unused var
+- Cleanup find_package(SPIRV-* code
+---
+ CMakeLists.txt                    | 55 +++++++++----------------------
+ cmake/VVLGenerateSourceCode.cmake |  5 ++-
+ 2 files changed, 19 insertions(+), 41 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7f01081415..23de46a1a22 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,52 +204,27 @@ if (USE_ROBIN_HOOD_HASHING)
+ endif()
+ 
+ if(BUILD_LAYERS OR BUILD_TESTS)
+-    find_package(SPIRV-Headers CONFIG QUIET)
+-    if(SPIRV-Headers_FOUND)
+-        # Prefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
+-        # version of SPIRV-Headers, the package will be found.
+-        get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(SPIRV_HEADERS_INCLUDE_DIR)
+-        # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
+-	    if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
+-	        message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
+-        endif()
+-    elseif(SPIRV_HEADERS_INSTALL_DIR)
+-        # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
+-        if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
+-            message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
+-        endif()
+-	    set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
+-    endif()
++    find_package(SPIRV-Headers REQUIRED CONFIG QUIET)
+ 
+-    # VVLGenerateSourceCode depends on spirv/unified1
+     include(VVLGenerateSourceCode)
+ 
+-    if (NOT TARGET SPIRV-Tools-opt)
+-        find_package(SPIRV-Tools-opt REQUIRED CONFIG)
+-    endif()
+-
+-    if (NOT TARGET SPIRV-Tools)
+-        find_package(SPIRV-Tools REQUIRED CONFIG)
+-        # See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background on this.
+-        # The targets available from SPIRV-Tools change depending on how SPIRV_TOOLS_BUILD_STATIC is set.
+-        # Try to handle all possible combinations so that we work with externally built packages.
+-        if (TARGET SPIRV-Tools)
+-            set(SPIRV_TOOLS_TARGET "SPIRV-Tools")
+-        elseif(TARGET SPIRV-Tools-static)
+-            set(SPIRV_TOOLS_TARGET "SPIRV-Tools-static")
+-        elseif(TARGET SPIRV-Tools-shared)
+-            set(SPIRV_TOOLS_TARGET "SPIRV-Tools-shared")
+-        else()
+-            message(FATAL_ERROR "Cannot determine SPIRV-Tools target name")
+-        endif()
++    find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET)
++
++    find_package(SPIRV-Tools REQUIRED CONFIG QUIET)
++    # See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background on this.
++    # The targets available from SPIRV-Tools change depending on how SPIRV_TOOLS_BUILD_STATIC is set.
++    # Try to handle all possible combinations so that we work with externally built packages.
++    if (TARGET SPIRV-Tools)
++        set(SPIRV_TOOLS_TARGET "SPIRV-Tools")
++    elseif(TARGET SPIRV-Tools-static)
++        set(SPIRV_TOOLS_TARGET "SPIRV-Tools-static")
++    elseif(TARGET SPIRV-Tools-shared)
++        set(SPIRV_TOOLS_TARGET "SPIRV-Tools-shared")
++    else()
++        message(FATAL_ERROR "Cannot determine SPIRV-Tools target name")
+     endif()
+ endif()
+ 
+-# Generate dependent helper files ------------------------------------------------------------------------------------------------
+-
+-set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
+-
+ # VkLayer_utils library ----------------------------------------------------------------------------------------------------------
+ # For Windows, we use a static lib because the Windows loader has a fairly restrictive loader search path that can't be easily
+ # modified to point it to the same directory that contains the layers. TODO: This should not be a library -- in future, include
+diff --git a/cmake/VVLGenerateSourceCode.cmake b/cmake/VVLGenerateSourceCode.cmake
+index 43efdb8201c..13c81e38aca 100644
+--- a/cmake/VVLGenerateSourceCode.cmake
++++ b/cmake/VVLGenerateSourceCode.cmake
+@@ -20,7 +20,10 @@ if(PYTHONINTERP_FOUND)
+         message(FATAL_ERROR "Unable to find vk.xml")
+     endif()
+ 
+-    set(spirv_unified_include_dir "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/")
++    # Get the include directory of the SPIRV-Headers
++    get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
++
++    set(spirv_unified_include_dir "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/")
+     if (NOT IS_DIRECTORY ${spirv_unified_include_dir})
+         message(FATAL_ERROR "Unable to find spirv/unified1")
+     endif()

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
similarity index 87%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
index c71475bdd661..472f1a4f3a2f 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
@@ -24,8 +24,10 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
+PATCHES=( "${FILESDIR}/${P}-cmake-Cleanup-find_package-SPIRV-code.patch" )
+
 BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
@@ -48,8 +50,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
+		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
 	)
 	cmake_src_configure
 }

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index c71475bdd661..af73de9264b5 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -48,8 +48,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
+		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
 	)
 	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2022-06-12 19:36 Matt Turner
  0 siblings, 0 replies; 11+ messages in thread
From: Matt Turner @ 2022-06-12 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     26188a549c5116eff0adf56316b0e1adf34e53da
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 19:21:19 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 19:36:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26188a54

media-libs/vulkan-layers: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 -
 ...ayers-1.3.204-Dont-use-static-spirv-tools.patch | 27 -------
 ...n-layers-1.3.204-Fix-dependency-detection.patch | 90 ----------------------
 .../vulkan-layers/vulkan-layers-1.3.204.ebuild     | 60 ---------------
 4 files changed, 178 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 79882413e9ff..3a239f340465 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1 @@
-DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f
 DIST vulkan-layers-1.3.211.tar.gz 3967709 BLAKE2B f86ff0fa053e0138a0bbdbec30e2fe0a59cfc24f43fe787b007ae352db81a700442d777637e1fc577332a47f36bc09383dd29416b5170fcf5d735562b6a58230 SHA512 e494ba793064f0d32fbdeaddaa01dcd730a36a5c793625bb4671a4e8067364171416ec8fb7361f946cc5d5e8dc16d58e2194c3eb5d3a57d58f4ace2e7ed34f5f

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
deleted file mode 100644
index 791ac6764bce..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 68f030f9e776d1f2549e471f40c9794f6056bb05 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sat, 19 Feb 2022 20:41:44 -0500
-Subject: [PATCH] Dont use static spirv-tools
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- layers/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 59e294a07..5d30a9834 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -310,7 +310,7 @@ if(BUILD_LAYERS)
-         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
-     endif()
-     target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
--    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
-+    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt)
- 
- 
-     # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled
-
--- 
-2.35.1
-

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
deleted file mode 100644
index 25f3b4bafd27..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001
-From: Jeremy Gebben <jeremyg@lunarg.com>
-Date: Thu, 17 Feb 2022 15:26:25 -0700
-Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations
-
-If the SPIRV-Headers package is not found, fall back to looking for
-headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR.
-
-Fixes #3765
----
- CMakeLists.txt        | 19 ++++++++++++++++---
- layers/CMakeLists.txt |  7 +------
- tests/CMakeLists.txt  |  6 +++---
- 3 files changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d4ca786ca07..58a966f03d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING)
-     endif()
- endif()
- 
--set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
- if(BUILD_LAYERS OR BUILD_TESTS)
--    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
--        find_package(SPIRV-Headers REQUIRED CONFIG)
-+    find_package(SPIRV-Headers CONFIG QUIET)
-+    if(SPIRV-Headers_FOUND)
-+	# pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
-+	# version of SPIRV-Headers, the package will be found.
-+	get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
-+    elseif(SPIRV_HEADERS_INCLUDE_DIR)
-+	# This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
-+	if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
-+	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
-+        endif()
-+    elseif(SPIRV_HEADERS_INSTALL_DIR)
-+        # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
-+	if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
-+	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
-+        endif()
-+	set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
-     endif()
- endif()
- 
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 6edcf6eb5ab..59e294a0793 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -309,12 +309,7 @@ if(BUILD_LAYERS)
-     if (USE_ROBIN_HOOD_HASHING)
-         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
-     endif()
--    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
--        target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers)
--    else()
--        target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
--    endif()
--
-+    target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
-     target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
- 
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 2b98d109b7f..780c0538486 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # ~~~
--# Copyright (c) 2014-2021 Valve Corporation
--# Copyright (c) 2014-2021 LunarG, Inc.
-+# Copyright (c) 2014-2022 Valve Corporation
-+# Copyright (c) 2014-2022 LunarG, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-@@ -149,11 +149,11 @@ if (NOT MSVC)
-     target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare")
- endif()
- 
-+target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
- # Specify target_link_libraries
- target_link_libraries(vk_layer_validation_tests
-                       PRIVATE VkLayer_utils
-                               ${GLSLANG_LIBRARIES}
--			      SPIRV-Headers::SPIRV-Headers
- 			      SPIRV-Tools-static SPIRV-Tools-opt
- 			      GTest::gtest GTest::gtest_main)
- 

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
deleted file mode 100644
index 9ae97ee6a3f7..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Fix-dependency-detection.patch
-	"${FILESDIR}"/${P}-Dont-use-static-spirv-tools.patch
-)
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2019-07-22 17:15 Matt Turner
  0 siblings, 0 replies; 11+ messages in thread
From: Matt Turner @ 2019-07-22 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f3cc0e774e3a6aca04fd98c8c5b2d8b7d08d12a2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 17:09:46 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 17:15:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3cc0e77

media-libs/vulkan-layers: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  3 --
 ...e-a-file-to-get-the-spirv-tools-commit-ID.patch | 40 ----------------
 .../vulkan-layers/vulkan-layers-1.1.101.ebuild     | 48 --------------------
 .../vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild | 53 ----------------------
 .../vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild | 48 --------------------
 5 files changed, 192 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 0db1b0e8f60..73acc6933d7 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1 @@
-DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
 DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
-DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
-DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6

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
deleted file mode 100644
index 7688eb8d5cf..00000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2bcf0e5097070532ebfb0bf0ee0b28e1065be1e8 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-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 <sarnex@gentoo.org>
----
- 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/vulkan-layers-1.1.101.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
deleted file mode 100644
index cee610cca79..00000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="f06d731b7caf3e446acef3f4f5e62bdecd6f73d6"
-	KEYWORDS="~amd64 x86"
-	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"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.101
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-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"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
deleted file mode 100644
index bc580d74643..00000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
-	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"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.9.2888:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.82.0
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-PATCHES=(
-	"${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"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
deleted file mode 100644
index 00a214d8900..00000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="6e6da6ccab8931f7c30815966ef839b1155e5bec"
-	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"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.92.0
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-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"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2018-09-18  0:13 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2018-09-18  0:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b8f1a478bcc47d5fa902706c431fc7391cac8a82
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 00:00:43 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 00:12:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f1a478

media-libs/vulkan-layers: Bump to 1.1.82.0

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/vulkan-layers/Manifest                  |  1 +
 ...2.0-Modify-scripts-to-accomodate-new-exts.patch | 23 ++++++++++++++++++++++
 ...s-9999.ebuild => vulkan-layers-1.1.82.0.ebuild} |  5 +++--
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  4 ++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index e1b0a00434c..222e6f8e935 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1,2 @@
 DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411
+DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch
new file mode 100644
index 00000000000..45da36c66c7
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch
@@ -0,0 +1,23 @@
+From 7bd8575b65e6a7ab9954cf30dcaff398bf9246e9 Mon Sep 17 00:00:00 2001
+From: Shannon McPherson <shannon@lunarg.com>
+Date: Mon, 10 Sep 2018 11:13:02 -0600
+Subject: [PATCH] scripts: Modify scripts to accomodate new exts
+
+Parameter validation was not gathering and processing structure
+information correctly for one of the 84 Headers extensions
+---
+ scripts/parameter_validation_generator.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
+index 8bb8da382..b157a1578 100644
+--- a/scripts/parameter_validation_generator.py
++++ b/scripts/parameter_validation_generator.py
+@@ -711,6 +711,7 @@ def genVkStructureType(self, typename):
+         # Add underscore between lowercase then uppercase
+         value = re.sub('([a-z0-9])([A-Z])', r'\1_\2', typename)
+         value = value.replace('D3_D12', 'D3D12')
++        value = value.replace('ASTCDecode', 'ASTC_Decode')
+         value = value.replace('Device_IDProp', 'Device_ID_Prop')
+         value = value.replace('LODGather', 'LOD_Gather')
+         value = value.replace('Features2', 'FEATURES_2')

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
similarity index 89%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
index b2e238baddb..af1263d167f 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8"
+	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -29,7 +29,7 @@ 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-1.1.77.0-r1
+		>=dev-util/vulkan-headers-1.1.82.0
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -38,6 +38,7 @@ DEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	"${FILESDIR}/${PN}-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch"
 	 )
 
 multilib_src_configure() {

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index b2e238baddb..c1a86b1bc3a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8"
+	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -29,7 +29,7 @@ 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-1.1.77.0-r1
+		>=dev-util/vulkan-headers-1.1.82.0
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2018-06-02 11:34 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2018-06-02 11:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a686a553ac413418deb87a6ff711b8bacaa60b15
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 11:16:17 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 11:34:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a686a553

media-libs/vulkan-layers: Support dev-util/vulkan-headers install target

Update the patch to support the new install location
Resnapshot
Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-layers/Manifest                  |  2 +-
 ...an-layers-9999-Use-usr-for-vulkan-headers.patch | 97 ----------------------
 .../vulkan-layers-Use-usr-for-vulkan-headers.patch | 70 ++++++++++++----
 ...6.ebuild => vulkan-layers-0_pre20180601.ebuild} |  2 +-
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  4 +-
 5 files changed, 59 insertions(+), 116 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index a3c8264d50b..a339d757479 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1 @@
-DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1
+DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 3ce12135039..00000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 895c8a28b69be0ac436cd501e8d66f1b936393e3 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Wed, 30 May 2018 19:19:04 -0400
-Subject: [PATCH] Use usr for vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt                            | 2 +-
- layers/CMakeLists.txt                     | 5 +++--
- scripts/lvl_genvk.py                      | 2 +-
- scripts/object_tracker_generator.py       | 1 +
- scripts/parameter_validation_generator.py | 1 +
- scripts/spec.py                           | 2 +-
- 6 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa2e87ed..85c3cc21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,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 d67e8d79..2364f50e 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 *
-diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py
-index 8d4b68af..dd8a26fe 100644
---- a/scripts/object_tracker_generator.py
-+++ b/scripts/object_tracker_generator.py
-@@ -259,6 +259,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator):
-         previous_dir = os.getcwd()
-         os.chdir(os.path.dirname(sys.argv[0]))
-         vuid_filename_locations = [
-+            '/usr/include/vulkan/registry/validusage.json',
-             './Vulkan-Headers/registry/validusage.json',
-             '../Vulkan-Headers/registry/validusage.json',
-             '../../Vulkan-Headers/registry/validusage.json',
-diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
-index 66ede40d..29ef873a 100644
---- a/scripts/parameter_validation_generator.py
-+++ b/scripts/parameter_validation_generator.py
-@@ -189,6 +189,7 @@ class ParameterValidationOutputGenerator(OutputGenerator):
-         previous_dir = os.getcwd()
-         os.chdir(os.path.dirname(sys.argv[0]))
-         vuid_filename_locations = [
-+            '/usr/include/vulkan/registry/validusage.json',
-             './Vulkan-Headers/registry/validusage.json',
-             '../Vulkan-Headers/registry/validusage.json',
-             '../../Vulkan-Headers/registry/validusage.json',
-diff --git a/scripts/spec.py b/scripts/spec.py
-index 4eeb46aa..0ea237b4 100644
---- a/scripts/spec.py
-+++ b/scripts/spec.py
-@@ -28,7 +28,7 @@ import re
- 
- out_filename = "../layers/vk_validation_error_messages.h" # can override w/ '-out <filename>' option
- db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb <filename>' option
--json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file <filename> option
-+json_filename = "/usr/include/vulkan/registry/validusage.json" # can override w/ '-json-file <filename> option
- gen_db = False # set to True when '-gendb <filename>' option provided
- json_compare = False # compare existing DB to json file input
- # This is the root spec link that is used in error messages to point users to spec sections
--- 
-2.17.1
-

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
index a4829d9997a..0d5cb22f74d 100644
--- 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
@@ -1,20 +1,23 @@
-From 42fb7b4c73b0cae196a2eb6d97bfa6cc635f23fb Mon Sep 17 00:00:00 2001
+From 157e9e714c64f3148f09053454d15a25af550a28 Mon Sep 17 00:00:00 2001
 From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sat, 26 May 2018 17:39:08 -0400
+Date: Sat, 2 Jun 2018 07:01:28 -0400
 Subject: [PATCH] Use usr for vulkan headers
 
 Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
 ---
- CMakeLists.txt        | 2 +-
- layers/CMakeLists.txt | 5 +++--
- scripts/lvl_genvk.py  | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
+ CMakeLists.txt                            | 2 +-
+ layers/CMakeLists.txt                     | 5 +++--
+ scripts/lvl_genvk.py                      | 2 +-
+ scripts/object_tracker_generator.py       | 1 +
+ scripts/parameter_validation_generator.py | 1 +
+ scripts/spec.py                           | 2 +-
+ 6 files changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 178debdd..dc742304 100644
+index aa2e87ed..85c3cc21 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -21,7 +21,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+@@ -18,7 +18,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
@@ -24,7 +27,7 @@ index 178debdd..dc742304 100644
  # 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
+index d67e8d79..35485e35 100644
 --- a/layers/CMakeLists.txt
 +++ b/layers/CMakeLists.txt
 @@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
@@ -33,14 +36,14 @@ index 962c4be6..26e5abaf 100644
      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
++    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${output}
++    DEPENDS ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py 
++${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/reg.py
      )
  endmacro()
  
 diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 4dac9ca2..6ea83ddb 100644
+index 4dac9ca2..170bc0f5 100644
 --- a/scripts/lvl_genvk.py
 +++ b/scripts/lvl_genvk.py
 @@ -16,7 +16,7 @@
@@ -48,10 +51,47 @@ index 4dac9ca2..6ea83ddb 100644
  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')
++registry_headers_path = os.path.join(scripts_directory_path, '/usr/share/vulkan/registry')
  sys.path.insert(0, registry_headers_path)
  
  from reg import *
+diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py
+index 8d4b68af..ac3020c1 100644
+--- a/scripts/object_tracker_generator.py
++++ b/scripts/object_tracker_generator.py
+@@ -259,6 +259,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator):
+         previous_dir = os.getcwd()
+         os.chdir(os.path.dirname(sys.argv[0]))
+         vuid_filename_locations = [
++            '/usr/share/vulkan/registry/validusage.json',
+             './Vulkan-Headers/registry/validusage.json',
+             '../Vulkan-Headers/registry/validusage.json',
+             '../../Vulkan-Headers/registry/validusage.json',
+diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
+index 66ede40d..9eae6fed 100644
+--- a/scripts/parameter_validation_generator.py
++++ b/scripts/parameter_validation_generator.py
+@@ -189,6 +189,7 @@ class ParameterValidationOutputGenerator(OutputGenerator):
+         previous_dir = os.getcwd()
+         os.chdir(os.path.dirname(sys.argv[0]))
+         vuid_filename_locations = [
++            '/usr/share/vulkan/registry/validusage.json',
+             './Vulkan-Headers/registry/validusage.json',
+             '../Vulkan-Headers/registry/validusage.json',
+             '../../Vulkan-Headers/registry/validusage.json',
+diff --git a/scripts/spec.py b/scripts/spec.py
+index 4eeb46aa..212b0c57 100644
+--- a/scripts/spec.py
++++ b/scripts/spec.py
+@@ -28,7 +28,7 @@ import re
+ 
+ out_filename = "../layers/vk_validation_error_messages.h" # can override w/ '-out <filename>' option
+ db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb <filename>' option
+-json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file <filename> option
++json_filename = "/usr/share/vulkan/registry/validusage.json" # can override w/ '-json-file <filename> option
+ gen_db = False # set to True when '-gendb <filename>' option provided
+ json_compare = False # compare existing DB to json file input
+ # This is the root spec link that is used in error messages to point users to spec sections
 -- 
-2.17.0
+2.17.1
 

diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild
similarity index 96%
rename from media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
rename to media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild
index ca8180bed03..2187d9d65c0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b"
+	EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 1c718ccc964..2187d9d65c0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b"
+	EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -37,7 +37,7 @@ DEPEND="${PYTHON_DEPS}
 		   )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-Use-usr-for-vulkan-headers.patch"
+	"${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch"
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
 	 )
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/
@ 2018-05-26 22:59 Nick Sarnie
  0 siblings, 0 replies; 11+ messages in thread
From: Nick Sarnie @ 2018-05-26 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     bdc8be970a889558893c0ffaf5044bd947a99c52
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 22:41:38 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat May 26 22:58:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc8be97

media-libs/vulkan-layers: Initial version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-layers/Manifest                  |  1 +
 ...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             | 54 ++++++++++++++++++++
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 54 ++++++++++++++++++++
 6 files changed, 222 insertions(+)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
new file mode 100644
index 00000000000..a3c8264d50b
--- /dev/null
+++ b/media-libs/vulkan-layers/Manifest
@@ -0,0 +1 @@
+DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1

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 00000000000..7688eb8d5cf
--- /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 <sarnex@gentoo.org>
+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 <sarnex@gentoo.org>
+---
+ 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 00000000000..a4829d9997a
--- /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 <sarnex@gentoo.org>
+Date: Sat, 26 May 2018 17:39:08 -0400
+Subject: [PATCH] Use usr for vulkan headers
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ 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 00000000000..d87b452b7db
--- /dev/null
+++ b/media-libs/vulkan-layers/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-ValidationLayers</remote-id>
+	</upstream>
+</pkgmetadata>
+

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 00000000000..3bc4cc8e175
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
@@ -0,0 +1,54 @@
+# 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"
+
+RDEPEND=""
+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 00000000000..22742bd2161
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -0,0 +1,54 @@
+# 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="0759b0fd2cd4d1db9b3968cb2684872c1fb11628"
+	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"
+
+RDEPEND=""
+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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2023-08-16 22:07 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-17 23:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/ Nick Sarnie
  -- strict thread matches above, loose matches on Subject: below --
2023-08-16 22:07 Matt Turner
2023-03-29 18:31 Nick Sarnie
2023-03-04 22:40 Andreas Sturmlechner
2023-02-04 17:07 Nick Sarnie
2022-11-02  0:21 Nick Sarnie
2022-06-12 19:36 Matt Turner
2019-07-22 17:15 Matt Turner
2018-09-18  0:13 Nick Sarnie
2018-06-02 11:34 Nick Sarnie
2018-05-26 22:59 Nick Sarnie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox