ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

glslang: 12.2.0 -> 12.3.1

Browse Source
This commit is contained in:
Tim Biermann 2023-07-22 13:36:01 +02:00
parent aca844e3cf
commit f7388e73df
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 19 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glslang/.footprint
View File

@ -1,6 +1,6 @@
drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/glslangValidator -rwxr-xr-x root/root usr/bin/glslang
-rwxr-xr-x root/root usr/bin/spirv-remap -rwxr-xr-x root/root usr/bin/spirv-remap
drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/glslang/ drwxr-xr-x root/root usr/include/glslang/
@ -81,37 +81,32 @@ drwxr-xr-x root/root usr/lib/cmake/
-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets.cmake -rw-r--r-- root/root usr/lib/cmake/SPIRVTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets.cmake -rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets.cmake -rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang-standaloneTargets.cmake
drwxr-xr-x root/root usr/lib/cmake/glslang/ drwxr-xr-x root/root usr/lib/cmake/glslang/
-rw-r--r-- root/root usr/lib/cmake/glslang/glslang-config-version.cmake -rw-r--r-- root/root usr/lib/cmake/glslang/glslang-config-version.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang/glslang-config.cmake -rw-r--r-- root/root usr/lib/cmake/glslang/glslang-config.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang/glslang-targets-release.cmake -rw-r--r-- root/root usr/lib/cmake/glslang/glslang-targets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang/glslang-targets.cmake -rw-r--r-- root/root usr/lib/cmake/glslang/glslang-targets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslangTargets.cmake -rw-r--r-- root/root usr/lib/cmake/glslangTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets.cmake -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/libGenericCodeGen.a
-rw-r--r-- root/root usr/lib/libHLSL.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 -> libHLSL.so.12
lrwxrwxrwx root/root usr/lib/libHLSL.so.12 -> libHLSL.so.12.2.0 lrwxrwxrwx root/root usr/lib/libHLSL.so.12 -> libHLSL.so.12.3.1
-rwxr-xr-x root/root usr/lib/libHLSL.so.12.2.0 -rwxr-xr-x root/root usr/lib/libHLSL.so.12.3.1
-rw-r--r-- root/root usr/lib/libMachineIndependent.a -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/libOGLCompiler.a
-rw-r--r-- root/root usr/lib/libOSDependent.a -rw-r--r-- root/root usr/lib/libOSDependent.a
-rw-r--r-- root/root usr/lib/libSPIRV.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 -> libSPIRV.so.12
lrwxrwxrwx root/root usr/lib/libSPIRV.so.12 -> libSPIRV.so.12.2.0 lrwxrwxrwx root/root usr/lib/libSPIRV.so.12 -> libSPIRV.so.12.3.1
-rwxr-xr-x root/root usr/lib/libSPIRV.so.12.2.0 -rwxr-xr-x root/root usr/lib/libSPIRV.so.12.3.1
-rw-r--r-- root/root usr/lib/libSPVRemapper.a -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 -> libSPVRemapper.so.12
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.12 -> libSPVRemapper.so.12.2.0 lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.12 -> libSPVRemapper.so.12.3.1
-rwxr-xr-x root/root usr/lib/libSPVRemapper.so.12.2.0 -rwxr-xr-x root/root usr/lib/libSPVRemapper.so.12.3.1
-rw-r--r-- root/root usr/lib/libglslang-default-resource-limits.a -rw-r--r-- root/root usr/lib/libglslang-default-resource-limits.a
lrwxrwxrwx root/root usr/lib/libglslang-default-resource-limits.so -> libglslang-default-resource-limits.so.12
lrwxrwxrwx root/root usr/lib/libglslang-default-resource-limits.so.12 -> libglslang-default-resource-limits.so.12.2.0
-rwxr-xr-x root/root usr/lib/libglslang-default-resource-limits.so.12.2.0
-rw-r--r-- root/root usr/lib/libglslang.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 -> libglslang.so.12
lrwxrwxrwx root/root usr/lib/libglslang.so.12 -> libglslang.so.12.2.0 lrwxrwxrwx root/root usr/lib/libglslang.so.12 -> libglslang.so.12.3.1
-rwxr-xr-x root/root usr/lib/libglslang.so.12.2.0 -rwxr-xr-x root/root usr/lib/libglslang.so.12.3.1
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/spirv.pc

9
glslang/.signature
View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bww9CE65EdY+5jNfHOIET2t6Ty0ETYz9btVT1vdBW3X22ck1q9GiLPEcWMzl3XXUPvQvS25UnVh9p/3cKfdOQM= RWSE3ohX2g5d/fsOfGLVpE462UpeK6lANayWoCvE84Tj6xlB0FtdZ0p2xlpiGbbX+ZCmUnWrDaE8B39/ybug4qLfDxkXgZ6gTAI=
SHA256 (Pkgfile) = 299a713be8660674d09eb9c45d0591c0a696e2c8810545d1bf16206e351d263f SHA256 (Pkgfile) = 1753208634e6b9e1d944eda30513f543d1f866b8136a4d2f25604efd1cb843c3
SHA256 (.footprint) = bfce2821870cbe83358132af4000abfe139547b3fd8010eee87a911bd62c6e8f SHA256 (.footprint) = 479f42995d6843c81e8c95c2257cf873e25b80bc2844f9970c02444cc58225a4
SHA256 (glslang-sdk-12.2.0.tar.gz) = 870d17030fda7308c1521fb2e01a9e93cbe4b130bc8274e90d00e127432ab6f6 SHA256 (glslang-sdk-12.3.1.tar.gz) = a57836a583b3044087ac51bb0d5d2d803ff84591d55f89087fc29ace42a8b9a8
SHA256 (0001-pkg-config-compatibility.patch) = 23e3ffa56bf9f710a5a4ba496eb7413ca06c5e5d25b666b1b0269983a6bf8e03

167
glslang/0001-pkg-config-compatibility.patch
View File

@ -1,167 +0,0 @@
diff -up glslang-sdk-1.3.224.0/CMakeLists.txt.dma glslang-sdk-1.3.224.0/CMakeLists.txt
--- glslang-sdk-1.3.224.0/CMakeLists.txt.dma 2022-08-13 01:32:10.000000000 +1000
+++ glslang-sdk-1.3.224.0/CMakeLists.txt 2022-08-24 11:02:14.557865460 +1000
@@ -129,6 +129,13 @@ if(USE_CCACHE)
endif()
endif()
+# using pkg-config to configure include paths and link libraries
+include(FindPkgConfig)
+pkg_check_modules(SPIRV_TOOLS REQUIRED SPIRV-Tools>=2019.2.1)
+if(BUILD_SHARED_LIBS)
+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
+endif(BUILD_SHARED_LIBS)
+
if(ENABLE_CTEST)
include(CTest)
endif()
@@ -319,11 +326,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
add_subdirectory(External)
endif()
-if(NOT TARGET SPIRV-Tools-opt)
- set(ENABLE_OPT OFF)
-endif()
-
-if(ENABLE_OPT)
+if(${SPIRV_TOOLS_FOUND} EQUAL 1)
message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1)
else()
diff -up glslang-sdk-1.3.224.0/External/CMakeLists.txt.dma glslang-sdk-1.3.224.0/External/CMakeLists.txt
--- glslang-sdk-1.3.224.0/External/CMakeLists.txt.dma 2022-08-13 01:32:10.000000000 +1000
+++ glslang-sdk-1.3.224.0/External/CMakeLists.txt 2022-08-24 11:02:14.564865557 +1000
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
endif()
endif()
-if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools)
- endif()
-endif()
-
diff -up glslang-sdk-1.3.224.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.224.0/glslang/glslang.pc.cmake.in
--- glslang-sdk-1.3.224.0/glslang/glslang.pc.cmake.in.dma 2022-08-24 11:02:14.567865599 +1000
+++ glslang-sdk-1.3.224.0/glslang/glslang.pc.cmake.in 2022-08-24 11:02:14.567865599 +1000
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+ Name: @PROJECT_NAME@
+ Description: OpenGL and OpenGL ES shader front end and validator
+ Requires:
+ Version: @VERSION@
+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
+ Cflags: -I${includedir}
\ No newline at end of file
diff -up glslang-sdk-1.3.224.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.224.0/SPIRV/CMakeLists.txt
--- glslang-sdk-1.3.224.0/SPIRV/CMakeLists.txt.dma 2022-08-13 01:32:10.000000000 +1000
+++ glslang-sdk-1.3.224.0/SPIRV/CMakeLists.txt 2022-08-24 11:02:39.022204124 +1000
@@ -77,6 +77,10 @@ target_include_directories(SPIRV PUBLIC
glslang_add_build_info_dependency(SPIRV)
+
+set(SPIRV_NAME spirv)
+set(SPIRV_VERSION 1.3)
+
if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
@@ -90,15 +94,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif()
endif()
+target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
+target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_CFLAGS_OTHER})
+target_link_libraries(SPIRV ${SPIRV_TOOLS_LIBRARIES})
+if(BUILD_SHARED_LIBS)
+ target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
+ target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER})
+ target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES})
+endif(BUILD_SHARED_LIBS)
+
if(ENABLE_OPT)
target_include_directories(SPIRV
PRIVATE ${spirv-tools_SOURCE_DIR}/include
PRIVATE ${spirv-tools_SOURCE_DIR}/source
)
- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
- target_include_directories(SPIRV PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+ target_link_libraries(SPIRV glslang)
else()
target_link_libraries(SPIRV PRIVATE MachineIndependent)
endif()
@@ -139,6 +149,9 @@ if(ENABLE_GLSLANG_INSTALL)
add_library(SPIRV ALIAS glslang::SPIRV)
")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
+ # spirv.pc Configuration
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif()
diff -up glslang-sdk-1.3.224.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.224.0/SPIRV/spirv.pc.cmake.in
--- glslang-sdk-1.3.224.0/SPIRV/spirv.pc.cmake.in.dma 2022-08-24 11:02:14.569865626 +1000
+++ glslang-sdk-1.3.224.0/SPIRV/spirv.pc.cmake.in 2022-08-24 11:02:14.569865626 +1000
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+ Name: @SPIRV_NAME@
+ Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan
+ Requires:
+ Version: @SPIRV_VERSION@
+ Libs: -L${libdir} -lSPIRV
+ Cflags: -I${includedir}
\ No newline at end of file
diff -up glslang-sdk-1.3.224.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.224.0/SPIRV/SpvTools.cpp
--- glslang-sdk-1.3.224.0/SPIRV/SpvTools.cpp.dma 2022-08-13 01:32:10.000000000 +1000
+++ glslang-sdk-1.3.224.0/SPIRV/SpvTools.cpp 2022-08-24 11:02:14.570865640 +1000
@@ -43,7 +43,7 @@
#include <iostream>
#include "SpvTools.h"
-#include "spirv-tools/optimizer.hpp"
+#include <spirv-tools/optimizer.hpp>
namespace glslang {
diff -up glslang-sdk-1.3.224.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.224.0/StandAlone/CMakeLists.txt
--- glslang-sdk-1.3.224.0/StandAlone/CMakeLists.txt.dma 2022-08-24 11:01:28.064221842 +1000
+++ glslang-sdk-1.3.224.0/StandAlone/CMakeLists.txt 2022-08-24 11:02:14.571865654 +1000
@@ -72,6 +72,14 @@ if(ENABLE_SPVREMAPPER)
set(LIBRARIES ${LIBRARIES} SPVRemapper)
endif()
+if(BUILD_SHARED_LIBS)
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES})
+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
+else()
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES})
+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
+endif(BUILD_SHARED_LIBS)
+
if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi)
elseif(UNIX)
@@ -81,9 +89,6 @@ elseif(UNIX)
endif()
target_link_libraries(glslangValidator ${LIBRARIES})
-target_include_directories(glslangValidator PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
if(ENABLE_OPT)
target_include_directories(glslangValidator

11
glslang/Pkgfile
View File

@ -1,17 +1,14 @@
# Description: OpenGL and OpenGL ES shader front end and validator # Description: OpenGL and OpenGL ES shader front end and validator
# URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler # URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler
# Maintainer: Danny Rawlins, crux at romster dot me # Maintainer: CRUX System Team, core-ports at crux dot nu
# Depends on: spirv-tools # Depends on: spirv-tools
name=glslang name=glslang
version=12.2.0 version=12.3.1
release=1 release=1
source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-sdk-$version.tar.gz source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-sdk-$version.tar.gz)
0001-pkg-config-compatibility.patch)
build() { build() {
patch -Np1 -d $SRC/$name-$version -i $SRC/0001-pkg-config-compatibility.patch
local config=" local config="
-G Ninja -G Ninja
-S $name-$version -S $name-$version
@ -20,6 +17,8 @@ build() {
-D CMAKE_BUILD_TYPE=Release -D CMAKE_BUILD_TYPE=Release
-D CMAKE_SKIP_RPATH=yes -D CMAKE_SKIP_RPATH=yes
-D ENABLE_PCH=OFF -D ENABLE_PCH=OFF
-D BUILD_EXTERNAL=OFF
-D ENABLE_PCH=OFF
-Wno-dev" -Wno-dev"
cmake -B build-static $config $PKGMK_GLSLANG \ cmake -B build-static $config $PKGMK_GLSLANG \