commit 90f7534ffe9f63628aa9a95397a9178c62610d74 Author: John McQuah <jmcquah@disroot.org> Date: Sun Jan 21 17:02:53 2024 +0000 shaderc: 2023.7 -> 2023.8 diff --git a/shaderc/.signature b/shaderc/.signature index ad9466a68..858bb009f 100644 --- a/shaderc/.signature +++ b/shaderc/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35q6M2ksRq+c2Feroaj+9wmxxaOlEF8wqpOBYdVlLc1HU+7m06xlyzeegEjAzcW/emf7s9vEvL5VWpyoDjn5iwQ= -SHA256 (Pkgfile) = 0f00bf4f708a0c60185aa5816edbe35624ad62968519a333715db6834a1d17d7 +RWSagIOpLGJF30gGjtsCa/U6e9j8pxieG5EtifZM0uS63tf887+xVugbuDiujQiQMJOdHVwZPPtUkWEjH8k8V2ZKH07m+kYjpA8= +SHA256 (Pkgfile) = 3162f055194fca619e92a138d50b8ccac32f77f4db6161e6571c47c8e421b9f3 SHA256 (.footprint) = 768c5796cba31503e5e8a1c1d874f1d8699d410d17d6b98d9a6588ae17462816 -SHA256 (shaderc-v2023.7.tar.gz) = 681e1340726a0bf46bea7e31f10cbfe78e01e4446a35d90fedc2b78d400fcdeb -SHA256 (40bced4e1e205ecf44630d2dfa357655b6dabd04.patch) = e74690a9699376836ba3da5d06ffac56edfe77d95a8b847be2bb68f7c15509ce -SHA256 (glslc.1) = 348294e9066b0bf7337faebee3823e99f5e9df337154321332c5d28cd4473e1a +SHA256 (shaderc-v2023.8.tar.gz) = dfec5045f30d8f6d3d3914ab5b3cc2695947f266d41261b1459177cd789308d1 +SHA256 (glslc.1) = 15fc22d7e58c292693d2f53152b564092210819cf383a4103316dcd8cd464f4e diff --git a/shaderc/40bced4e1e205ecf44630d2dfa357655b6dabd04.patch b/shaderc/40bced4e1e205ecf44630d2dfa357655b6dabd04.patch deleted file mode 100644 index 345044872..000000000 --- a/shaderc/40bced4e1e205ecf44630d2dfa357655b6dabd04.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 40bced4e1e205ecf44630d2dfa357655b6dabd04 Mon Sep 17 00:00:00 2001 -From: David Neto <dneto@google.com> -Date: Thu, 30 Nov 2023 17:02:24 -0500 -Subject: [PATCH] update Glslang and remove references to libs it has removed - (#1384) - -* OGLCompiler and HLSL have been removed from glslang - -This fixes SPIRV-Tools CI-shaderc-smoketest build failure. - -* Update Glslang in DEPS - -Glslang doesn't support building standalone glslang on Android or iOS. -So build the glslang lib target first, instead of glslang-standalone - ---------- - -Co-authored-by: Juan Ramos <juan@lunarg.com> ---- - Android.mk | 2 -- - DEPS | 2 +- - glslc/CMakeLists.txt | 2 +- - kokoro/android-release/build-docker.sh | 4 ++-- - libshaderc/CMakeLists.txt | 2 +- - libshaderc/README.md | 7 ++----- - libshaderc_util/CMakeLists.txt | 2 +- - 7 files changed, 8 insertions(+), 13 deletions(-) - -diff --git a/Android.mk b/Android.mk -index ed4a7828c..f8bb96b6e 100644 ---- a/Android.mk -+++ b/Android.mk -@@ -19,12 +19,10 @@ include $(ROOT_SHADERC_PATH)/libshaderc_util/Android.mk - include $(ROOT_SHADERC_PATH)/libshaderc/Android.mk - - ALL_LIBS:=libglslang.a \ -- libOGLCompiler.a \ - libOSDependent.a \ - libshaderc.a \ - libshaderc_util.a \ - libSPIRV.a \ -- libHLSL.a \ - libSPIRV-Tools.a \ - libSPIRV-Tools-opt.a - -diff --git a/DEPS b/DEPS -index a7dc1d30c..76d158031 100644 ---- a/DEPS -+++ b/DEPS -@@ -7,7 +7,7 @@ vars = { - - 'abseil_revision': '5be22f98733c674d532598454ae729253bc53e82', - 'effcee_revision' : '19b4aa87af25cb4ee779a071409732f34bfc305c', -- 'glslang_revision': '48f9ed8b08be974f4e463ef38136c8f23513b2cf', -+ 'glslang_revision': '6be56e45e574b375d759b89dad35f780bbd4792f', - 'googletest_revision': 'e47544ad31cb3ceecd04cc13e8fe556f8df9fe0b', - 're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761', - 'spirv_headers_revision': '4183b260f4cccae52a89efdfcdd43c4897989f42', -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index c8fa6d510..1277d87e7 100644 ---- 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 SPIRV # Glslang libraries - $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional - shaderc_util shaderc # internal Shaderc libraries - ${CMAKE_THREAD_LIBS_INIT}) -diff --git a/kokoro/android-release/build-docker.sh b/kokoro/android-release/build-docker.sh -index 8bd5215f5..a81832513 100755 ---- a/kokoro/android-release/build-docker.sh -+++ b/kokoro/android-release/build-docker.sh -@@ -48,8 +48,8 @@ cmake \ - -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \ - -DANDROID_NDK=$ANDROID_NDK_HOME .. - --echo $(date): Build glslang... --ninja glslang-standalone -+echo $(date): Build glslang library... -+ninja glslang - - echo $(date): Build everything... - ninja -diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index fc92f35bc..df9a88d07 100644 ---- a/libshaderc/CMakeLists.txt -+++ b/libshaderc/CMakeLists.txt -@@ -63,7 +63,7 @@ endif(SHADERC_ENABLE_INSTALL) - - find_package(Threads) - set(SHADERC_LIBS -- glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT} -+ glslang ${CMAKE_THREAD_LIBS_INIT} - shaderc_util - SPIRV # from glslang - SPIRV-Tools -diff --git a/libshaderc/README.md b/libshaderc/README.md -index bf9d317f3..45636e83c 100644 ---- a/libshaderc/README.md -+++ b/libshaderc/README.md -@@ -7,8 +7,8 @@ A library for compiling shader strings into SPIR-V. - There are two main shaderc libraries that are created during a CMake - compilation. The first is `libshaderc`, which is a static library - containing just the functionality exposed by libshaderc. It depends --on other compilation targets `glslang`, `OSDependent`, `OGLCompiler`, --`shaderc_util`, `SPIRV`, `HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. -+on other compilation targets `glslang`, `shaderc_util`, `SPIRV`, -+`SPIRV-Tools`, and `SPIRV-Tools-opt`. - - The other is `libshaderc_combined`, which is a static library containing - libshaderc and all of its dependencies. -@@ -38,12 +38,9 @@ platforms `-lpthread` should also be specified. - counterparts should be linked in the order specified. - * `build/libshaderc/libshaderc.a` - * `build/third_party/glslang/glslang/glslang.a` -- * `build/third_party/glslang/glslang/OSDependent/{Platform}/libOSDependent.a` -- * `build/third_party/glslang/OGLCompilersDLL/libOGLCompiler.a` - * `build/third_party/glslang/libglslang.a` - * `build/shaderc_util/libshaderc_util.a` - * `build/third_party/glslang/SPIRV/libSPIRV.a` -- * `build/third_party/glslang/hlsl/libHLSL.a` - * `build/third_party/spirv-tools/libSPIRV-Tools-opt.a` - * `build/third_party/spirv-tools/libSPIRV-Tools.a` - -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 99ce3c44e..69ba519a9 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -46,7 +46,7 @@ add_definitions(-DENABLE_HLSL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV -+ glslang SPIRV - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile index 9bb81d26d..6a06ae330 100644 --- a/shaderc/Pkgfile +++ b/shaderc/Pkgfile @@ -5,17 +5,15 @@ # Optional: asciidoctor name=shaderc -version=2023.7 -release=2 -source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz - 40bced4e1e205ecf44630d2dfa357655b6dabd04.patch - glslc.1) +version=2023.8 +release=1 +source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz glslc.1) build() { cd $name-$version # fix build with glslang 14 - patch -Np1 -i ../40bced4e1e205ecf44630d2dfa357655b6dabd04.patch + # patch -Np1 -i ../40bced4e1e205ecf44630d2dfa357655b6dabd04.patch # de-vendor libs and disable git versioning sed '/examples/d;/third_party/d' -i CMakeLists.txt @@ -34,6 +32,7 @@ EOF -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects" \ -D SHADERC_SKIP_TESTS=ON \ + -D SHADERC_SKIP_COPYRIGHT_CHECK=ON \ -D glslang_SOURCE_DIR:PATH='/usr/include/glslang' cmake --build build -j ${JOBS:-1} diff --git a/shaderc/glslc.1 b/shaderc/glslc.1 index fe83946b2..22d2d2b2f 100644 --- a/shaderc/glslc.1 +++ b/shaderc/glslc.1 @@ -2,12 +2,12 @@ .\" Title: glslc Manual .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.20 -.\" Date: 2023-10-15 +.\" Date: 2024-01-03 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "GLSLC" "1" "2023-10-15" "\ \&" "\ \&" +.TH "GLSLC" "1" "2024-01-03" "\ \&" "\ \&" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -1427,4 +1427,4 @@ escaping in C. The file argument is a relative path that is matched first against the including file\(cqs own directory and then against all \f(CR\-I\fP arguments in order of their appearance on the command line. If the file cannot be found, \f(CRglslc\fP aborts -with an error. \ No newline at end of file +with an error.