glslang: 12.3.1 -> 13.0.0

This commit is contained in:
Tim Biermann 2023-08-26 10:19:32 +02:00
parent c27b483564
commit e688bfccfa
Signed by: tb
GPG Key ID: 42F8B4E30B673606
5 changed files with 19 additions and 66 deletions

View File

@ -92,22 +92,22 @@ drwxr-xr-x root/root usr/lib/cmake/glslang/
-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets.cmake
-rw-r--r-- root/root usr/lib/libGenericCodeGen.a
-rw-r--r-- root/root usr/lib/libHLSL.a
lrwxrwxrwx root/root usr/lib/libHLSL.so -> libHLSL.so.12
lrwxrwxrwx root/root usr/lib/libHLSL.so.12 -> libHLSL.so.12.3.1
-rwxr-xr-x root/root usr/lib/libHLSL.so.12.3.1
lrwxrwxrwx root/root usr/lib/libHLSL.so -> libHLSL.so.13
lrwxrwxrwx root/root usr/lib/libHLSL.so.13 -> libHLSL.so.13.0.0
-rwxr-xr-x root/root usr/lib/libHLSL.so.13.0.0
-rw-r--r-- root/root usr/lib/libMachineIndependent.a
-rw-r--r-- root/root usr/lib/libOGLCompiler.a
-rw-r--r-- root/root usr/lib/libOSDependent.a
-rw-r--r-- root/root usr/lib/libSPIRV.a
lrwxrwxrwx root/root usr/lib/libSPIRV.so -> libSPIRV.so.12
lrwxrwxrwx root/root usr/lib/libSPIRV.so.12 -> libSPIRV.so.12.3.1
-rwxr-xr-x root/root usr/lib/libSPIRV.so.12.3.1
lrwxrwxrwx root/root usr/lib/libSPIRV.so -> libSPIRV.so.13
lrwxrwxrwx root/root usr/lib/libSPIRV.so.13 -> libSPIRV.so.13.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV.so.13.0.0
-rw-r--r-- root/root usr/lib/libSPVRemapper.a
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so -> libSPVRemapper.so.12
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.12 -> libSPVRemapper.so.12.3.1
-rwxr-xr-x root/root usr/lib/libSPVRemapper.so.12.3.1
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so -> libSPVRemapper.so.13
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.13 -> libSPVRemapper.so.13.0.0
-rwxr-xr-x root/root usr/lib/libSPVRemapper.so.13.0.0
-rw-r--r-- root/root usr/lib/libglslang-default-resource-limits.a
-rw-r--r-- root/root usr/lib/libglslang.a
lrwxrwxrwx root/root usr/lib/libglslang.so -> libglslang.so.12
lrwxrwxrwx root/root usr/lib/libglslang.so.12 -> libglslang.so.12.3.1
-rwxr-xr-x root/root usr/lib/libglslang.so.12.3.1
lrwxrwxrwx root/root usr/lib/libglslang.so -> libglslang.so.13
lrwxrwxrwx root/root usr/lib/libglslang.so.13 -> libglslang.so.13.0.0
-rwxr-xr-x root/root usr/lib/libglslang.so.13.0.0

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/f8XgMFpj5S5ifLoJR6LfimSjW9vLn+j1I/ih3J1LXeRK2SbUv9ns1RBp6mbCpNCJAQ9j6D4J6/e6so552jNigw=
SHA256 (Pkgfile) = 85f15ad208e9049dcf33bdee79563230fe16b1e9add9cf6831d0d059f533937c
SHA256 (.footprint) = 9c2b2e465a2db2569462a8cbd3dace47cc6fad2d11429807183ba0f5c82cfefc
SHA256 (glslang-sdk-12.3.1.tar.gz) = a57836a583b3044087ac51bb0d5d2d803ff84591d55f89087fc29ace42a8b9a8
SHA256 (destdir.patch) = 35db29ec188ac72f4bd2c61c8e8b7e6dd79556ce0cce9b1b8ac2afc3f9ff3e45
RWSE3ohX2g5d/Y7OenD9+rxUo6FbBFQ27ZDlxJh+3rtUq8fdrBZgrgEwY4UFXqs6U56KjV7Ro74pIy4zGOq97o54rb0nX2sx4gE=
SHA256 (Pkgfile) = 69e8c3536328371c905c534ccf9f86c2c1e655de0b35bc30bb2caf3e707a7b1a
SHA256 (.footprint) = 7f002c8c24e987ebd537b1c2e4422c42643e1ebe33aadb0bdcdf92f583f7fb47
SHA256 (glslang-sdk-13.0.0.tar.gz) = bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715

View File

@ -4,14 +4,11 @@
# Depends on: spirv-tools
name=glslang
version=12.3.1
release=2
source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-sdk-$version.tar.gz
destdir.patch)
version=13.0.0
release=1
source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-sdk-$version.tar.gz)
build() {
patch -Np1 -d $name-$version -i $SRC/destdir.patch
local config="
-G Ninja
-S $name-$version

View File

@ -1,12 +0,0 @@
diff -Naur glslang-12.3.1.orig/StandAlone/CMakeLists.txt glslang-12.3.1/StandAlone/CMakeLists.txt
--- glslang-12.3.1.orig/StandAlone/CMakeLists.txt 2023-07-23 16:06:17.820386102 +0200
+++ glslang-12.3.1/StandAlone/CMakeLists.txt 2023-07-23 16:53:20.714773555 +0200
@@ -121,7 +121,7 @@
# Create the same symlink at install time
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E ${link_method} $<TARGET_FILE_NAME:glslang-standalone> ${legacy_glslang_name} \
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+ WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
if(ENABLE_SPVREMAPPER)
install(TARGETS spirv-remap EXPORT glslang-targets)

View File

@ -1,31 +0,0 @@
#!/usr/bin/python3
#
# known_good.py.in
#
# Copyright (c) 2021 Danny Rawlins (https://crux.ster.zone)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
# USA.
#
import json
with open('@SRC@/known_good.json', 'r') as myfile:
data=myfile.read()
obj = json.loads(data)
print (str(obj['commits'][0]['name']) + ': ' + str(obj['commits'][0]['commit']))
print (str(obj['commits'][1]['name']) + ': ' + str(obj['commits'][1]['commit']))