[PR PATCH] Update glslang and shaderc to the current version.

[PR PATCH] Update glslang and shaderc to the current version.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages glslang
https://github.com/void-linux/void-packages/pull/41693

Update glslang and shaderc to the current version.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41693.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslang-41693.patch --]
[-- Type: text/x-diff, Size: 4693 bytes --]

From 1c5d6b43d9b41c42c1bad264fafc456c83f5b75d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 17 Jan 2023 16:07:14 +0100
Subject: [PATCH 1/2] glslang: update to 11.13.0.

---
 .../glslang-11.13.0-cmake_include_dirs.patch  | 24 ++++++++++++++
 srcpkgs/glslang/template                      | 31 ++++++++++++++++---
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/glslang/patches/glslang-11.13.0-cmake_include_dirs.patch

diff --git a/srcpkgs/glslang/patches/glslang-11.13.0-cmake_include_dirs.patch b/srcpkgs/glslang/patches/glslang-11.13.0-cmake_include_dirs.patch
new file mode 100644
index 000000000000..f9bf8fb95c7d
--- /dev/null
+++ b/srcpkgs/glslang/patches/glslang-11.13.0-cmake_include_dirs.patch
@@ -0,0 +1,24 @@
+diff -ruN a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+--- a/SPIRV/CMakeLists.txt	2022-12-06 23:34:33.000000000 +0100
++++ b/SPIRV/CMakeLists.txt	2022-12-16 12:15:03.231070779 +0100
+@@ -100,7 +100,7 @@
+     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>)
++    )
+ else()
+     target_link_libraries(SPIRV PRIVATE MachineIndependent)
+ endif()
+diff -ruN a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+--- a/StandAlone/CMakeLists.txt	2022-12-06 23:34:33.000000000 +0100
++++ b/StandAlone/CMakeLists.txt	2022-12-16 12:15:20.527812776 +0100
+@@ -83,7 +83,7 @@
+ target_link_libraries(glslangValidator ${LIBRARIES})
+ target_include_directories(glslangValidator PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++)
+ 
+ if(ENABLE_OPT)
+     target_include_directories(glslangValidator
diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template
index f374b3ae7c9f..5f40d031d1db 100644
--- a/srcpkgs/glslang/template
+++ b/srcpkgs/glslang/template
@@ -1,17 +1,40 @@
 # Template file for 'glslang'
 # Libraries are unversioned, beware of ABI breakage (rebuild shaderc on updates)
 pkgname=glslang
-version=11.11.0
+version=11.13.0
 revision=1
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="python3 bison"
 short_desc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/KhronosGroup/glslang"
 distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz"
-checksum=26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438
+checksum=592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162
+
+do_build() {
+	# we need fat LTO objects to not break consumers during linking
+	CXXFLAGS+=" -ffat-lto-objects"
+	cmake \
+		-Bbuild-shared \
+		-GNinja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-DBUILD_SHARED_LIBS=ON
+	ninja -Cbuild-shared
+	cmake \
+		-Bbuild-static \
+		-GNinja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-DBUILD_SHARED_LIBS=OFF
+	ninja -Cbuild-static
+}
+
+do_install() {
+	DESTDIR="${DESTDIR}" ninja -C build-shared install
+	DESTDIR="${DESTDIR}" ninja -C build-static install
+}
 
 post_install() {
 	sed -n '2,32p' < glslang/GenericCodeGen/CodeGen.cpp > LICENSE
@@ -23,8 +46,8 @@ glslang-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove usr/lib/libglslang.so
 		vmove usr/lib/cmake
+		vmove "usr/lib/*.a"
 	}
 }

From 097dcfa26050f73282e36761a61428c3aca26885 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 17 Jan 2023 16:08:14 +0100
Subject: [PATCH 2/2] shaderc: update to 2023.1.

---
 srcpkgs/shaderc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template
index 1ab7478262a6..129b9af4beb6 100644
--- a/srcpkgs/shaderc/template
+++ b/srcpkgs/shaderc/template
@@ -1,6 +1,6 @@
 # Template file for 'shaderc'
 pkgname=shaderc
-version=2022.2
+version=2023.1
 revision=1
 build_style=cmake
 configure_args="-DSHADERC_SKIP_TESTS=ON"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/shaderc"
 distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz"
-checksum=517d36937c406858164673db696dc1d9c7be7ef0960fbf2965bfef768f46b8c0
+checksum=8041c6874a085a0f357d7918855f9e39bbeff9313cbeacab28505aa233fc0da2
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang"
 LDFLAGS="-Wl,--no-undefined"

Re: Update glslang and shaderc to the current version.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1385607386

Comment:
I hope somebody can help me with the PR.

Since just updating the version and checksum didn't worked I used the way that Archlinux does
the PKGBUILD.

I tried also to get SPIRV-Tools-devel and SPIRV-Headers to link against the glslang but this
didn't work. If we could get this working this would help a lot.

Re: Update glslang and shaderc to the current version.

[TheKeyboard3]

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

New comment by TheKeyboard3 on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1396065124

Comment:
glslang compiles and passes tests with just the version and checksum updated, as well as the \"vmove \"usr/lib/*.a\"\" line removed because no static libraries are created. If the lack of static libraries is an issue for other packages the cmake file of the pakcage should be looked into

Re: Update glslang and shaderc to the current version.

[TheKeyboard3]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

New comment by TheKeyboard3 on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1396065124

Comment:
glslang compiles and passes tests with just the version and checksum updated, as well as the \"vmove \"usr/lib/*.a\"\" line removed because no static libraries are created. If the lack of static libraries is an issue for other packages the cmake files of the pakcage should be looked into

Re: Update glslang and shaderc to the current version.

[TheKeyboard3]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

New comment by TheKeyboard3 on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1396065124

Comment:
glslang compiles and passes tests with just the version and the checksum updated, as well as the \"vmove \"usr/lib/*.a\"\" line removed because no static libraries are created. If the lack of static libraries is an issue for other packages the cmake files of the pakcage should be looked into

Re: Update glslang and shaderc to the current version.

[TheKeyboard3]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by TheKeyboard3 on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1396065124

Comment:
glslang compiles and passes tests with just the version and the checksum updated, as well as the \"vmove \"usr/lib/*.a\"\" line removed because no static libraries are created. If the lack of static libraries is an issue for other packages, the cmake files of the pakcage should be looked into

Re: Update glslang and shaderc to the current version.

[TheKeyboard3]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

New comment by TheKeyboard3 on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1407596033

Comment:
I`ve looked into the cmake files and found out that building shared libraries and statically linked libraries is mutually exclusive in the never versions of glslang, but the static libraries are necesarry for shaderc

Re: Update glslang and shaderc to the current version.

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/41693#issuecomment-1528917278

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: Update glslang and shaderc to the current version.

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

There's a closed pull request on the void-packages repository

Update glslang and shaderc to the current version.
https://github.com/void-linux/void-packages/pull/41693

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

The update is also necessary for Godot 4 to be able to use the shared library instead of the
builtin glslang.