commit 827e4959e333d1ff3413c383e6a710878ae32a11 Author: Danny Rawlins <contact@romster.me> Date: Mon Apr 5 15:14:07 2021 +1000 [notify] shaderc: 2020.4-0dbd899 -> 2020.5 new dependnecie: spirv-tools diff --git a/shaderc/.signature b/shaderc/.signature index 3793d2c8a..7bdaae7cd 100644 --- a/shaderc/.signature +++ b/shaderc/.signature @@ -1,9 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36qnZ4jJ+jbs3rNk1CjqXFmZ+s6D0LO9aQYvHiS0HU2dbGuIroX/CHa2lBCEupOuq04Wh3y2u5VHlQSG5BRESQM= -SHA256 (Pkgfile) = dd1d5075d82c9943215113594fbb618221f903fa077b2b22030b4f75f327124f +RWSagIOpLGJF39hJPlyU4RzQ4CVKodGXlM0sLx6UI6dn3+5WkpEMAohVxwZHtgXYmj4OgcjQPomZYf5Ho9UqFNZjAKPPAO6azgE= +SHA256 (Pkgfile) = 7a1dfa5c9dd47e1fcbd88dd9ce619ef05eccf00921c32e9a2fcf1adde79ada90 SHA256 (.footprint) = 768c5796cba31503e5e8a1c1d874f1d8699d410d17d6b98d9a6588ae17462816 -SHA256 (0dbd899941a43ffd55df527d65128b3b66e75c9c.zip) = ad7abeb81e37e900b7e21eb54b6be6f90fce6f9adcb5ac54f3ed8908ea2b2301 -SHA256 (glslc.1) = 267cddf289bffa4855950a5ce662f04ef3b0dea7e46447a6a694214614032a7d -SHA256 (glslc-asciidoc.patch) = 685d97223af4fcd169921ee5f9b2c49a2df3d84b7bf7df7dd1f6def4361321a6 -SHA256 (0001-Drop-third-party-code-in-CMakeLists.txt.patch) = 060eb0e19a58b5e4c61ec087512de0ea52623b9aa33858f7a4b2f036f52169fb -SHA256 (glslang_linker_flags.patch) = 18c74c78ff62d53b522604e59aef595d442e8cae46233622dd9520571201d276 +SHA256 (shaderc-v2020.5.tar.gz) = e96d8cb208b796cecb9e6cce437c7d1116343158ef3ea26277eb13b62cf56834 +SHA256 (shaderc-a3fdfe81465d57efc97cfd28ac6c8190fb31a6c8.tar.gz) = e64772eedd38749a4307060eb75fdb699a6dd1a383c6a7371e97741e9df1eeca +SHA256 (glslc.1) = 3ff32e70177fc4588ef2cc745a97e833a174a50223ed994b76efd828d9c8bded diff --git a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch deleted file mode 100644 index 52697f514..000000000 --- a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt ---- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 -+++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 -@@ -102,18 +102,10 @@ endif(MSVC) - - # Configure subdirectories. - # We depend on these for later projects, so they should come first. --add_subdirectory(third_party) - - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) - add_subdirectory(glslc) --add_subdirectory(examples) -- --add_custom_target(build-version -- ${PYTHON_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py -- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc -- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") - - function(define_pkg_config_file NAME LIBS) - add_custom_target(${NAME}-pkg-config ALL diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile index 027ef43e8..0acadb497 100644 --- a/shaderc/Pkgfile +++ b/shaderc/Pkgfile @@ -1,25 +1,20 @@ # Description: A collection of tools, libraries and tests for shader compilation. # URL: https://github.com/google/shaderc # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: glslang +# Depends on: glslang spirv-tools # Optional: asciidoctor name=shaderc -version=2020.4-0dbd899 +version=2020.5 +_spirv_headers=a3fdfe81465d57efc97cfd28ac6c8190fb31a6c8 release=1 -source=(#https://github.com/google/shaderc/archive/v$version/$name-v$version.tar.gz - https://github.com/google/shaderc/archive/0dbd899941a43ffd55df527d65128b3b66... - glslc.1 glslc-asciidoc.patch - 0001-Drop-third-party-code-in-CMakeLists.txt.patch - glslang_linker_flags.patch) +source=(https://github.com/google/shaderc/archive/v$version/$name-v$version.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/$name-... + glslc.1) build() { - mv $name-0dbd899941a43ffd55df527d65128b3b66e75c9c $name-$version - - patch -d $name-$version/glslc -p0 -i $SRC/glslc-asciidoc.patch - - patch -p1 -d $name-$version -i $SRC/0001-Drop-third-party-code-in-CMakeLists.txt.patch - patch -p1 -d $name-$version -i $SRC/glslang_linker_flags.patch + mkdir -p $name-$version/third_party/spirv-headers + mv SPIRV-Headers-$_spirv_headers/* $name-$version/third_party/spirv-headers # de-vendor libs and disable git versioning sed '/examples/d;/third_party/d' -i $name-$version/CMakeLists.txt @@ -30,17 +25,18 @@ build() { "$(prt-get info glslang | awk '/^Version:/ {print $2}')\\n" EOF - # Point to correct include - sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' $name-$version/libshaderc_util/src/compiler.cc + prt-get isinst ninja && PKGMK_SHADERC+=' -G Ninja' - cmake -S $name-$version -B build -G Ninja \ + cmake -S $name-$version -B build $PKGMK_SHADERC \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D CMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,defs" \ -D SHADERC_SKIP_TESTS=ON \ - -Wno-dev + -D glslang_SOURCE_DIR:PATH='/usr/include/glslang' \ + -D SPIRV-Headers_SOURCE_DIR:PATH="$SRC/$name-$version/third_party/spirv-headers" cmake --build build -j ${JOBS:-1} DESTDIR=$PKG cmake --install build diff --git a/shaderc/glslang_linker_flags.patch b/shaderc/glslang_linker_flags.patch deleted file mode 100644 index 9324f217c..000000000 --- a/shaderc/glslang_linker_flags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -47,7 +47,7 @@ - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE - glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util - ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -43,7 +43,7 @@ - endif(SHADERC_ENABLE_WGSL_OUTPUT) - - target_link_libraries(glslc PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries -+ glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries - $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional - shaderc_util shaderc # internal Shaderc libraries - ${CMAKE_THREAD_LIBS_INIT}) - diff --git a/shaderc/glslc-asciidoc.patch b/shaderc/glslc-asciidoc.patch deleted file mode 100644 index 4f4e24292..000000000 --- a/shaderc/glslc-asciidoc.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- README.asciidoc.orig 2019-10-12 13:09:08.520937661 +1100 -+++ README.asciidoc 2019-10-12 13:07:36.402071472 +1100 -@@ -1,4 +1,4 @@ --= glslc Manual -+= glslc(1) - :toc: - :toclevels: 3 - :numbered: diff --git a/shaderc/glslc.1 b/shaderc/glslc.1 index 76fdb2edb..db7755097 100644 --- a/shaderc/glslc.1 +++ b/shaderc/glslc.1 @@ -1,13 +1,13 @@ '\" t -.\" Title: glslc +.\" Title: glslc Manual .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.12 -.\" Date: 2021-02-27 +.\" Date: 2021-02-19 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "`GLSLC`" "1" "2021-02-27" "\ \&" "\ \&" +.TH "`GLSLC`" "1" "2021-02-19" "\ \&" "\ \&" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0