Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Glslang
@ 2024-10-03 15:03 dataCobra
  2024-10-31  8:07 ` [PR PATCH] [Updated] glslang, shaderc update + revbump of packages and patches added dataCobra
  2024-11-01  2:15 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 2 replies; 3+ messages in thread
From: dataCobra @ 2024-10-03 15:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 651 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/52477

Glslang
#### Testing the changes
- I tested the changes in this PR: **YES, all version changes and patches** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)


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

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

From 9c2ffa7c5afa381f2c7c939eff0d978fe45ec46d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 3 Oct 2024 16:22:34 +0200
Subject: [PATCH 1/6] glslang: update to 15.0.0.

---
 common/shlibs            |  6 ++---
 srcpkgs/glslang/template | 49 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 222ce710d934b9..8e5d342e1d5aa3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3576,9 +3576,9 @@ libbelr.so.1 belr-0.1.3_1
 libbelcard.so.1 belcard-1.0.2_1
 libsoci_core.so.4.0 soci-4.0.3_1
 libshaderc_shared.so.1 shaderc-2018.0_1
-libglslang.so.11 glslang-11.11.0_1
-libHLSL.so glslang-11.11.0_1
-libSPIRV.so glslang-11.11.0_1
+libglslang.so.15 glslang-15.0.0_1
+libglslang-default-resource-limits.so.15 glslang-15.0.0_1
+libSPIRV.so glslang-15.0.0_1
 libSPIRV-Tools-shared.so SPIRV-Tools-2022.3_1
 libmaxminddb.so.0 libmaxminddb-1.3.2_1
 libmysqlpp.so.3 mysql++-3.2.5_1
diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template
index f374b3ae7c9f0d..573c127d05ce1c 100644
--- a/srcpkgs/glslang/template
+++ b/srcpkgs/glslang/template
@@ -1,17 +1,56 @@
 # Template file for 'glslang'
 # Libraries are unversioned, beware of ABI breakage (rebuild shaderc on updates)
 pkgname=glslang
-version=11.11.0
+version=15.0.0
 revision=1
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
-hostmakedepends="python3 bison"
+hostmakedepends="python3 bison gtest-devel"
+makedepends="SPIRV-Tools-devel"
 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=c31c8c2e89af907507c0631273989526ee7d5cdf7df95ececd628fd7b811e064
+
+if [ "$CROSS_BUILD" ]; then
+	export cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+fi
+
+do_configure() {
+	cmake -B build-shared -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_EXTERNAL=OFF \
+		-DBUILD_SHARED_LIBS=ON \
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=YES \
+		$cmake_crossopts
+
+
+	cmake -B build-static -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_EXTERNAL=OFF \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=YES \
+		$cmake_crossopts
+}
+
+do_build() {
+	ninja -C build-shared
+	ninja -C build-static
+}
+
+do_install() {
+	DESTDIR=$DESTDIR ninja install -C build-static
+	DESTDIR=$DESTDIR ninja install -C build-shared
+}
+
+pre_check() {
+	cmake_builddir="build-static"
+}
 
 post_install() {
 	sed -n '2,32p' < glslang/GenericCodeGen/CodeGen.cpp > LICENSE
@@ -24,7 +63,7 @@ glslang-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove usr/lib/libglslang.so
+		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
 	}
 }

From c854655198ee8b94c155e03da72fcf78b6837577 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 3 Oct 2024 16:23:23 +0200
Subject: [PATCH 2/6] shaderc: update to 2024.3.

---
 .../patches/fix-glslang-link-order.patch      | 25 -------------------
 srcpkgs/shaderc/template                      |  4 +--
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/shaderc/patches/fix-glslang-link-order.patch

diff --git a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch b/srcpkgs/shaderc/patches/fix-glslang-link-order.patch
deleted file mode 100644
index 99292c74483798..00000000000000
--- a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/google/shaderc/pull/463
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
- endif(SHADERC_ENABLE_WGSL_OUTPUT)
- 
- target_link_libraries(glslc PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
-+  glslang OSDependent OGLCompiler glslang SPIRV HLSL    # Glslang libraries
-   $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
-   shaderc_util shaderc                                  # internal Shaderc libraries
-   ${CMAKE_THREAD_LIBS_INIT})
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)
- 
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
--  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  glslang OSDependent OGLCompiler glslang HLSL SPIRV
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template
index 1ab7478262a677..d7dae4f902bc11 100644
--- a/srcpkgs/shaderc/template
+++ b/srcpkgs/shaderc/template
@@ -1,6 +1,6 @@
 # Template file for 'shaderc'
 pkgname=shaderc
-version=2022.2
+version=2024.3
 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=d5c68b5de5d4c7859d9699054493e0a42a2a5eb21b425d63f7b7dd543db0d708
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang"
 LDFLAGS="-Wl,--no-undefined"

From c0d0600141837c4a3488456cb1b778f0b920ca74 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 3 Oct 2024 16:24:06 +0200
Subject: [PATCH 3/6] retroarch: use builtin glslang

---
 srcpkgs/retroarch/template | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 7292681e4e32fd..0999380657ce58 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,20 +1,19 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.19.1
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
- --enable-udev --disable-builtinflac --disable-builtinglslang
- --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
- $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
+ --enable-udev --disable-builtinflac --enable-systemmbedtls
+ --disable-builtinbearssl --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable jack)
  $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg6-devel) $(vopt_if flac libflac-devel)
- $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
- $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader-devel)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXxf86vm-devel')"
 depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
@@ -26,11 +25,10 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=504a3a8a6e5861eb43a61be8339f61183e7ea940c1ff68ac2a2f57d35c67f8ff
 
-build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore pulseaudio sdl2 vulkan wayland x11"
 
 desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
-desc_option_glslang="Enable support for GLSL shaders"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
 vopt_conflict glcore gles2 # gles2 disables glcore support
@@ -42,9 +40,6 @@ else
 fi
 
 if [ "$build_option_glcore" ]; then
-	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
-	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
@@ -61,12 +56,6 @@ if [ "$build_option_qt5" ]; then
 	fi
 fi
 
-if [ "$build_option_vulkan" ]; then
-	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
-	fi
-fi
-
 if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
 		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"

From 506a34a4cef54f7185dc4954c07a2b150938108d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 3 Oct 2024 16:31:53 +0200
Subject: [PATCH 4/6] supertuxkart: revbump + patches

---
 srcpkgs/supertuxkart/patches/fix-crash.patch  |  36 ++++
 .../patches/fix-missing-rotation.patch        |  27 +++
 .../supertuxkart/patches/gcc13-fix-1.patch    |  72 ++++++++
 .../supertuxkart/patches/gcc13-fix-2.patch    | 155 ++++++++++++++++++
 srcpkgs/supertuxkart/template                 |   2 +-
 5 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/supertuxkart/patches/fix-crash.patch
 create mode 100644 srcpkgs/supertuxkart/patches/fix-missing-rotation.patch
 create mode 100644 srcpkgs/supertuxkart/patches/gcc13-fix-1.patch
 create mode 100644 srcpkgs/supertuxkart/patches/gcc13-fix-2.patch

diff --git a/srcpkgs/supertuxkart/patches/fix-crash.patch b/srcpkgs/supertuxkart/patches/fix-crash.patch
new file mode 100644
index 00000000000000..5d5afd43ad037d
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/fix-crash.patch
@@ -0,0 +1,36 @@
+From 8544f19b59208ae93fc3db0cf41bd386c6aefbcb Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Thu, 5 Jan 2023 10:33:39 +0800
+Subject: [PATCH] Fix #4834
+
+---
+ src/race/race_manager.hpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
+index 67a6ebd5016..63c39f0f677 100644
+--- a/src/race/race_manager.hpp
++++ b/src/race/race_manager.hpp
+@@ -28,6 +28,7 @@
+ 
+ #include <vector>
+ #include <algorithm>
++#include <cassert>
+ #include <string>
+ 
+ #include "network/remote_kart_info.hpp"
+@@ -644,11 +645,14 @@ class RaceManager
+     // ----------------------------------------------------------------------------------------
+     int getKartLocalPlayerId(int k) const
+     {
++        assert(k < (int)m_kart_status.size());
+         return m_kart_status[k].m_local_player_id;
+     }   // getKartLocalPlayerId
+     // ----------------------------------------------------------------------------------------
+     int getKartGlobalPlayerId(int k) const
+     {
++        if (k >= (int)m_kart_status.size())
++            return -1;
+         return m_kart_status[k].m_global_player_id;
+     }   // getKartGlobalPlayerId
+     // ----------------------------------------------------------------------------------------
diff --git a/srcpkgs/supertuxkart/patches/fix-missing-rotation.patch b/srcpkgs/supertuxkart/patches/fix-missing-rotation.patch
new file mode 100644
index 00000000000000..c240ac58a9d921
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/fix-missing-rotation.patch
@@ -0,0 +1,27 @@
+From 0c2b81ac1f9ff29f5012a98f530880b87f416337 Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Thu, 3 Nov 2022 11:39:25 +0800
+Subject: [PATCH] Fix missing rotation when lto is used, see #4811
+
+---
+ src/physics/physical_object.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
+index c389b7a28b2..09d57034ece 100644
+--- a/src/physics/physical_object.cpp
++++ b/src/physics/physical_object.cpp
+@@ -637,10 +637,12 @@ void PhysicalObject::updateGraphics(float dt)
+ 
+     Vec3 hpr;
+     hpr.setHPR(SmoothNetworkBody::getSmoothedTrans().getRotation());
++    // Fix missing rotation when lto is used, see #4811
++    hpr *= RAD_TO_DEGREE;
+ 
+     // This will only update the visual position, so it can be
+     // called in updateGraphics()
+-    m_object->move(xyz.toIrrVector(), hpr.toIrrVector()*RAD_TO_DEGREE,
++    m_object->move(xyz.toIrrVector(), hpr.toIrrVector(),
+                    m_init_scale, /*updateRigidBody*/false, 
+                    /* isAbsoluteCoord */true);
+ }   // updateGraphics
diff --git a/srcpkgs/supertuxkart/patches/gcc13-fix-1.patch b/srcpkgs/supertuxkart/patches/gcc13-fix-1.patch
new file mode 100644
index 00000000000000..789934d3f632c3
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/gcc13-fix-1.patch
@@ -0,0 +1,72 @@
+From 27eb0f3116921492e183ad3aa685ddb147ed7183 Mon Sep 17 00:00:00 2001
+From: Gwyn Ciesla <gwync@protonmail.com>
+Date: Thu, 23 Feb 2023 08:56:27 -0600
+Subject: [PATCH] gcc13 fixes
+
+---
+ lib/graphics_engine/include/vk_mem_alloc.h            | 2 ++
+ lib/graphics_engine/src/ge_vulkan_command_loader.cpp  | 1 +
+ lib/graphics_engine/src/ge_vulkan_depth_texture.cpp   | 2 ++
+ lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp      | 1 +
+ lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp | 1 +
+ 5 files changed, 7 insertions(+)
+
+diff --git a/lib/graphics_engine/include/vk_mem_alloc.h b/lib/graphics_engine/include/vk_mem_alloc.h
+index d4b683a7551..ac82aedb15b 100644
+--- a/lib/graphics_engine/include/vk_mem_alloc.h
++++ b/lib/graphics_engine/include/vk_mem_alloc.h
+@@ -20,6 +20,8 @@
+ // THE SOFTWARE.
+ //
+ 
++#include <cstdio>
++
+ #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
+ #define AMD_VULKAN_MEMORY_ALLOCATOR_H
+ 
+diff --git a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+index a1e5b3a71b8..13cadd63daf 100644
+--- a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+@@ -10,6 +10,7 @@
+ #include <mutex>
+ #include <stdexcept>
+ #include <thread>
++#include <stdexcept>
+ 
+ #include "../source/Irrlicht/os.h"
+ 
+diff --git a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+index 4a5d3d391b1..0411c617df6 100644
+--- a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+@@ -1,3 +1,5 @@
++#include <stdexcept>
++
+ #include "ge_vulkan_depth_texture.hpp"
+ 
+ #include "ge_main.hpp"
+diff --git a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+index f510f91813a..a821ee4a962 100644
+--- a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+@@ -12,6 +12,7 @@
+ #include <cassert>
+ #include <stdexcept>
+ #include <vector>
++#include <stdexcept>
+ 
+ namespace GE
+ {
+diff --git a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+index fe7fcc45515..82977f00785 100644
+--- a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+@@ -13,6 +13,7 @@
+ #include <cstdint>
+ #include <stdexcept>
+ #include <unordered_map>
++#include <stdexcept>
+ 
+ namespace GE
+ {
diff --git a/srcpkgs/supertuxkart/patches/gcc13-fix-2.patch b/srcpkgs/supertuxkart/patches/gcc13-fix-2.patch
new file mode 100644
index 00000000000000..21fad1ae65a2e5
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/gcc13-fix-2.patch
@@ -0,0 +1,155 @@
+From 0163e3fa88b72634c3ddff5304c9086b649f53b1 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 26 Jan 2023 16:35:54 +0100
+Subject: [PATCH] Add missing includes to fix the build with gcc 13
+
+Like other versions before, gcc 13 moved some includes around and as a
+result <stdexcept> and <cstdio> are no longer transitively included.
+Explicitly include them for std::runtime_error and snprintf.
+---
+ lib/graphics_engine/include/vk_mem_alloc.h               | 1 +
+ lib/graphics_engine/src/ge_spm_buffer.cpp                | 1 +
+ lib/graphics_engine/src/ge_vulkan_array_texture.cpp      | 1 +
+ lib/graphics_engine/src/ge_vulkan_command_loader.cpp     | 1 +
+ lib/graphics_engine/src/ge_vulkan_depth_texture.cpp      | 2 ++
+ lib/graphics_engine/src/ge_vulkan_draw_call.cpp          | 1 +
+ lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp        | 1 +
+ lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp         | 1 +
+ lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp    | 1 +
+ lib/graphics_engine/src/ge_vulkan_texture.cpp            | 1 +
+ lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp | 1 +
+ 11 files changed, 12 insertions(+)
+
+diff --git a/lib/graphics_engine/include/vk_mem_alloc.h b/lib/graphics_engine/include/vk_mem_alloc.h
+index bdb4ff57610..d4b683a7551 100644
+--- a/lib/graphics_engine/include/vk_mem_alloc.h
++++ b/lib/graphics_engine/include/vk_mem_alloc.h
+@@ -2563,6 +2563,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+ #undef VMA_IMPLEMENTATION
+ 
+ #include <cstdint>
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <utility>
+diff --git a/lib/graphics_engine/src/ge_spm_buffer.cpp b/lib/graphics_engine/src/ge_spm_buffer.cpp
+index fe4f4758adf..1179a732566 100644
+--- a/lib/graphics_engine/src/ge_spm_buffer.cpp
++++ b/lib/graphics_engine/src/ge_spm_buffer.cpp
+@@ -5,6 +5,7 @@
+ #include "ge_vulkan_features.hpp"
+ 
+ #include <algorithm>
++#include <stdexcept>
+ 
+ #include "mini_glm.hpp"
+ 
+diff --git a/lib/graphics_engine/src/ge_vulkan_array_texture.cpp b/lib/graphics_engine/src/ge_vulkan_array_texture.cpp
+index f3361478c3b..0f817dc40fd 100644
+--- a/lib/graphics_engine/src/ge_vulkan_array_texture.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_array_texture.cpp
+@@ -12,6 +12,7 @@
+ 
+ #include <IImageLoader.h>
+ #include <cassert>
++#include <stdexcept>
+ 
+ namespace GE
+ {
+diff --git a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+index 358cf9ab6ec..a1e5b3a71b8 100644
+--- a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+@@ -8,6 +8,7 @@
+ #include <deque>
+ #include <memory>
+ #include <mutex>
++#include <stdexcept>
+ #include <thread>
+ 
+ #include "../source/Irrlicht/os.h"
+diff --git a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+index 25cb2429638..4a5d3d391b1 100644
+--- a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+@@ -3,6 +3,8 @@
+ #include "ge_main.hpp"
+ #include "ge_vulkan_driver.hpp"
+ 
++#include <stdexcept>
++
+ namespace GE
+ {
+ GEVulkanDepthTexture::GEVulkanDepthTexture(GEVulkanDriver* vk,
+diff --git a/lib/graphics_engine/src/ge_vulkan_draw_call.cpp b/lib/graphics_engine/src/ge_vulkan_draw_call.cpp
+index 2c2bc57513f..c8a1ddffb5e 100644
+--- a/lib/graphics_engine/src/ge_vulkan_draw_call.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_draw_call.cpp
+@@ -25,6 +25,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <limits>
++#include <stdexcept>
+ 
+ #include "../source/Irrlicht/os.h"
+ #include "quaternion.h"
+diff --git a/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp b/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp
+index 9413a04bb00..834a0b43b1e 100644
+--- a/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp
+@@ -6,6 +6,7 @@
+ 
+ #include <array>
+ #include <exception>
++#include <stdexcept>
+ 
+ namespace GE
+ {
+diff --git a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+index 380f348dffb..f510f91813a 100644
+--- a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+@@ -10,6 +10,7 @@
+ 
+ #include <algorithm>
+ #include <cassert>
++#include <stdexcept>
+ #include <vector>
+ 
+ namespace GE
+diff --git a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+index 2543b16086f..fe7fcc45515 100644
+--- a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+@@ -11,6 +11,7 @@
+ 
+ #include <array>
+ #include <cstdint>
++#include <stdexcept>
+ #include <unordered_map>
+ 
+ namespace GE
+diff --git a/lib/graphics_engine/src/ge_vulkan_texture.cpp b/lib/graphics_engine/src/ge_vulkan_texture.cpp
+index 500eb65fc62..611a24171d4 100644
+--- a/lib/graphics_engine/src/ge_vulkan_texture.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_texture.cpp
+@@ -21,6 +21,7 @@ extern "C"
+ #include <IAttributes.h>
+ #include <IImageLoader.h>
+ #include <limits>
++#include <stdexcept>
+ 
+ namespace GE
+ {
+diff --git a/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp b/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp
+index 4fd8a2e8800..c64d1bdbaa1 100644
+--- a/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp
+@@ -6,6 +6,7 @@
+ 
+ #include <algorithm>
+ #include <exception>
++#include <stdexcept>
+ 
+ namespace GE
+ {
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 0bd25b7cfc9478..c563cdb2ecf585 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.4
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel

From 1dd084ed64828be48b58080df87c009845dc1006 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 3 Oct 2024 16:32:31 +0200
Subject: [PATCH 5/6] libplacebo: revbump

---
 srcpkgs/libplacebo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 3d39ebf816ad8b..7d3761b7be57fd 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,7 +1,7 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
 version=6.338.2
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dshaderc=enabled -Dvulkan=enabled -Ddemos=false
  $(vopt_feature lcms) $(vopt_feature opengl)"

From 1cdedf893065059fb3ac2ac4a352fa5d70759f1d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 3 Oct 2024 17:01:22 +0200
Subject: [PATCH 6/6] godot: use glslang package

---
 srcpkgs/godot/patches/fix-glslang.patch | 23 +++++++++++++++++++++++
 srcpkgs/godot/template                  |  6 +++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/godot/patches/fix-glslang.patch

diff --git a/srcpkgs/godot/patches/fix-glslang.patch b/srcpkgs/godot/patches/fix-glslang.patch
new file mode 100644
index 00000000000000..0f37d38811d28a
--- /dev/null
+++ b/srcpkgs/godot/patches/fix-glslang.patch
@@ -0,0 +1,23 @@
+From 4323f8cd47121df428b0394c6ba2a8da1f93a396 Mon Sep 17 00:00:00 2001
+From: Sertonix <sertonix@posteo.net>
+Date: Sat, 22 Jun 2024 17:14:11 +0000
+Subject: [PATCH] Fix missing lib with builtin_glslang=false
+
+The `GetDefaultResource` function is in separate library file.
+---
+ platform/linuxbsd/detect.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
+index 303a88ab2611..0e24370d8a38 100644
+--- a/platform/linuxbsd/detect.py
++++ b/platform/linuxbsd/detect.py
+@@ -480,7 +480,7 @@ def configure(env: "SConsEnvironment"):
+             env.ParseConfig("pkg-config vulkan --cflags --libs")
+         if not env["builtin_glslang"]:
+             # No pkgconfig file so far, hardcode expected lib name.
+-            env.Append(LIBS=["glslang", "SPIRV"])
++            env.Append(LIBS=["glslang", "SPIRV", "glslang-default-resource-limits"])
+ 
+     if env["opengl3"]:
+         env.Append(CPPDEFINES=["GLES3_ENABLED"])
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 837142ec1d3522..618d8a77a18560 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,11 +1,11 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.3
-revision=6
+revision=7
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- lto=auto builtin_brotli=false builtin_enet=false
+ lto=auto builtin_brotli=false builtin_enet=false builtin_glslang=false
  builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
  builtin_icu4c=false builtin_libogg=false builtin_libpng=false
  builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
@@ -17,7 +17,7 @@ makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
  libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
- pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel glslang-devel
  speech-dispatcher-devel brotli-devel icu-devel wayland-devel"
 depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-01  2:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-03 15:03 [PR PATCH] Glslang dataCobra
2024-10-31  8:07 ` [PR PATCH] [Updated] glslang, shaderc update + revbump of packages and patches added dataCobra
2024-11-01  2:15 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).