repo/gentoo:master commit in: dev-util/shader-slang/, dev-util/shader-slang/files/

"Ionen Wolkens" <[email protected]>
Newsgroups gmane.linux.gentoo.cvs
Message-ID <1786099223.cab138486f07b20da1549bb999ceab679af1ea62.ionen@gentoo>
commit:     cab138486f07b20da1549bb999ceab679af1ea62
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 10:14:20 2026 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 10:40:23 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab13848

dev-util/shader-slang: (really) avoid collision with sys-libs/slang

wrt path name, not packaged in many distros (yet), but I've seen some
use /usr/include/shader-slang rather than /slang, let's go with this
given it's more specific. Same reason avoided naming the package
"slang" despite upstream is "slang-${PV}".

Believe(?) consumers should not ever have a reason to specify this
path themselves, both shader-compiler.pc and the cmake target add
the include dir -- so the path ultimately should not matter much.

Closes: https://bugs.gentoo.org/980471
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/shader-slang-2026.14.1-includedir.patch     | 19 +++++++++++++++++++
 ...4.1-r1.ebuild => shader-slang-2026.14.1-r2.ebuild} |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dev-util/shader-slang/files/shader-slang-2026.14.1-includedir.patch b/dev-util/shader-slang/files/shader-slang-2026.14.1-includedir.patch
new file mode 100644
index 000000000000..a896ec3ba893
--- /dev/null
+++ b/dev-util/shader-slang/files/shader-slang-2026.14.1-includedir.patch
@@ -0,0 +1,19 @@
+Ensure changes to CMAKE_INSTALL_INCLUDEDIR are respected for [1]
+
+Note headers are installed twice (overwritten), CMakeLists.txt's
+does not respect INCLUDEDIR while cmake/SlangTarget.cmake does.
+
+[1] https://bugs.gentoo.org/980471
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -660,5 +659,0 @@
+-install(
+-    DIRECTORY "${slang_SOURCE_DIR}/include"
+-    DESTINATION .
+-    PATTERN ".*" EXCLUDE
+-)
+--- a/extras/pkgconfig/slang-compiler.pc.in
++++ b/extras/pkgconfig/slang-compiler.pc.in
+@@ -4 +4 @@
+-includedir=${prefix}/include
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

diff --git a/dev-util/shader-slang/shader-slang-2026.14.1-r1.ebuild b/dev-util/shader-slang/shader-slang-2026.14.1-r2.ebuild
similarity index 94%
rename from dev-util/shader-slang/shader-slang-2026.14.1-r1.ebuild
rename to dev-util/shader-slang/shader-slang-2026.14.1-r2.ebuild
index 9ff96709cf23..6515a942bc09 100644
--- a/dev-util/shader-slang/shader-slang-2026.14.1-r1.ebuild
+++ b/dev-util/shader-slang/shader-slang-2026.14.1-r2.ebuild
@@ -37,6 +37,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2026.14.1-includedir.patch
 	"${FILESDIR}"/${PN}-2026.14.1-libdir.patch
 	"${FILESDIR}"/${PN}-2026.14.1-lz4.patch
 	"${FILESDIR}"/${PN}-2026.14.1-system-glslang.patch
@@ -67,7 +68,8 @@ src_configure() {
 		-DSLANG_USE_SYSTEM_VULKAN_HEADERS=yes
 		-DSLANG_VERSION_{FULL,NUMERIC}=${PV}
 
-		# legacy option, disabling prevents collision with sys-libs/slang
+		# avoid collisions with sys-libs/slang
+		-DCMAKE_INSTALL_INCLUDEDIR=include/${PN}
 		-DSLANG_ENABLE_SLANG_PROXY=no
 
 		# options disabled for simplicity, will revisit only if needed
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.