[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/

["Nick Sarnie" <sarnex@gentoo.org>]

commit:     202e24f69e75a8910144ec7f3ee617b3598653dd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 18:23:47 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 18:24:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202e24f6

dev-util/glslang: Fix cmake targets

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

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

 .../files/glslang-1.3.238-Fix-cmake-targets.patch  | 26 ++++++++++++++++++++++
 ...1.3.268-r1.ebuild => glslang-1.3.268-r2.ebuild} |  4 +++-
 dev-util/glslang/glslang-9999.ebuild               |  4 +++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
new file mode 100644
index 000000000000..3afcec329f07
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
@@ -0,0 +1,26 @@
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index a80e74ed..8a15f00d 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -106,7 +106,7 @@ if(ENABLE_OPT)
+     target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
+     target_include_directories(SPIRV PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>)
+ else()
+     target_link_libraries(SPIRV PRIVATE MachineIndependent)
+ endif()
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index ad88442c..db2ca5ff 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -69,7 +69,7 @@ endif()
+ target_link_libraries(glslang-standalone ${LIBRARIES})
+ target_include_directories(glslang-standalone PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ 
+ if(ENABLE_OPT)
+     target_include_directories(glslang-standalone

diff --git a/dev-util/glslang/glslang-1.3.268-r1.ebuild b/dev-util/glslang/glslang-1.3.268-r2.ebuild
similarity index 89%
rename from dev-util/glslang/glslang-1.3.268-r1.ebuild
rename to dev-util/glslang/glslang-1.3.268-r2.ebuild
index 809e9b2f1e97..2ac7f3ffb59c 100644
--- a/dev-util/glslang/glslang-1.3.268-r1.ebuild
+++ b/dev-util/glslang/glslang-1.3.268-r2.ebuild
@@ -31,7 +31,9 @@ BDEPEND="${PYTHON_DEPS}
 
 DEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
+		  "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
+)
 
 multilib_src_configure() {
 	local mycmakeargs=(

diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 7ba69afd1dbe..dd1be10214bc 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -31,7 +31,9 @@ BDEPEND="${PYTHON_DEPS}
 
 DEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
+		  "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
+)
 
 multilib_src_configure() {
 	local mycmakeargs=(