[crux-commits] ports/opt (3.7): glslang: added pc file

1 Nov 2022

commit 76efe7ebbbc1f7a2ccf32b899b9709eb70d64fd8
Author: Tim Biermann <tbier@posteo.de>
Date:   Tue Nov 1 14:09:19 2022 +0000

    glslang: added pc file

diff --git a/glslang/.footprint b/glslang/.footprint
index e307c4d04..94c2bd6da 100644
--- a/glslang/.footprint
+++ b/glslang/.footprint
@@ -102,3 +102,5 @@ drwxr-xr-x	root/root	usr/lib/cmake/glslang/
 lrwxrwxrwx	root/root	usr/lib/libglslang.so -> libglslang.so.11
 lrwxrwxrwx	root/root	usr/lib/libglslang.so.11 -> libglslang.so.11.12.0
 -rwxr-xr-x	root/root	usr/lib/libglslang.so.11.12.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/spirv.pc
diff --git a/glslang/.signature b/glslang/.signature
index 6eed7b589..165b50dc9 100644
--- a/glslang/.signature
+++ b/glslang/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bdW/OvXlAGuTbPosZ2wfJ1uFBUyVny7SFEb4OEBtZM4FYoHfr4RopcHcRfh713f0hN8T9ZSBmJDzMW9TykCQgM=
-SHA256 (Pkgfile) = 9325917dc328a7a64e0ca2b05eeb8daf55e5742677aa20a0522d5fd39b278dcb
-SHA256 (.footprint) = 1e946c71805269a7453796564de74caf1d8d10d9fa5e10e9fe2702b04089b482
+RWSE3ohX2g5d/SciVGHDPfpkghFQCJl6jbm9rfGX+R642eNLDwiI06Wit0i0SA8XJQ75kvHGNyQgbeU0e3ODmsTdMRTQS12zTAo=
+SHA256 (Pkgfile) = 02b8fcc38f8970f7aaf6132d1fd3f0cacba7b1db6fcf40086fa4cba577ee97af
+SHA256 (.footprint) = e092f9c5c59c4a33b5b2a35eac5c0c5ece0da9c41a245dc813a6a75583ea747b
 SHA256 (glslang-11.12.0.tar.gz) = 7795a97450fecd9779f3d821858fbc2d1a3bf1dd602617d95b685ccbcabc302f
+SHA256 (0001-pkg-config-compatibility.patch) = 23e3ffa56bf9f710a5a4ba496eb7413ca06c5e5d25b666b1b0269983a6bf8e03
diff --git a/glslang/0001-pkg-config-compatibility.patch b/glslang/0001-pkg-config-compatibility.patch
index 333d05ead..523c6d97b 100644
--- a/glslang/0001-pkg-config-compatibility.patch
+++ b/glslang/0001-pkg-config-compatibility.patch
@@ -1,7 +1,7 @@
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt	2021-11-23 17:40:46.511754273 +1000
-@@ -121,6 +121,13 @@ if(USE_CCACHE)
+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()
  
@@ -15,7 +15,7 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt.dma gls
  if(ENABLE_CTEST)
      include(CTest)
  endif()
-@@ -307,11 +314,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
+@@ -319,11 +326,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
      add_subdirectory(External)
  endif()
  
@@ -28,9 +28,9 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt.dma gls
      message(STATUS "optimizer enabled")
      add_definitions(-DENABLE_OPT=1)
  else()
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt	2021-11-23 17:40:46.512754300 +1000
+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()
@@ -42,21 +42,9 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.tx
 -    endif()
 -endif()
 -
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt	2021-11-23 17:40:46.513754326 +1000
-@@ -211,6 +211,8 @@ if(ENABLE_GLSLANG_INSTALL)
-                 EXPORT  glslangTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
-+    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)
- 
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in.dma	2021-11-23 17:40:46.513754326 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in	2021-11-23 17:40:46.513754326 +1000
+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@
@@ -70,9 +58,9 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cma
 +    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
 +    Cflags: -I${includedir}
 \ No newline at end of file
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt	2021-11-23 17:40:46.514754353 +1000
+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)
@@ -110,19 +98,20 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt.d
  else()
      target_link_libraries(SPIRV PRIVATE MachineIndependent)
  endif()
-@@ -133,6 +143,9 @@ if(ENABLE_GLSLANG_INSTALL)
-     endif()
- 
-     install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+@@ -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-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in.dma	2021-11-23 17:40:46.514754353 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in	2021-11-23 17:40:46.514754353 +1000
+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@
@@ -136,9 +125,9 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.i
 +    Libs: -L${libdir} -lSPIRV
 +    Cflags: -I${includedir}
 \ No newline at end of file
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp.dma	2021-11-13 00:42:16.000000000 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp	2021-11-23 17:40:46.515754380 +1000
+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>
  
@@ -148,9 +137,9 @@ diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp.dma
  
  namespace glslang {
  
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma	2021-11-23 17:40:36.884497081 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt	2021-11-23 17:40:46.515754380 +1000
+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()
diff --git a/glslang/Pkgfile b/glslang/Pkgfile
index 8d90883c2..1aa47f255 100644
--- a/glslang/Pkgfile
+++ b/glslang/Pkgfile
@@ -5,10 +5,12 @@
 
 name=glslang
 version=11.12.0
-release=1
-source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar....)
+release=2
+source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar....
+  0001-pkg-config-compatibility.patch)
 
 build() {
+	patch -Np1 -d $SRC/$name-$version -i $SRC/0001-pkg-config-compatibility.patch
 
 	local config="
 		-G Ninja
diff --git a/glslang/glslang-default-resource-limits_staticlib.patch b/glslang/glslang-default-resource-limits_staticlib.patch
deleted file mode 100644
index a60ad7617..000000000
--- a/glslang/glslang-default-resource-limits_staticlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt
---- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma	2021-11-23 17:38:10.022569320 +1000
-+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt	2021-11-23 17:38:19.087812070 +1000
-@@ -47,7 +47,7 @@ add_custom_command(
- 
- #add_custom_target(glslangValidator DEPENDS ${GLSLANG_INTRINSIC_H})
- 
--add_library(glslang-default-resource-limits
-+add_library(glslang-default-resource-limits STATIC
-             ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
-             ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp)
- set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)

    

[crux-commits] ports/opt (3.7): glslang: added pc file

crux＠crux.nu