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

2020-12-16 Thread Nick Sarnie 
commit: 20660b2ecfb448ae132eb331e550a96d1a2bacbd
Author: Nick Sarnie  gentoo  org>
AuthorDate: Thu Dec 17 04:43:47 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Thu Dec 17 04:45:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20660b2e

media-libs/vulkan-loader: Fix pkgconfig

Fixes: https://bugs.gentoo.org/760420
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Nick Sarnie  gentoo.org>

 .../vulkan-loader-1.2.162-Fix-pkgconfig.patch  | 43 ++
 162.ebuild => vulkan-loader-1.2.162-r1.ebuild} |  2 +
 2 files changed, 45 insertions(+)

diff --git 
a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch 
b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
new file mode 100644
index 000..f06f5cffdad
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
@@ -0,0 +1,43 @@
+From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001
+From: Nick Sarnie 
+Date: Wed, 16 Dec 2020 23:38:00 -0500
+Subject: [PATCH] Revert "pkgconfig: Missing lib suffx on win32"
+
+This reverts commit 10c4ebadb9fc41e0abf5a32daa7263c6d1aff575.
+
+Signed-off-by: Nick Sarnie 
+---
+ loader/CMakeLists.txt | 3 ---
+ loader/vulkan.pc.in   | 2 +-
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
+index 659511855..f7b9916b2 100644
+--- a/loader/CMakeLists.txt
 b/loader/CMakeLists.txt
+@@ -326,9 +326,6 @@ if(PKG_CONFIG_FOUND)
+ foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
+ set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
+ endforeach()
+-if(WIN32)
+-set(LIB_SUFFIX "-1")
+-endif ()
+ configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION 
"${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()
+diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
+index fc17cb1f3..f1588c412 100644
+--- a/loader/vulkan.pc.in
 b/loader/vulkan.pc.in
+@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Vulkan Loader
+ Version: @VK_API_VERSION@
+-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
++Libs: -L${libdir} -lvulkan
+ Libs.private: @PRIVATE_LIBS@
+ Cflags: -I${includedir}
+ 
+-- 
+2.29.2
+

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
similarity index 96%
rename from media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild
rename to media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
index f3ce3e6251b..1fb27663e90 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
@@ -36,6 +36,8 @@ DEPEND="${PYTHON_DEPS}
 "
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 
+PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-pkgconfig.patch" )
+
 multilib_src_configure() {
# Integrated clang assembler doesn't work with x86 - Bug #698164
if tc-is-clang && [[ ${ABI} == x86 ]]; then

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

2018-06-02 Thread Nick Sarnie 
commit: e7cfa4d13e08fc79007c85f5b111e46aa4f04095
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Jun  2 11:14:11 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sat Jun  2 11:34:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cfa4d1

media-libs/vulkan-loader: Support new vulkan-headers install target for 

Upstream cleaned this up, so we can drop the patch and use a variable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...an-loader--Use-usr-for-vulkan-headers.patch | 51 --
 media-libs/vulkan-loader/vulkan-loader-.ebuild |  5 +--
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git 
a/media-libs/vulkan-loader/files/vulkan-loader--Use-usr-for-vulkan-headers.patch
 
b/media-libs/vulkan-loader/files/vulkan-loader--Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 49dd54c83c8..000
--- 
a/media-libs/vulkan-loader/files/vulkan-loader--Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d9b3835e1ad455853e3a58ec0d2a0653e5952a21 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie 
-Date: Mon, 26 May 2018 16:57:33 -0400
-Subject: [PATCH] Use /usr for vulkan-headers
-
-Signed-off-by: Nick Sarnie 

- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0b744a87..14034d33c 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,7 +68,7 @@ if(WIN32)
- endif()
- 
- set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
--set(HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
-+set(HEADERS_DIR "/usr")
- 
- # Output warning if vulkan headers submodule contents are not present
- if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h")
-@@ -131,8 +131,9 @@ set (PYTHON_CMD ${PYTHON_EXECUTABLE})
- # 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 
${HEADERS_DIR}/registry/vk.xml ${output}
--DEPENDS ${HEADERS_DIR}/registry/vk.xml 
${HEADERS_DIR}/registry/generator.py ${SCRIPTS_DIR}/${dependency} 
${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/registry/reg.py
-+COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry 
${HEADERS_DIR}/include/vulkan/registry/vk.xml ${output}
-+DEPENDS ${HEADERS_DIR}/include/vulkan/registry/vk.xml 
${HEADERS_DIR}/include/vulkan/registry/generator.py
-+${SCRIPTS_DIR}/${dependency}  ${SCRIPTS_DIR}/lvl_genvk.py 
${HEADERS_DIR}/include/vulkan/registry/reg.py
- )
- endmacro()
- 
-diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 0de555fae..dab543ed3 100644
 a/scripts/lvl_genvk.py
-+++ b/scripts/lvl_genvk.py
-@@ -17,7 +17,7 @@
- import argparse, cProfile, pdb, string, sys, time, os
- 
- scripts_dir = os.path.dirname(os.path.abspath(__file__))
--registry_dir = os.path.join(scripts_dir, '../Vulkan-Headers/registry')
-+registry_dir = os.path.join(scripts_dir, '/usr/include/vulkan/registry')
- sys.path.insert(0, registry_dir)
- 
- from reg import *
--- 
-2.17.0
-

diff --git a/media-libs/vulkan-loader/vulkan-loader-.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-.ebuild
index 5f573a4c1ce..9e747482213 100644
--- a/media-libs/vulkan-loader/vulkan-loader-.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-.ebuild
@@ -32,10 +32,6 @@ DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
)"
 
-PATCHES=(
-   "${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch"
-)
-
 multilib_src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=True
@@ -45,6 +41,7 @@ multilib_src_configure() {
-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+   -DVULKAN_HEADERS_INSTALL_DIR="/usr"
)
cmake-utils_src_configure
 }

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

2018-04-14 Thread Matt Turner 
commit: 38052d48e474e46936b5af491b0698fb768c2c03
Author: Nick Sarnie  gmail  com>
AuthorDate: Sat Apr 14 19:48:05 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Apr 14 19:50:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38052d48

media-libs/vulkan-loader: Version bump to 1.1.70

Closes: https://bugs.gentoo.org/652322

 media-libs/vulkan-loader/Manifest  |  1 +
 ...nt-require-glslang-if-not-building-layers.patch | 45 
 .../vulkan-loader/vulkan-loader-1.1.70.0.ebuild| 63 ++
 3 files changed, 109 insertions(+)

diff --git a/media-libs/vulkan-loader/Manifest 
b/media-libs/vulkan-loader/Manifest
index cf90c8b575b..c53ca107c93 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -4,3 +4,4 @@ DIST vulkan-loader-1.0.46.0.tar.gz 3732605 BLAKE2B 
364f6a763d016bebb1100dc594a00
 DIST vulkan-loader-1.0.51.0.tar.gz 3796337 BLAKE2B 
9a418e6e4cfe1f19c8716788452f4ed219be14fcdadf3c5cb983d031f3a95a7f6322a94aced391711ba486274611ff5ea2ae87c2116a6c16b9aa0b2f97e10c72
 SHA512 
5d198fc9537c8fa3cbde19fc74f8d47595fabcb52c8db1c626fa157f171ed74ad202e086f7c9e94827c1ab682d03bae58af690c510c6705ca92db0548ee575f6
 DIST vulkan-loader-1.0.54.0.tar.gz 3842785 BLAKE2B 
72b14546859f38f090554a9ff04dce91fb0764f5180ca22a3e863e992276c4c4e9a85ca946b18a0c54fed99b58a39b9c65a67c4302aa337e89a04d435a606df2
 SHA512 
f5478e1a7f966a2d09b97a3b47a04b4c9ccd68b88126fefcd6f97bfd0347c5a5bebf52e1cdfccc4863d22dd3b875e04cddf406e3e546eb3dc50d2ef61d85a21f
 DIST vulkan-loader-1.0.61.1.tar.gz 3889453 BLAKE2B 
0d5f1335e874294350e02063b11e5efb3d1f3bb69a7c970f2b6a6cbe9b78651c7810644d30b404016ed126ad63c4ab46b017c2ef033ba1c45046fd310218cd55
 SHA512 
e16599ca458dc1c636c80a03693edc4a24563e08768de95e7711cd7927d7cfdcd0ce14d16d938ca066bfe4ce8fe43836d2b61973bc2a7ba6ad14ab5f18166e0e
+DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 
86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063
 SHA512 
ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26

diff --git 
a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
 
b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
new file mode 100644
index 000..3c5a30b10a0
--- /dev/null
+++ 
b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
@@ -0,0 +1,45 @@
+From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Thu, 15 Mar 2018 22:25:19 +
+Subject: [PATCH] build: Don't require glslang if not building layers
+
+---
+ CMakeLists.txt | 10 --
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713a9cdfd3..c9f73ce965 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir 
symbol_name output)
+ endmacro()
+ 
+ # Custom target for generated vulkan helper file dependencies
++set(generate_helper_files_DEPENDS)
++if(BUILD_LAYERS)
++LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h)
++endif()
+ add_custom_target(generate_helper_files DEPENDS
+ vk_enum_string_helper.h
+ vk_safe_struct.h
+@@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS
+ vk_dispatch_table_helper.h
+ vk_extension_helper.h
+ vk_typemap_helper.h
+-spirv_tools_commit_id.h
++${generate_helper_files_DEPENDS}
+ )
+ set_target_properties(generate_helper_files PROPERTIES FOLDER 
${LVL_TARGET_FOLDER})
+ 
+@@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py 
vk_enum_string_helper.h)
+ 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)
+-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools
 SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
++if(BUILD_LAYERS)
++
run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools
 SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
++endif()
+ 
+ 
+ 
+

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild
new file mode 100644
index 000..05bb1fc476f
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild
@@ -0,0 +1,63 @@
+# 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-LoaderAndValidationLayers.git;
+   inherit git-r3