[crux-commits] ports/opt (3.5): glslang: 7.13.3496 -> 8.13.3559

crux at crux.nu crux at crux.nu
Sun Jun 7 08:02:08 UTC 2020


commit 54802ea9382bc87de06fcce4c2556aed12d9fec2
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Sun Jun 7 17:59:41 2020 +1000

    glslang: 7.13.3496 -> 8.13.3559

diff --git a/glslang/.footprint b/glslang/.footprint
index db1888fce..5712402ca 100644
--- a/glslang/.footprint
+++ b/glslang/.footprint
@@ -15,6 +15,8 @@ drwxr-xr-x	root/root	usr/include/glslang/Include/
 -rw-r--r--	root/root	usr/include/glslang/Include/ShHandle.h
 -rw-r--r--	root/root	usr/include/glslang/Include/Types.h
 -rw-r--r--	root/root	usr/include/glslang/Include/arrays.h
+-rw-r--r--	root/root	usr/include/glslang/Include/glslang_c_interface.h
+-rw-r--r--	root/root	usr/include/glslang/Include/glslang_c_shader_types.h
 -rw-r--r--	root/root	usr/include/glslang/Include/intermediate.h
 -rw-r--r--	root/root	usr/include/glslang/Include/revision.h
 drwxr-xr-x	root/root	usr/include/glslang/MachineIndependent/
@@ -47,6 +49,7 @@ drwxr-xr-x	root/root	usr/include/glslang/SPIRV/
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/GLSL.std.450.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/GlslangToSpv.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/Logger.h
+-rw-r--r--	root/root	usr/include/glslang/SPIRV/NonSemanticDebugPrintf.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/SPVRemapper.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/SpvBuilder.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/SpvTools.h
diff --git a/glslang/.signature b/glslang/.signature
index 4b5f9b11d..6b5b87a7e 100644
--- a/glslang/.signature
+++ b/glslang/.signature
@@ -1,9 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Wl4yOBeuZLcrkeqGse0s+C9tXDgSP5B2SGK8yCbXxgnumxicHhthITipqYJQ//WEfXz4MPIisIXoKxnbaKl0QM=
-SHA256 (Pkgfile) = d874f9a7bf9103dace28c86de50040eebdab965b888222b1975224ba8ccf419c
-SHA256 (.footprint) = 1c4f2f5e13c17a3df141b874e8ded6a7ec4c3aed19413ccd65adb87d7e5dc250
-SHA256 (glslang-7.13.3496.tar.gz) = 170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922
-SHA256 (glslang-default-resource-limits_staticlib.patch) = 1aa1538d9ef5f57153530df8c0f37d471c119e14c6d4ed1efe1bfec80d6b1b83
-SHA256 (glslang-lib-install.patch) = 0eacb3ab34de86f324384b5723ebb8854c213604ad5ac7859368562fdb2fe9bc
-SHA256 (0001-pkg-config-compatibility.patch) = 735e14abb5a6fd6acf9315ed173c901f67785de7862f5d0d491ef2016d2b6f58
-SHA256 (glslang-7.12.3353_pre20191027-fix-relative-includes.patch) = 8af4205a290890d6b30718a947800cf72082c0008193acd77f50123fe9a2c89b
+RWSE3ohX2g5d/eeRG/zf5ZMeiUjAj4ofso9jz5/sA3aZG2cUp33oyGa2A3oWtbsnr8UIB6EyFJLhjWuA3pb8BkOR2GCl08sLqgE=
+SHA256 (Pkgfile) = b73809b0fc0b42ddaa426f73d06ac709923e11480ede8f6c1044b3078c87183f
+SHA256 (.footprint) = 0b6ab83e6d184389c19fd8f4387966507f71ef6e9b889fa616270809880e38eb
+SHA256 (glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3.tar.gz) = 649430895fcdf3791872efe6eb4b352bdd50bc05a309d5bea00adfb9688926dd
+SHA256 (glslang-default-resource-limits_staticlib.patch) = 364506f9e31433fcd76d0237cd6bf95db567b525f686ff4c4500918bae7d316d
+SHA256 (0001-pkg-config-compatibility.patch) = f5b4de977a8829018359807b069218d967d5cb69b0e59f48155f88b7685647cb
diff --git a/glslang/0001-pkg-config-compatibility.patch b/glslang/0001-pkg-config-compatibility.patch
index e9ab32d46..87433b63f 100644
--- a/glslang/0001-pkg-config-compatibility.patch
+++ b/glslang/0001-pkg-config-compatibility.patch
@@ -1,7 +1,7 @@
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma	2019-11-02 02:51:21.000000000 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt	2019-11-13 15:06:21.418739152 +1000
-@@ -69,6 +69,13 @@ endmacro(glslang_pch)
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma	2020-04-21 23:06:12.000000000 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt	2020-04-22 12:26:12.717875341 +1000
+@@ -87,6 +87,13 @@ endmacro(glslang_pch)
  
  project(glslang)
  
@@ -15,7 +15,7 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma gls
  if(ENABLE_CTEST)
      include(CTest)
  endif()
-@@ -163,11 +170,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
+@@ -178,11 +185,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
  	add_subdirectory(External)
  endif()
  
@@ -28,9 +28,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma gls
      message(STATUS "optimizer enabled")
      add_definitions(-DENABLE_OPT=1)
  else()
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt.dma	2019-11-02 02:51:21.000000000 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt	2019-11-13 15:06:21.418739152 +1000
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt.dma	2020-04-21 23:06:12.000000000 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt	2020-04-22 12:26:12.718875368 +1000
 @@ -35,10 +35,3 @@ if(BUILD_TESTING)
      endif()
  endif()
@@ -42,10 +42,10 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.tx
 -    endif()
 -endif()
 -
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt.dma	2019-11-13 15:06:05.678579864 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt	2019-11-13 15:07:16.046291974 +1000
-@@ -76,6 +76,7 @@ set(HEADERS
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt.dma	2020-04-21 23:06:12.000000000 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt	2020-04-22 12:26:38.647579382 +1000
+@@ -80,6 +80,7 @@ set(HEADERS
      MachineIndependent/preprocessor/PpContext.h
      MachineIndependent/preprocessor/PpTokens.h)
  
@@ -53,20 +53,18 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt
  glslang_pch(SOURCES MachineIndependent/pch.cpp)
  
  add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
-@@ -112,7 +113,9 @@ if(ENABLE_GLSLANG_INSTALL)
+@@ -116,6 +117,8 @@ if(ENABLE_GLSLANG_INSTALL)
          install(TARGETS glslang EXPORT glslangTargets
                  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
      endif()
--	install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
-+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+     install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+     install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
  endif(ENABLE_GLSLANG_INSTALL)
  
- if(ENABLE_GLSLANG_INSTALL)
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in.dma	2019-11-13 15:06:21.419739162 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in	2019-11-13 15:06:21.419739162 +1000
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in.dma	2020-04-22 12:26:12.718875368 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in	2020-04-22 12:26:12.718875368 +1000
 @@ -0,0 +1,11 @@
 +    prefix=@CMAKE_INSTALL_PREFIX@
 +    exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -80,10 +78,10 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cma
 +    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
 +    Cflags: -I${includedir}
 \ No newline at end of file
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.dma	2019-11-13 15:06:05.678579864 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt	2019-11-13 15:06:21.438739355 +1000
-@@ -40,6 +40,10 @@ target_include_directories(SPIRV PUBLIC
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.dma	2020-04-21 23:06:12.000000000 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt	2020-04-22 12:26:12.719875396 +1000
+@@ -41,6 +41,10 @@ target_include_directories(SPIRV PUBLIC
  	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
  	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
  
@@ -94,7 +92,7 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.d
  if (ENABLE_SPVREMAPPER)
      add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
      set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
-@@ -53,15 +57,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
+@@ -54,15 +58,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
      endif()
  endif()
  
@@ -120,18 +118,19 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.d
  else()
      target_link_libraries(SPIRV glslang)
  endif(ENABLE_OPT)
-@@ -94,5 +104,8 @@ if(ENABLE_GLSLANG_INSTALL)
- 	install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- 	install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+@@ -98,6 +108,9 @@ if(ENABLE_GLSLANG_INSTALL)
+ 
+     install(EXPORT SPIRVTargets 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 ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
      install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
  endif(ENABLE_GLSLANG_INSTALL)
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in.dma	2019-11-13 15:06:21.438739355 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in	2019-11-13 15:06:21.438739355 +1000
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in.dma	2020-04-22 12:26:12.719875396 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in	2020-04-22 12:26:12.719875396 +1000
 @@ -0,0 +1,11 @@
 +    prefix=@CMAKE_INSTALL_PREFIX@
 +    exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -145,9 +144,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.i
 +    Libs: -L${libdir} -lSPIRV
 +    Cflags: -I${includedir}
 \ No newline at end of file
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma	2019-11-02 02:51:21.000000000 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp	2019-11-13 15:06:21.438739355 +1000
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp.dma	2020-04-21 23:06:12.000000000 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp	2020-04-22 12:26:12.719875396 +1000
 @@ -43,8 +43,8 @@
  #include <iostream>
  
@@ -159,12 +158,12 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma
  
  namespace glslang {
  
-diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt
---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt.dma	2019-11-13 15:06:05.678579864 +1000
-+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt	2019-11-13 15:06:21.439739365 +1000
-@@ -24,6 +24,14 @@ set(LIBRARIES
-     SPVRemapper
-     glslang-default-resource-limits)
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma	2020-04-22 12:26:04.596654834 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt	2020-04-22 12:26:12.719875396 +1000
+@@ -24,6 +24,14 @@ if(ENABLE_SPVREMAPPER)
+     set(LIBRARIES ${LIBRARIES} SPVRemapper)
+ endif()
  
 +if(BUILD_SHARED_LIBS)
 +    set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES})
@@ -177,13 +176,13 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.
  if(WIN32)
      set(LIBRARIES ${LIBRARIES} psapi)
  elseif(UNIX)
-@@ -34,9 +42,6 @@ endif(WIN32)
+@@ -33,9 +41,6 @@ elseif(UNIX)
+ endif(WIN32)
  
  target_link_libraries(glslangValidator ${LIBRARIES})
- target_link_libraries(spirv-remap ${LIBRARIES})
--target_include_directories(glslangValidator PUBLIC 
--	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
--	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+-target_include_directories(glslangValidator PUBLIC
+-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
  
- if(WIN32)
-     source_group("Source" FILES ${SOURCES})
+ if(ENABLE_SPVREMAPPER)
+     set(REMAPPER_SOURCES spirv-remap.cpp)
diff --git a/glslang/Pkgfile b/glslang/Pkgfile
index 393867aa8..33523f04a 100644
--- a/glslang/Pkgfile
+++ b/glslang/Pkgfile
@@ -4,44 +4,40 @@
 # Depends on: spirv-tools
 
 name=glslang
-version=7.13.3496
-release=2
-source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz
+version=8.13.3559
+commit=c9b28b9f3388c607ea5506f5e6197b7150238ad3
+release=1
+source=(
+	#https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz
+	https://github.com/KhronosGroup/glslang/archive/$commit.tar.gz#/$name-$commit.tar.gz
 	glslang-default-resource-limits_staticlib.patch
-	glslang-lib-install.patch
-	0001-pkg-config-compatibility.patch
-	glslang-7.12.3353_pre20191027-fix-relative-includes.patch)
+	0001-pkg-config-compatibility.patch)
 
 build() {
-	cd $name-$version
-
-	patch -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch
-	patch -p1 -i $SRC/glslang-lib-install.patch
-	patch -p1 -i $SRC/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
+	patch -d $name-$commit -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch
 
 	# Patch to build against system spirv-tools
-	patch -p1 -i $SRC/0001-pkg-config-compatibility.patch
-
-	mkdir -p build-{shared,static}
+	patch -d $name-$commit -p1 -i $SRC/0001-pkg-config-compatibility.patch
 
 	local config="
+-S$name-$commit \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_SKIP_RPATH:BOOL=yes \
 -GNinja"
 
-	(cd build-shared
-	cmake .. $config -DBUILD_SHARED_LIBS=ON
-	ninja -j ${JOBS:-1}
-	)
-
-	(cd build-static
-	cmake .. $config -DBUILD_SHARED_LIBS=OFF
-	ninja -j ${JOBS:-1}
-	)
-
-	DESTDIR=$PKG ninja -C build-shared install
-	DESTDIR=$PKG ninja -C build-static install
+	cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF
+	cmake --build build-static
+	
+	cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON
+	cmake --build build-shared
+	
+	DESTDIR=$PKG cmake --build build-static --target install
+	DESTDIR=$PKG cmake --build build-shared --target install
+
+	# we don't want them in here
+	rm -rf $PKG/usr/include/SPIRV
 
 	cd $PKG/usr/lib
 		for lib in *.so; do
diff --git a/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
deleted file mode 100644
index 4c44cfbbb..000000000
--- a/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
-index 86e1c23b..3907be43 100755
---- a/SPIRV/GlslangToSpv.h
-+++ b/SPIRV/GlslangToSpv.h
-@@ -40,7 +40,7 @@
- #endif
- 
- #include "SpvTools.h"
--#include "../glslang/Include/intermediate.h"
-+#include "glslang/Include/intermediate.h"
- 
- #include <string>
- #include <vector>
-diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h
-index 7422d012..59c914da 100644
---- a/SPIRV/SpvTools.h
-+++ b/SPIRV/SpvTools.h
-@@ -46,7 +46,7 @@
- #include <ostream>
- #endif
- 
--#include "../glslang/MachineIndependent/localintermediate.h"
-+#include "glslang/MachineIndependent/localintermediate.h"
- #include "Logger.h"
- 
- namespace glslang {
diff --git a/glslang/glslang-default-resource-limits_staticlib.patch b/glslang/glslang-default-resource-limits_staticlib.patch
index a04c2aa87..c5a0013bf 100644
--- a/glslang/glslang-default-resource-limits_staticlib.patch
+++ b/glslang/glslang-default-resource-limits_staticlib.patch
@@ -1,9 +1,9 @@
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
+diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt
+--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma	2020-04-22 11:00:58.685198803 +1000
++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt	2020-04-22 11:01:12.559574492 +1000
 @@ -1,4 +1,4 @@
 -add_library(glslang-default-resource-limits
 +add_library(glslang-default-resource-limits STATIC
-             ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp)
+             ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp)
  set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
- set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
-
diff --git a/glslang/glslang-lib-install.patch b/glslang/glslang-lib-install.patch
deleted file mode 100644
index 8838a9780..000000000
--- a/glslang/glslang-lib-install.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index af4ab587..e0096743 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -11,5 +11,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
-+	install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index e25ec0a1..364f04cc 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
- 	
--	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
--	install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+	install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+	install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- 
-     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 0878965c..d9d71d1a 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS spirv-remap EXPORT spirv-remapTargets
-             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 	
--	install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
--	install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
-+	install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+	install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-             
-     if(BUILD_SHARED_LIBS)
-         install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--		install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
-+		install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-     endif()
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 42df1d1e..446cabb9 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
-         install(TARGETS glslang EXPORT glslangTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
--	install(EXPORT glslangTargets DESTINATION lib/cmake)
-+	install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
- 
- if(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 91fb45a7..9994314f 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -22,5 +22,5 @@ endif()
- if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS OSDependent EXPORT OSDependentTargets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
-index f6bd4e9d..c050ef61 100644
---- a/glslang/OSDependent/Windows/CMakeLists.txt
-+++ b/glslang/OSDependent/Windows/CMakeLists.txt
-@@ -17,5 +17,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS OSDependent EXPORT OSDependentTargets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
-index 77d217f1..aadf9a54 100644
---- a/gtests/CMakeLists.txt
-+++ b/gtests/CMakeLists.txt
-@@ -33,7 +33,7 @@ if(BUILD_TESTING)
-         if(ENABLE_GLSLANG_INSTALL)
-             install(TARGETS glslangtests EXPORT glslangtestsTargets
-                     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--			install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
-+			install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-         endif(ENABLE_GLSLANG_INSTALL)
- 
-         set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
-diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
-index 44f9d6a2..ae0d4d4e 100644
---- a/hlsl/CMakeLists.txt
-+++ b/hlsl/CMakeLists.txt
-@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
-         install(TARGETS HLSL EXPORT HLSLTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
--	install(EXPORT HLSLTargets DESTINATION lib/cmake)
-+	install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)


More information about the crux-commits mailing list