commit f5c4d953d52cdcc984ff07a36df911e3c490f25c Author: John McQuah <jmcquah@disroot.org> Date: Sun Oct 15 11:40:17 2023 +0000 shaderc: 2023.6 -> 2023.7 diff --git a/shaderc/.signature b/shaderc/.signature index 22c079687..0be012ab3 100644 --- a/shaderc/.signature +++ b/shaderc/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36hNRfsGYjwm4hGsG0YlUVu3DCURcB4MXLCkvfIM3jO2eDqcLsGK+4ipZhpgnHUiYxENnmsVk2pAgIAB5Y1FuAM= -SHA256 (Pkgfile) = 68e1fe5427f34e83d53d352c1db55efead8546cec4708eb32ec3fd66d3932825 +RWSagIOpLGJF31LleuoV+fwYJ3ATd92wswXIZNIQnxzGXahs6mwnooRwqsxetl3kU1fyb4nl1siV3vrl27fS2Pqeok2qww1chwU= +SHA256 (Pkgfile) = 6c25050bfa0e365f50e536f8d9c41c555de0e7b0f1b0d63c09a1e9a0a87e3814 SHA256 (.footprint) = 768c5796cba31503e5e8a1c1d874f1d8699d410d17d6b98d9a6588ae17462816 -SHA256 (shaderc-v2023.6.tar.gz) = e40fd4a87a56f6610e223122179f086d5c4f11a7e0e2aa461f0325c3a0acc6ae -SHA256 (glslc.1) = eb44308e645bcba593460fbba662c291489b868467a19853b1b57b5f73448798 +SHA256 (shaderc-v2023.7.tar.gz) = 681e1340726a0bf46bea7e31f10cbfe78e01e4446a35d90fedc2b78d400fcdeb +SHA256 (glslc.1) = 348294e9066b0bf7337faebee3823e99f5e9df337154321332c5d28cd4473e1a diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile index 0df78b85c..1f7005e24 100644 --- a/shaderc/Pkgfile +++ b/shaderc/Pkgfile @@ -5,39 +5,39 @@ # Optional: asciidoctor name=shaderc -version=2023.6 +version=2023.7 release=1 source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz - glslc.1) + glslc.1) build() { - # de-vendor libs and disable git versioning - sed '/examples/d;/third_party/d' -i $name-$version/CMakeLists.txt - sed '/build-version/d' -i $name-$version/glslc/CMakeLists.txt - cat <<- EOF > $name-$version/glslc/src/build-version.inc + # de-vendor libs and disable git versioning + sed '/examples/d;/third_party/d' -i $name-$version/CMakeLists.txt + sed '/build-version/d' -i $name-$version/glslc/CMakeLists.txt + cat <<- EOF > $name-$version/glslc/src/build-version.inc "${version}\\n" "$(prt-get printf '%v\n' --filter=spirv-tools)" "$(prt-get printf '%v\n' --filter=glslang)" EOF - sed -i -e "s|\$<TARGET_FILE:spirv-dis>|spirv-dis|" \ - $name-$version/glslc/test/CMakeLists.txt + sed -i -e "s|\$<TARGET_FILE:spirv-dis>|spirv-dis|" \ + $name-$version/glslc/test/CMakeLists.txt - cmake -S $name-$version -B build -G Ninja $PKGMK_SHADERC \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=lib \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects" \ - -D SHADERC_SKIP_TESTS=ON \ - -D glslang_SOURCE_DIR:PATH='/usr/include/glslang' + cmake -S $name-$version -B build -G Ninja $PKGMK_SHADERC \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects" \ + -D SHADERC_SKIP_TESTS=ON \ + -D glslang_SOURCE_DIR:PATH='/usr/include/glslang' - cmake --build build -j ${JOBS:-1} - DESTDIR=$PKG cmake --install build + cmake --build build -j ${JOBS:-1} + DESTDIR=$PKG cmake --install build - if [ -e '/usr/bin/asciidoctor' ]; then - sed 's/^`glslc`/glslc/' $name-$version/glslc/README.asciidoc \ - | asciidoctor -q -b manpage -o glslc.1 - - install -D -m 0644 -t $PKG/usr/share/man/man1 glslc.1 - else - install -D -m 0644 -t $PKG/usr/share/man/man1 $SRC/glslc.1 - fi + if prt-get isinst asciidoctor 2>/dev/null; then + sed 's/^`glslc`/glslc/' $name-$version/glslc/README.asciidoc \ + | asciidoctor -q -b manpage -o glslc.1 - + install -D -m 0644 -t $PKG/usr/share/man/man1 glslc.1 + else + install -D -m 0644 -t $PKG/usr/share/man/man1 $SRC/glslc.1 + fi } diff --git a/shaderc/glslc.1 b/shaderc/glslc.1 index e2b42fafd..fe83946b2 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-07-19 +.\" Date: 2023-10-15 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "GLSLC" "1" "2023-07-19" "\ \&" "\ \&" +.TH "GLSLC" "1" "2023-10-15" "\ \&" "\ \&" .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. +with an error. \ No newline at end of file