From e7751e935b2610a68898de2f0d1f9a62dede845f Mon Sep 17 00:00:00 2001 From: dataCobra Date: Thu, 3 Oct 2024 16:23:23 +0200 Subject: [PATCH] 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 99292c74483..00000000000 --- 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 - $<$: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 1ab7478262a..d7dae4f902b 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 " 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"