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

Merge branch '3.5' into 3.6

Browse Source 
Conflicts:
	jdk8-bin/.signature
	jdk8-bin/Pkgfile
	nfs-utils/.signature
	python3-pip/.footprint
	python3-pip/.signature
	python3-setuptools/.footprint
	python3-setuptools/.signature
	python3-setuptools/Pkgfile
This commit is contained in:
Juergen Daubert 2020-10-24 10:13:16 +00:00
commit c68e000a61
66 changed files with 1167 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alsa-lib/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Q4E/XnLSswLVqywF8YSlqZD/zg1ZmliYUgt4bmiw2/l+58VZX1FGK5s+airD+5iCN2QpAX6dsEec9AfG1cnmwM=
SHA256 (Pkgfile) = c897ec214c0b3673bca8f6b5aecab706bc1bd32409863f15393872a0e69249de
RWSE3ohX2g5d/QTegiIqzYQE6LjdJqPyo7JDdtBvQxKTr7tUgvjdj0CpJkrncPSFtpkBVEFKtDFIhe3qViImN/EhdksE1PVGdQY=
SHA256 (Pkgfile) = 3314089bc9f70461ff26094b24d27670eba4a3d724435677fcc3c980470475a3
SHA256 (.footprint) = 5d2b5316414c769bb0ebc19ccb675f0309a51e859acd1cd13ae091f270106ab4
SHA256 (alsa-lib-1.2.3.2.tar.bz2) = e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15
SHA256 (alsa-lib-1.2.4.tar.bz2) = f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7

2
alsa-lib/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Matt Housh, jaeger at crux dot ninja
name=alsa-lib
version=1.2.3.2
version=1.2.4
release=1
source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2)

6
alsa-utils/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/QTxpDnSRfZm0Z96fS3Pb6tp6wK0BVRejfq5Ji84mI4KDUt6FH5u7e9cA00tn8tLLHnsjjUDQFW4omAyDITkBAI=
SHA256 (Pkgfile) = aaa68fd0738a517c8675224aafb959892b8b215753c5bcfa3c3ef1e64254b7e7
RWSE3ohX2g5d/dJGxp8LGiMGKMM4uOghIlB4LzLRrX88XNHhNOqEtgOH/Lh1WWHxH9tp5mdDU/kI2SkRxgU3O/a4zLmSXBI3LAk=
SHA256 (Pkgfile) = 5822bc4697b0dc66a9a530a19817d990fa7c11c5d2af3f06ea21135d96dd71d2
SHA256 (.footprint) = fd269a5985d003c4e5d766fc696338ad79cc27649d2e0dfec7420b3f47e10ce9
SHA256 (alsa-utils-1.2.3.tar.bz2) = ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa
SHA256 (alsa-utils-1.2.4.tar.bz2) = 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426
SHA256 (rc.alsa) = dcb1a5d6a1b890fb35e724d417dbcff188ae89ea9a6cd791a6fb06ef1b17baae

2
alsa-utils/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: gettext, alsa-lib, dialog
name=alsa-utils
version=1.2.3
version=1.2.4
release=1
source=(ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2 \
rc.alsa)

57
glslang/.footprint
View File

@ -4,6 +4,15 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/spirv-remap
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/glslang/
drwxr-xr-x root/root usr/include/glslang/HLSL/
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslAttributes.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslGrammar.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslOpMap.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslParseHelper.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslParseables.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslScanContext.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslTokenStream.h
-rw-r--r-- root/root usr/include/glslang/HLSL/hlslTokens.h
drwxr-xr-x root/root usr/include/glslang/Include/
-rw-r--r-- root/root usr/include/glslang/Include/BaseTypes.h
-rw-r--r-- root/root usr/include/glslang/Include/Common.h
@ -18,7 +27,6 @@ drwxr-xr-x root/root usr/include/glslang/Include/
-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/
-rw-r--r-- root/root usr/include/glslang/MachineIndependent/Initialize.h
-rw-r--r-- root/root usr/include/glslang/MachineIndependent/LiveTraverser.h
@ -59,41 +67,30 @@ drwxr-xr-x root/root usr/include/glslang/SPIRV/
-rw-r--r-- root/root usr/include/glslang/SPIRV/hex_float.h
-rw-r--r-- root/root usr/include/glslang/SPIRV/spirv.hpp
-rw-r--r-- root/root usr/include/glslang/SPIRV/spvIR.h
-rw-r--r-- root/root usr/include/glslang/build_info.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/cmake/
-rw-r--r-- root/root usr/lib/cmake/HLSLTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/HLSLTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/OGLCompilerTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/OGLCompilerTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/OSDependentTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/OSDependentTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslangTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/glslangTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets.cmake
drwxr-xr-x root/root usr/lib/cmake/glslang/
-rw-r--r-- root/root usr/lib/cmake/glslang/glslangConfig-release.cmake
-rw-r--r-- root/root usr/lib/cmake/glslang/glslangConfig.cmake
-rw-r--r-- root/root usr/lib/libGenericCodeGen.a
-rw-r--r-- root/root usr/lib/libHLSL.a
-rwxr-xr-x root/root usr/lib/libHLSL.so
lrwxrwxrwx root/root usr/lib/libHLSL.so.0 -> libHLSL.so
lrwxrwxrwx root/root usr/lib/libHLSL.so -> libHLSL.so.11
lrwxrwxrwx root/root usr/lib/libHLSL.so.11 -> libHLSL.so.11.0.0
-rwxr-xr-x root/root usr/lib/libHLSL.so.11.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
-rwxr-xr-x root/root usr/lib/libSPIRV.so
lrwxrwxrwx root/root usr/lib/libSPIRV.so.0 -> libSPIRV.so
lrwxrwxrwx root/root usr/lib/libSPIRV.so -> libSPIRV.so.11
lrwxrwxrwx root/root usr/lib/libSPIRV.so.11 -> libSPIRV.so.11.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV.so.11.0.0
-rw-r--r-- root/root usr/lib/libSPVRemapper.a
-rwxr-xr-x root/root usr/lib/libSPVRemapper.so
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.0 -> libSPVRemapper.so
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so -> libSPVRemapper.so.11
lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.11 -> libSPVRemapper.so.11.0.0
-rwxr-xr-x root/root usr/lib/libSPVRemapper.so.11.0.0
-rw-r--r-- root/root usr/lib/libglslang-default-resource-limits.a
-rw-r--r-- root/root usr/lib/libglslang.a
-rwxr-xr-x root/root usr/lib/libglslang.so
lrwxrwxrwx root/root usr/lib/libglslang.so.0 -> libglslang.so
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/glslang.pc
-rw-r--r-- root/root usr/lib/pkgconfig/spirv.pc
lrwxrwxrwx root/root usr/lib/libglslang.so -> libglslang.so.11
lrwxrwxrwx root/root usr/lib/libglslang.so.11 -> libglslang.so.11.0.0
-rwxr-xr-x root/root usr/lib/libglslang.so.11.0.0

15
glslang/.signature
View File

@ -1,7 +1,10 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/eIhKE97Pw6vvqeGJ59u3sagpngP+6r8QkdEoCqVsKo9XSjiHh8FUOF4TJH0V0MloXt4hFtdKANFVectlAhNRw0=
SHA256 (Pkgfile) = 826b703365344191749effa0ea93d75ac30984326abf7031a45eea8425738c86
SHA256 (.footprint) = 0b6ab83e6d184389c19fd8f4387966507f71ef6e9b889fa616270809880e38eb
SHA256 (glslang-8.13.3743.tar.gz) = 639ebec56f1a7402f2fa094469a5ddea1eceecfaf2e9efe361376a0f73a7ee2f
SHA256 (glslang-default-resource-limits_staticlib.patch) = 364506f9e31433fcd76d0237cd6bf95db567b525f686ff4c4500918bae7d316d
SHA256 (0001-pkg-config-compatibility.patch) = f5b4de977a8829018359807b069218d967d5cb69b0e59f48155f88b7685647cb
RWSE3ohX2g5d/XbeOlEBaG+uBoBWpXeNrKnpgH7oTWe8VGN7ikDxC4UaaAx0SfDd5Aa9GmT/Ty/2dPtQn1ek9njf7u1uj10LnAc=
SHA256 (Pkgfile) = ab033d3e4b102c4abe03a2726384861e5fc4fcd8201b431662e67ffcecafe9a5
SHA256 (.footprint) = 8880cae79882460ff5b41bc7581a5b503f425c06f07f153c132c02481ff82939
SHA256 (bacaef3237c515e40d1a24722be48c0a0b30f75f.zip) = c3161b15c83f47310afdfc1167f3dd9a67ba48b910e19b19405f0ba67eb1c1fa
SHA256 (0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch) = 0eec9964c9ccf87f7179011d1a48df8d4c2dc8067c14cb8c660ad2bd3f2218e9
SHA256 (0001-CMake-Make-glslang-default-resource-limits-STATIC.patch) = f99036f2d07bf45ed80ab3e221a3834ca514ba2dd50ec710ba1604a46b8165bb
SHA256 (0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch) = 73560f03d7da2861cc870be14b0eb99e7280c2455e5ee81e5eee9ebd04f95b29
SHA256 (0001-glslang-Rename-and-move-cmake-export.patch) = aee56a7d0b4567f8259c461ea32510a98b394698febf034d32aa520ac9d37781
SHA256 (0002-cmake-Use-the-same-export-config-for-all-installed-t.patch) = 8390e2537e9006fb5f1f948baa680955cf690b561432eec55ded8aef0bc13ee7

64
glslang/0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch Normal file
View File

@ -0,0 +1,64 @@
From 1504af077935a0bfd1b1b59f77d8b1cd89f913b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 10 Dec 2018 13:05:15 +0100
Subject: [PATCH] CMake: Allow linking against system-installed SPIRV-Tools
Fixes #1585.
---
CMakeLists.txt | 7 ++++++-
SPIRV/CMakeLists.txt | 21 +++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ada2b8fb..22243f49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,7 +320,12 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
add_subdirectory(External)
endif()
-if(NOT TARGET SPIRV-Tools-opt)
+find_package(PkgConfig)
+if(PkgConfig_FOUND)
+ pkg_check_modules(SPIRV-Tools SPIRV-Tools)
+endif()
+# Former would be system-installed, later is from External
+if(NOT SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools-opt)
set(ENABLE_OPT OFF)
endif()
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index d699dadd..28beb47b 100644
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -91,14 +91,19 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif()
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>)
+ if(SPIRV-Tools_FOUND)
+ target_include_directories(SPIRV PUBLIC ${SPIRV-Tools_INCLUDEDIR})
+ target_link_libraries(SPIRV glslang ${SPIRV-Tools_LIBRARIES})
+ else()
+ 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>)
+ endif()
else()
target_link_libraries(SPIRV PRIVATE MachineIndependent)
endif(ENABLE_OPT)
--
2.28.0

25
glslang/0001-CMake-Make-glslang-default-resource-limits-STATIC.patch Normal file
View File

@ -0,0 +1,25 @@
From d6e59ca08971c261f8297027d9c274f884c9d1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 12 Oct 2020 11:20:05 +0200
Subject: [PATCH 1/2] CMake: Make glslang-default-resource-limits STATIC
---
StandAlone/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index 8038c043..a2009165 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -31,7 +31,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-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)
--
2.28.0

52
glslang/0001-glslang-Rename-and-move-cmake-export.patch Normal file
View File

@ -0,0 +1,52 @@
From 63927cbb24c80b0cad5829338a6f76da6a873beb Mon Sep 17 00:00:00 2001
From: Sandy Carter <bwrsandman@gmail.com>
Date: Sat, 16 Nov 2019 09:43:29 +0100
Subject: [PATCH 1/2] glslang: Rename and move cmake export
CMake when searching for a package in config mode will by default look for
a file called <name>Config.cmake or <lower-case-name>-config.cmake.
The previous naming would force the user to specify the name to
glslangTargets. The name is therefore changed to glslangConfig.cmake.
On Unix, cmake will look for the config files in the following directories:
<prefix>/(lib/<arch>|lib|share)/cmake/<name>*/ (U)
<prefix>/(lib/<arch>|lib|share)/<name>*/ (U)
<prefix>/(lib/<arch>|lib|share)/<name>*/(cmake|CMake)/ (U)
Previously the destination directory was <prefix>/lib/cmake which would not
be found.
The destination directory now includes the package name.
A namespace is added to be able to specify components.
---
glslang/CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 1c7d22a2..7408d81c 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -200,17 +200,18 @@ endif(WIN32)
if(ENABLE_GLSLANG_INSTALL)
if(BUILD_SHARED_LIBS)
install(TARGETS glslang
- EXPORT glslangTargets
+ EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
install(TARGETS glslang MachineIndependent GenericCodeGen
- EXPORT glslangTargets
+ EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ install(EXPORT glslangConfig NAMESPACE glslang::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glslang)
set(ALL_HEADERS
${GLSLANG_HEADERS}
--
2.28.0

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

@ -1,188 +0,0 @@
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)
+# 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()
@@ -178,11 +185,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-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()
-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-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)
+set(VERSION 7.11.3113)
glslang_pch(SOURCES MachineIndependent/pch.cpp)
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
@@ -116,6 +117,8 @@ if(ENABLE_GLSLANG_INSTALL)
install(TARGETS glslang 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)
endif(ENABLE_GLSLANG_INSTALL)
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@
+ 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-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}>)
+
+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)
@@ -54,15 +58,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 glslang 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 glslang)
endif(ENABLE_OPT)
@@ -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 ${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-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@
+ 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-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>
#include "SpvTools.h"
-#include "spirv-tools/optimizer.hpp"
-#include "spirv-tools/libspirv.h"
+#include <spirv-tools/optimizer.hpp>
+#include <spirv-tools/libspirv.h>
namespace glslang {
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})
+ 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)
@@ -33,9 +41,6 @@ elseif(UNIX)
endif(WIN32)
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_SPVREMAPPER)
set(REMAPPER_SOURCES spirv-remap.cpp)

82
glslang/0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch Normal file
View File

@ -0,0 +1,82 @@
From 5868365b3a8636a468c4d12b20a221f5b7602de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 12 Oct 2020 11:21:05 +0200
Subject: [PATCH 2/2] CMake: Use VERSION/SOVERSION for all shared libs
---
SPIRV/CMakeLists.txt | 14 ++++++++++----
StandAlone/CMakeLists.txt | 7 +++++--
hlsl/CMakeLists.txt | 7 +++++--
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index d699dadd..55d77c45 100644
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -69,8 +69,11 @@ set(SPVREMAP_HEADERS
doc.h)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
-set_property(TARGET SPIRV PROPERTY FOLDER glslang)
-set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_target_properties(SPIRV PROPERTIES
+ FOLDER glslang
+ POSITION_INDEPENDENT_CODE ON
+ VERSION "${GLSLANG_VERSION}"
+ SOVERSION "${GLSLANG_VERSION_MAJOR}")
target_include_directories(SPIRV PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@@ -79,8 +82,11 @@ glslang_add_build_info_dependency(SPIRV)
if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
- set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
- set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
+ set_target_properties(SPVRemapper PROPERTIES
+ FOLDER glslang
+ POSITION_INDEPENDENT_CODE ON
+ VERSION "${GLSLANG_VERSION}"
+ SOVERSION "${GLSLANG_VERSION_MAJOR}")
endif()
if(WIN32 AND BUILD_SHARED_LIBS)
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index a2009165..6ff5e65b 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -34,8 +34,11 @@
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)
-set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_target_properties(glslang-default-resource-limits PROPERTIES
+ FOLDER glslang
+ POSITION_INDEPENDENT_CODE ON
+ VERSION "${GLSLANG_VERSION}"
+ SOVERSION "${GLSLANG_VERSION_MAJOR}")
target_include_directories(glslang-default-resource-limits
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
index 62faa195..a5472e7e 100644
--- a/hlsl/CMakeLists.txt
+++ b/hlsl/CMakeLists.txt
@@ -38,8 +38,11 @@
# projects that referenced this target.
add_library(HLSL ${LIB_TYPE} "stub.cpp")
-set_property(TARGET HLSL PROPERTY FOLDER hlsl)
-set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_target_properties(HLSL PROPERTIES
+ FOLDER hlsl
+ POSITION_INDEPENDENT_CODE ON
+ VERSION "${GLSLANG_VERSION}"
+ SOVERSION "${GLSLANG_VERSION_MAJOR}")
if(WIN32 AND BUILD_SHARED_LIBS)
set_target_properties(HLSL PROPERTIES PREFIX "")
--
2.28.0

159
glslang/0002-cmake-Use-the-same-export-config-for-all-installed-t.patch Normal file
View File

@ -0,0 +1,159 @@
From 721a4218fa84604f07f3880971dcd1a473d01331 Mon Sep 17 00:00:00 2001
From: Sandy Carter <bwrsandman@gmail.com>
Date: Sat, 16 Nov 2019 09:49:56 +0100
Subject: [PATCH 2/2] cmake: Use the same export config for all installed
targets
Fix issue with finding configuration exports by using the same
configuration as glslang.
The namespace allows for different targets to be used:
```
target_link_libraries(example PRIVATE glslang::OGLCompiler)
add_custom_target(validator-version COMMAND glslang::glslangValidator -v)
```
---
OGLCompilersDLL/CMakeLists.txt | 3 +--
SPIRV/CMakeLists.txt | 14 ++++----------
StandAlone/CMakeLists.txt | 9 +++------
glslang/OSDependent/Unix/CMakeLists.txt | 7 +++----
glslang/OSDependent/Windows/CMakeLists.txt | 3 +--
hlsl/CMakeLists.txt | 5 ++---
6 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
index 0b007d45..dcd014e8 100644
--- a/OGLCompilersDLL/CMakeLists.txt
+++ b/OGLCompilersDLL/CMakeLists.txt
@@ -42,7 +42,6 @@ if(WIN32)
endif(WIN32)
if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
+ install(TARGETS OGLCompiler EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif(ENABLE_GLSLANG_INSTALL)
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index d699dadd..014348bb 100644
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -111,28 +111,22 @@ endif(WIN32)
if(ENABLE_GLSLANG_INSTALL)
if(BUILD_SHARED_LIBS)
if (ENABLE_SPVREMAPPER)
- install(TARGETS SPVRemapper EXPORT SPVRemapperTargets
+ install(TARGETS SPVRemapper EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- install(TARGETS SPIRV EXPORT SPIRVTargets
+ install(TARGETS SPIRV EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
if (ENABLE_SPVREMAPPER)
- install(TARGETS SPVRemapper EXPORT SPVRemapperTargets
+ install(TARGETS SPVRemapper EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- install(TARGETS SPIRV EXPORT SPIRVTargets
+ install(TARGETS SPIRV EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- if (ENABLE_SPVREMAPPER)
- install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif()
-
- 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 8038c043..480cdec9 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -83,19 +83,16 @@ if(WIN32)
endif(WIN32)
if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslangValidator EXPORT glslangValidatorTargets
+ install(TARGETS glslangValidator EXPORT glslangConfig
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
if(ENABLE_SPVREMAPPER)
- install(TARGETS spirv-remap EXPORT spirv-remapTargets
+ install(TARGETS spirv-remap EXPORT glslangConfig
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif()
if(BUILD_SHARED_LIBS)
- install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
+ install(TARGETS glslang-default-resource-limits EXPORT glslangConfig
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif()
endif(ENABLE_GLSLANG_INSTALL)
diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
index 354a3e97..a7c2ea3c 100644
--- a/glslang/OSDependent/Unix/CMakeLists.txt
+++ b/glslang/OSDependent/Unix/CMakeLists.txt
@@ -44,16 +44,15 @@ if(${CMAKE_VERSION} VERSION_LESS "3.1.0" OR CMAKE_CROSSCOMPILING)
# Also needed when cross-compiling to work around
# https://gitlab.kitware.com/cmake/cmake/issues/16920
find_package(Threads)
- target_link_libraries(OSDependent ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(OSDependent PRIVATE ${CMAKE_THREAD_LIBS_INIT})
else()
# This is the recommended way, so we use it for 3.1+.
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
- target_link_libraries(OSDependent Threads::Threads)
+ target_link_libraries(OSDependent PRIVATE Threads::Threads)
endif()
if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
+ install(TARGETS OSDependent EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 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 9cf1b7fb..4271596d 100644
--- a/glslang/OSDependent/Windows/CMakeLists.txt
+++ b/glslang/OSDependent/Windows/CMakeLists.txt
@@ -48,7 +48,6 @@ if(WIN32)
endif(WIN32)
if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
+ install(TARGETS OSDependent EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif(ENABLE_GLSLANG_INSTALL)
diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
index 62faa195..65b75e80 100644
--- a/hlsl/CMakeLists.txt
+++ b/hlsl/CMakeLists.txt
@@ -47,13 +47,12 @@ endif()
if(ENABLE_GLSLANG_INSTALL)
if(BUILD_SHARED_LIBS)
- install(TARGETS HLSL EXPORT HLSLTargets
+ install(TARGETS HLSL EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
- install(TARGETS HLSL EXPORT HLSLTargets
+ install(TARGETS HLSL EXPORT glslangConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif(ENABLE_GLSLANG_INSTALL)
--
2.28.0

38
glslang/Pkgfile
View File

@ -4,17 +4,30 @@
# Depends on: spirv-tools
name=glslang
version=8.13.3743
version=11.0.0-bacaef3
release=1
source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz
glslang-default-resource-limits_staticlib.patch
0001-pkg-config-compatibility.patch)
source=(
#https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz
https://github.com/KhronosGroup/glslang/archive/bacaef3237c515e40d1a24722be48c0a0b30f75f.zip
0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch
0001-CMake-Make-glslang-default-resource-limits-STATIC.patch
0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch
0001-glslang-Rename-and-move-cmake-export.patch
0002-cmake-Use-the-same-export-config-for-all-installed-t.patch)
build() {
patch -d $name-$version -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch
mv $name-bacaef3237c515e40d1a24722be48c0a0b30f75f $name-$version
# Patch to build against system spirv-tools
patch -d $name-$version -p1 -i $SRC/0001-pkg-config-compatibility.patch
# https://github.com/KhronosGroup/glslang/pull/1621
patch -d $name-$version -p1 -i $SRC/0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch
# https://github.com/KhronosGroup/glslang/pull/2419
patch -d $name-$version -p1 -i $SRC/0001-CMake-Make-glslang-default-resource-limits-STATIC.patch
patch -d $name-$version -p1 -i $SRC/0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch
# https://github.com/KhronosGroup/glslang/pull/1978
patch -d $name-$version -p1 -i $SRC/0001-glslang-Rename-and-move-cmake-export.patch
patch -d $name-$version -p1 -i $SRC/0002-cmake-Use-the-same-export-config-for-all-installed-t.patch
local config="
-S$name-$version \
@ -27,17 +40,10 @@ build() {
cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF
cmake --build build-static
cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON
# https://github.com/KhronosGroup/glslang/issues/1484 -Wl,--no-undefined
cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON -DCMAKE_SHARED_LINKER_FLAGS='-Wl,--no-undefined'
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
ln -sf "${lib}" "${lib}.0"
done
}

9
glslang/glslang-default-resource-limits_staticlib.patch
View File

@ -1,9 +0,0 @@
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}/resource_limits_c.cpp)
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)

6
jdk8-bin/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/cIXnXCzXrqvAAP4yo7Ub9EGisqOnr8W7MSdrVUrublRL5tPYuDpaNdIgypzCk2QtHfdWGCOMMCsO3ZXhrThjQ8=
SHA256 (Pkgfile) = 368e5a81fb541d52eb8ba80fb8e60d2381f0b5df525f3aab568e43307b4b8029
RWSE3ohX2g5d/UgOVdrhc7W2/38qDxmPxSgogiWSWegq3rUvdYQKb28YFpMTkIwlZ+2XRwKA0ona9zYYNgtr9Rq7UCC54GV6Rwg=
SHA256 (Pkgfile) = d275033bcca089718b23c4601b812597b4763987a5f154f57a540177f34fc228
SHA256 (.footprint) = 3ec8500becdb7af8fa4c6a3cdfb740fe2bc4dfdedfbf7b5178ef0d2948d647a8
SHA256 (amazon-corretto-8.265.01.1-linux-x64.tar.gz) = 1db9c4bd89b9949c97bc5e690aedce2872bb716cf35c670a29cadeeb80d0cb18
SHA256 (amazon-corretto-8.272.10.3-linux-x64.tar.gz) = 5e06514bc20e2967c3cad0fddc61451370e150a91d6f67b1bf2083b6bbc230d2

2
jdk8-bin/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: util-linux gtk alsa-lib
name=jdk8-bin
version=8.265.01.1
version=8.272.10.3
release=1
source=(https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-linux-x64.tar.gz)

7
nfs-utils/.signature
View File

@ -1,8 +1,8 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/a9BqNtPKUa+Lsf1Lbs+fPXK36SsOsjEarU/fo9e71C0YPmFfCc/fm9un+rXpVJS392Ezz6yMjRZ4cmttHxbdQk=
SHA256 (Pkgfile) = 351bb7d7e7c1f0036b8208a6b20e81082daed75bffba6a39f8b321617e013f0d
RWSE3ohX2g5d/eFxLcHg2231sdfIxF/jyiaPToZkJ3RhZczqQ+BjOROrbW+rMwrhptsSMfqiqJ1E1iZIs41FHq7jxVJShVArEQM=
SHA256 (Pkgfile) = a77f9eba6e96a27e75d832dccf9ea34e7052f1230d78c28b1b369d38074a40be
SHA256 (.footprint) = 08bee52c264923d52794306fc37e29919a58e306901e482c727dc021e908797d
SHA256 (nfs-utils-2.5.1.tar.xz) = 0f1c8170e16a07d9836bbf0836d48d0c842b6f0e0e8b18748f099751851d30c4
SHA256 (nfs-utils-2.5.2.tar.xz) = d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea65d9de
SHA256 (exports) = 9556615724e66fbe6e7a2bfd740db4c5399a6abafab8cce868975f6926548eec
SHA256 (idmapd.conf) = 2759ea36eff3397c39b534ee34752e02f60976160d66570ae19dbbbb5c00ee53
SHA256 (nfs) = 3ab2824ff5cbe4498faf6cbbbea19793d96bd80c48b9c18c0939938b18ab0217
@ -13,4 +13,3 @@ SHA256 (rpc.statd) = 764b99273b59839d44a7e05c20d863206df06f5e7e5cb5cedf9da1db624
SHA256 (rpc.mountd) = a6aaaadc054df03a9e6500fdf8b2fc6669d78825daff2c68e52e4d9eb2e0509c
SHA256 (rpc.nfsd) = 12d0936472011db6928e5c0526ac510217a0601863a012e8a1ea565e3c1721de
SHA256 (nfsdcld) = ed10dc56f97a1d6a1045b2a422d41bf120d3227356ff30464d2ca6c25961351c
SHA256 (python3.patch) = cc24ab7eec8d7edc3df63549e7805d51e2cda59182acfc69042369206ce60d24

9
nfs-utils/Pkgfile
View File

@ -4,18 +4,15 @@
# Depends on: libdevmapper util-linux libcap rpcsvc-proto rpcbind libevent keyutils sqlite3
name=nfs-utils
version=2.5.1
release=2
version=2.5.2
release=1
source=(https://www.kernel.org/pub/linux/utils/$name/$version/$name-$version.tar.xz
exports idmapd.conf
nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld
python3.patch)
nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld)
build () {
cd $name-$version
patch -p1 -i $SRC/python3.patch
CONFIG_SHELL=/bin/bash \
./configure --prefix=/usr \
--sysconfdir=/etc \

37
nfs-utils/python3.patch
View File

@ -1,37 +0,0 @@
commit d1683f356bd920d93f2db007902b2c46f97a2e49
Author: Signed-off-by: NeilBrown <neilb@suse.de>
Date: Mon Aug 31 10:48:04 2020 -0400
Convert remaining python scripts to python3
nfs-utils contains 4 python scripts, two request
/usr/bin/python3
in their shebang line, two request
/usr/bin/python
Those latter two run perfectly well with python3 and as python2 is on the
way out, change them so they requrest /usr/bin/python3.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
index 1054f698..00adc96b 100755
--- a/tools/mountstats/mountstats.py
+++ b/tools/mountstats/mountstats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- python-mode -*-
"""Parse /proc/self/mountstats and display it in human readable form
"""
diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index 50fd6a92..4f5e8a66 100755
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- python-mode -*-
"""Emulate iostat for NFS mount points using /proc/self/mountstats
"""

16
poppler-data/.footprint
View File

@ -134,6 +134,7 @@ drwxr-xr-x root/root usr/share/poppler/cMap/Adobe-Japan1/
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-7
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID
@ -198,6 +199,21 @@ drwxr-xr-x root/root usr/share/poppler/cMap/Adobe-Japan1/
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan1/WP-Symbol
drwxr-xr-x root/root usr/share/poppler/cMap/Adobe-Japan2/
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0
drwxr-xr-x root/root usr/share/poppler/cMap/Adobe-KR/
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-0
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-1
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-2
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-3
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-4
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-5
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-6
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-7
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-8
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-9
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/Adobe-KR-UCS2
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/UniAKR-UTF16-H
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/UniAKR-UTF32-H
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-KR/UniAKR-UTF8-H
drwxr-xr-x root/root usr/share/poppler/cMap/Adobe-Korea1/
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0
-rw-r--r-- root/root usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1

8
poppler-data/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Qbgcld7CZ1+4IDCt5++S5gmFDaQviKP8eRhUxowQlBpV5pcbZVEtC2zk/Cyj8SbQWp49o+pCd6zem1lPebJ/Aw=
SHA256 (Pkgfile) = 0234a913e819f084189ddbebbb836a7f0885ed7903134b30be31f103af029595
SHA256 (.footprint) = dab8a5f761f95fae6c59313d2dc77c77e3350724942ae34ee91982c833184dac
SHA256 (poppler-data-0.4.9.tar.gz) = 1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012
RWSE3ohX2g5d/Qcz9nFVPg38HEClTzA2YZsu3oTZz246xn24uq4IIda37Xms+53GgJh+11LhOH8pvlWo7BxRb73/ZUBanJC0MgI=
SHA256 (Pkgfile) = 7d84b07835db721d6b071276aeaf8d0da53f6313fb038df00ec3ffea534b77fe
SHA256 (.footprint) = 8031e3726ca30c34316aa3a9512d05c23f74b5f1a9ea3e98a308ba52f1e0a5ae
SHA256 (poppler-data-0.4.10.tar.gz) = 6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30

2
poppler-data/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: poppler
name=poppler-data
version=0.4.9
version=0.4.10
release=1
source=(https://poppler.freedesktop.org/$name-$version.tar.gz)

17
python-pip/.footprint
View File

@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python2.7/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.3-py2.7.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-20.2.4-py2.7.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/__init__.pyc
@ -307,6 +307,9 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/re
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/factory.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/factory.pyc
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/factory.pyo
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/found_candidates.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/found_candidates.pyc
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/found_candidates.pyo
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/provider.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/provider.pyc
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_internal/resolution/resolvelib/provider.pyo

8
python-pip/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RLHMO5PrPiA1/8v1JdXb4e94CltY9klDGSu1qkeWvzgu5LAzyWFcz4gKtvQEi87UP2XUYSuXHY0+NqvawD+QAw=
SHA256 (Pkgfile) = b8ac4817e54f30db0d0c72c767a6c09aa99aa04e06037f21e08cc0c865503320
SHA256 (.footprint) = ef02cfcaaec4c8c73522b25a5f2b9009089d324228e4e62509f4c6f10c8f8963
SHA256 (pip-20.2.3.tar.gz) = 30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
RWSE3ohX2g5d/ftw2jd4EcXguyZpn6c3lgf6UNmbICccZOtWjoUUI8H0RDG1BSbKKFmgq3TynACqDTgAj6mifQa9WrjUnkl5UAI=
SHA256 (Pkgfile) = 17bd1a7af09bfca9229913d28f2a88c80809a4a9bec1d845e78542768cc4568e
SHA256 (.footprint) = fcade96afc9898e07fec350e020d2d89d512dd196be4b087c19aee5c46761d61
SHA256 (pip-20.2.4.tar.gz) = 85c99a857ea0fb0aedf23833d9be5c40cf253fe24443f0829c7b472e23c364a1

2
python-pip/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: python-setuptools
name=python-pip
version=20.2.3
version=20.2.4
release=1
source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz)

10
python3-cairo/.footprint
View File

@ -17,8 +17,8 @@ drwxr-xr-x root/root usr/lib/python3.7/site-packages/cairo/__pycache__/
drwxr-xr-x root/root usr/lib/python3.7/site-packages/cairo/include/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/cairo/include/py3cairo.h
-rw-r--r-- root/root usr/lib/python3.7/site-packages/cairo/py.typed (EMPTY)
drwxr-xr-x root/root usr/lib/python3.7/site-packages/pycairo-1.19.1-py3.7.egg-info/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/pycairo-1.19.1-py3.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.7/site-packages/pycairo-1.19.1-py3.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.7/site-packages/pycairo-1.19.1-py3.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.7/site-packages/pycairo-1.19.1-py3.7.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.7/site-packages/pycairo-1.20.0-py3.7.egg-info/
-rw-rw-r-- root/root usr/lib/python3.7/site-packages/pycairo-1.20.0-py3.7.egg-info/PKG-INFO
-rw-rw-r-- root/root usr/lib/python3.7/site-packages/pycairo-1.20.0-py3.7.egg-info/SOURCES.txt
-rw-rw-r-- root/root usr/lib/python3.7/site-packages/pycairo-1.20.0-py3.7.egg-info/dependency_links.txt
-rw-rw-r-- root/root usr/lib/python3.7/site-packages/pycairo-1.20.0-py3.7.egg-info/top_level.txt

8
python3-cairo/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bwwOfa4/eFwpiWJ5yJJmAVVjFZ4tvuD2yrzD82S/+Ildhokk93jTkhr+FWz3ozYgbNgM8hyXQgWgEVWD7+FnwM=
SHA256 (Pkgfile) = 04db6ada15afe595d0329f17b5026f4a4254ec81d14720ea3a5ab6a600c9b0b7
SHA256 (.footprint) = 271656b8ad5fcffa8383b8f691669917d22c0194e00d3902a1b3b5031a255a9b
SHA256 (pycairo-1.19.1.tar.gz) = 2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84
RWSE3ohX2g5d/b5z9D/3x8kLNeShqyJskJHUv1oNBqHuRldlk/pfTYIJPfg5qZe4FjAH09jlUdd1ZdLsSjyqvfHlbxJsgR2Qhww=
SHA256 (Pkgfile) = 9a692dbe8cb6e59819852d8198454f3cbe41aef8c0cec70f9ac40d9c68918e6e
SHA256 (.footprint) = e2da2b36e6aa1c1a093cd959f0f1bb78054cd4dfbb02651b802d73e733e2873f
SHA256 (pycairo-1.20.0.tar.gz) = 5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c

2
python3-cairo/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: cairo
name=python3-cairo
version=1.19.1
version=1.20.0
release=1
source=(https://github.com/pygobject/pycairo/releases/download/v$version/pycairo-$version.tar.gz)

5
python3-gobject/.footprint
View File

@ -7,14 +7,12 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/pygobject-3.0.pc
drwxr-xr-x root/root usr/lib/python3.7/
drwxr-xr-x root/root usr/lib/python3.7/site-packages/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/PyGObject-3.36.1.egg-info
-rw-r--r-- root/root usr/lib/python3.7/site-packages/PyGObject-3.38.0.egg-info
drwxr-xr-x root/root usr/lib/python3.7/site-packages/gi/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__init__.py
drwxr-xr-x root/root usr/lib/python3.7/site-packages/gi/__pycache__/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/__init__.cpython-37.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/__init__.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/_compat.cpython-37.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/_compat.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/_constants.cpython-37.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/_constants.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/_error.cpython-37.opt-1.pyc
@ -39,7 +37,6 @@ drwxr-xr-x root/root usr/lib/python3.7/site-packages/gi/__pycache__/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/pygtkcompat.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/types.cpython-37.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/__pycache__/types.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/_compat.py
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/_constants.py
-rw-r--r-- root/root usr/lib/python3.7/site-packages/gi/_error.py
-rwxr-xr-x root/root usr/lib/python3.7/site-packages/gi/_gi.cpython-37m-x86_64-linux-gnu.so

8
python3-gobject/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/eweQb+PB5IrTZMYCG8ZCHYCcygCrHn3bTOpIp8YWhamdm5QXxoIdo7yX8567F42Tc1P/GwQ/pnKEiGg4Se0/g0=
SHA256 (Pkgfile) = 4cbf0eae34165b72e8e0870933dfa9a5163c0017d4f0fbbb96629497d7cdc7e9
SHA256 (.footprint) = d4e5fe2873581e01da6fcddd552f4f5c9f0d90acbd75e47d0cc559d2c24a884f
SHA256 (pygobject-3.36.1.tar.xz) = d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f
RWSE3ohX2g5d/ciiqrtPh37kA9UoW3RySgL2i0QLqSgjd3hqhavQ2+g7nT6CbhDtKljw6lojITBN/i+4liU/New1J8Sjh9Gl+Q0=
SHA256 (Pkgfile) = 90013b2cf5e793665173d00366970d6ec3a78ad16b93996b3d412302afa65150
SHA256 (.footprint) = fb109cccc89d901dcc0d2ac82fa99113ab951f66f4038d141da71a26c458aa3b
SHA256 (pygobject-3.38.0.tar.xz) = 0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5

2
python3-gobject/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: gobject-introspection python3-cairo
name=python3-gobject
version=3.36.1
version=3.38.0
release=1
source=(https://ftp.gnome.org/pub/GNOME/sources/pygobject/${version::4}/pygobject-$version.tar.xz)

17
python3-pip/.footprint
View File

@ -5,13 +5,13 @@ drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python3.9/
drwxr-xr-x root/root usr/lib/python3.9/site-packages/
drwxr-xr-x root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.3-py3.9.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip-20.2.4-py3.9.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.9/site-packages/pip/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/__init__.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/__main__.py
@ -322,6 +322,8 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/re
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/candidates.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/found_candidates.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/found_candidates.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/__pycache__/requirements.cpython-39.opt-1.pyc
@ -331,6 +333,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/re
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/base.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/candidates.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/factory.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/found_candidates.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/provider.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/requirements.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pip/_internal/resolution/resolvelib/resolver.py

8
python3-pip/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/S4yoAg8W70Wuj5dywe3Ibwc6w9MO1IwEQ9PoULxnDO8RHYASqkV2WDT/A2jSWe+Yq1nxW2eWEMhzyDD582Eywo=
SHA256 (Pkgfile) = fa41dd323b583de866968628693bd2990d87fd8d4783affb8aef8b66283714b7
SHA256 (.footprint) = 8e21927ccd44bb6f0e5eb602b0114e022197f57d5cdee020777441cabd0f3e28
SHA256 (pip-20.2.3.tar.gz) = 30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
RWSE3ohX2g5d/bleKkNo37eTiRT0YxUqf1dzJ3IdRBU2L4CwJec6/SLoddYGzUn4GMVTnjfy18qgUsBglrSxLV1oei3xNQATogw=
SHA256 (Pkgfile) = a1c3b1538316f64e6a3eac42207bf00fd91e916742dcb98507dabd9df40cd701
SHA256 (.footprint) = 648a5848fec1859b878e4b48fc5d862a7bd818a49a8c7f5380a7655e8222a872
SHA256 (pip-20.2.4.tar.gz) = 85c99a857ea0fb0aedf23833d9be5c40cf253fe24443f0829c7b472e23c364a1

2
python3-pip/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: python3-setuptools
name=python3-pip
version=20.2.3
version=20.2.4
release=1
source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz)

16
python3-setuptools/.footprint
View File

@ -73,14 +73,14 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/pkg_resources/extern/
drwxr-xr-x root/root usr/lib/python3.9/site-packages/pkg_resources/extern/__pycache__/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pkg_resources/extern/__pycache__/__init__.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pkg_resources/extern/__pycache__/__init__.cpython-39.pyc
drwxr-xr-x root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/top_level.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.0-py3.9.egg-info/zip-safe
drwxr-xr-x root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/top_level.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools-50.3.2-py3.9.egg-info/zip-safe
drwxr-xr-x root/root usr/lib/python3.9/site-packages/setuptools/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/setuptools/__init__.py
drwxr-xr-x root/root usr/lib/python3.9/site-packages/setuptools/__pycache__/

8
python3-setuptools/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/a1VZVoiNSuKRqniVv0MU6CgMY4RqciXjHwGRPQeDnC5RSVH8oOrynDHHmaj9gnNkuoWdCc5jnvt7pKRPwVG0g8=
SHA256 (Pkgfile) = 35d4a935cefb86427f4d1251a596d795a9d6431cd6249546f3e14884a2c58a35
SHA256 (.footprint) = d57e77ef1ee1f42bfd1b8581092dcf9536b128798c167394167c50acb8ee747a
SHA256 (setuptools-50.3.0.zip) = 39060a59d91cf5cf403fa3bacbb52df4205a8c3585e0b9ba4b30e0e19d4c4b18
RWSE3ohX2g5d/eg8KdjgzznT6nz6KBSRrn4qsz9F4bEoZPgZj0hDJuFDTDQv5Yd2Wye2k90bIJbiudBTFd92AD7x5o5MI96DZQ4=
SHA256 (Pkgfile) = 0598f9cd237ef8e603126f96b8443e1810f6c15498e443b0fe8a9ccc683b721b
SHA256 (.footprint) = 36807c9acf2cf19e171c4407514a48443f44ab225246a87d7cb676182892e929
SHA256 (setuptools-50.3.2.zip) = ed0519d27a243843b05d82a5e9d01b0b083d9934eaa3d02779a23da18077bd3c

4
python3-setuptools/Pkgfile
View File

@ -4,8 +4,8 @@
# Depends on: python3
name=python3-setuptools
version=50.3.0
release=2
version=50.3.2
release=1
source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.zip)
build() {

2
spirv-headers/.footprint
View File

@ -48,11 +48,13 @@ drwxr-xr-x root/root usr/include/spirv/unified1/
-rw-r--r-- root/root usr/include/spirv/unified1/AMD_shader_trinary_minmax.h
-rw-r--r-- root/root usr/include/spirv/unified1/DebugInfo.h
-rw-r--r-- root/root usr/include/spirv/unified1/GLSL.std.450.h
-rw-r--r-- root/root usr/include/spirv/unified1/NonSemanticClspvReflection.h
-rw-r--r-- root/root usr/include/spirv/unified1/NonSemanticDebugPrintf.h
-rw-r--r-- root/root usr/include/spirv/unified1/OpenCL.std.h
-rw-r--r-- root/root usr/include/spirv/unified1/OpenCLDebugInfo100.h
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.debuginfo.grammar.json
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.glsl.std.450.grammar.json
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.nonsemantic.debugprintf.grammar.json
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.opencl.std.100.grammar.json

8
spirv-headers/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Zlc4yfecSQEOKs3QIHiYvWeUacgNsa9vvThaunz6nagf8DtyYD4LQPVt1Dz3X/N4Nq+galiZ1hWuhKujr9J8wI=
SHA256 (Pkgfile) = b0044fe738b9dcf870127fc84f0a404b162b4391d92ba019ed2f077e5d3ac300
SHA256 (.footprint) = 24829e1b094986dd7021f7ac3082b328a3baf6688964509a117222df08ee76f4
SHA256 (SPIRV-Headers-1.5.3.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
RWSE3ohX2g5d/fdjaQ3god4euoPEXY7jDzoHgq23652+Rs8qmv+lzM3JVWfhMjJlVLPEQ33afSPunckXNjHbWCJFp+H/JNOWywM=
SHA256 (Pkgfile) = 58dcdd9db5906b918ad8475261ed5584a369678e42da5fbb3b3749c6174e705e
SHA256 (.footprint) = 051b31aecd3e919aa7f5b6c995e1c913350e6c210ed660ac2cb46030df110d9c
SHA256 (060627f0b0d2fa8581b5acb939f46e3b9e500593.zip) = 6ff599807b355da41140978156698bb64ce0ecee12458ee5f98feb9e81ba3555

9
spirv-headers/Pkgfile
View File

@ -4,11 +4,16 @@
# Depends on: cmake ninja
name=spirv-headers
version=1.5.3
version=1.5.3-060627f
release=1
source=(https://github.com/KhronosGroup/SPIRV-Headers/archive/$version/SPIRV-Headers-$version.tar.gz)
source=(
#https://github.com/KhronosGroup/SPIRV-Headers/archive/$version/SPIRV-Headers-$version.tar.gz
https://github.com/KhronosGroup/SPIRV-Headers/archive/060627f0b0d2fa8581b5acb939f46e3b9e500593.zip
)
build() {
mv SPIRV-Headers-060627f0b0d2fa8581b5acb939f46e3b9e500593 SPIRV-Headers-$version
cmake -SSPIRV-Headers-$version -Bbuild -GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \

20
spirv-tools/.footprint
View File

@ -34,14 +34,24 @@ drwxr-xr-x root/root usr/lib/cmake/SPIRV-Tools/
-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-release.cmake
-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
-rw-r--r-- root/root usr/lib/libSPIRV-Tools-link.a
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-link.so
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-link.so -> libSPIRV-Tools-link.so.0
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-link.so.0 -> libSPIRV-Tools-link.so.0.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-link.so.0.0.0
-rw-r--r-- root/root usr/lib/libSPIRV-Tools-opt.a
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-opt.so
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-opt.so -> libSPIRV-Tools-opt.so.0
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-opt.so.0 -> libSPIRV-Tools-opt.so.0.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-opt.so.0.0.0
-rw-r--r-- root/root usr/lib/libSPIRV-Tools-reduce.a
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-reduce.so
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-reduce.so -> libSPIRV-Tools-reduce.so.0
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-reduce.so.0 -> libSPIRV-Tools-reduce.so.0.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-reduce.so.0.0.0
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-shared.so -> libSPIRV-Tools-shared.so.0
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools-shared.so.0 -> libSPIRV-Tools-shared.so.0.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so.0.0.0
-rw-r--r-- root/root usr/lib/libSPIRV-Tools.a
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools.so
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools.so -> libSPIRV-Tools.so.0
lrwxrwxrwx root/root usr/lib/libSPIRV-Tools.so.0 -> libSPIRV-Tools.so.0.0.0
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools.so.0.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools-shared.pc
-rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools.pc

11
spirv-tools/.signature
View File

@ -1,5 +1,8 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/cIyU1AsrCsCTQ7hVvoNGwDWxv4in/4zzORrPfJXSL1XHnnsF9QrYVW3+Z1Ce6pQWxbjWwdvMWIQhOG2slDxXgY=
SHA256 (Pkgfile) = 4b621480ed0f8204e532aa6d9ec3433a9f9b5029a87bd0c782fad1331bf7f223
SHA256 (.footprint) = 8476f7a6f9f52a2c6ba3951bddd566aa9862560df47eae928c6d4cf16ecdf05b
SHA256 (SPIRV-Tools-v2020.3.tar.gz) = 8b538a1cb2a4275ef9617abcb047d54e8292f975ac1d93323d5dd1e19c85280b
RWSE3ohX2g5d/YKvdqWTC9exMMGE9S6vk/EPquKkvgZfEzr0sUJK9sGcgVOfu3o3U6WFH2oA6qs9B7QfxAKJvSW6BNMXEuySyAE=
SHA256 (Pkgfile) = 3c9ae7fdb360ebf35fd1cf98a92a9766aafd8f173e0a9d07dea95860802aadb5
SHA256 (.footprint) = 4884c0c44dfed508d803150bb7610fb58ece0366547b8ee4ed1ff86323a4334f
SHA256 (b27e039c68dd9eb959bb9249fcb2c9a54841474b.zip) = a45d8c4347c830759489f73faad8b5c330bd4e0d9cb8b1e8bf65f22682078e7d
SHA256 (0001-Revert-CMake-Enable-building-with-BUILD_SHARED_LIBS-.patch) = 6622948faf7e558d1741d2a6099f6ad39d2ccf6613973b3991be1e8f56ef9c29
SHA256 (spirv-tools-soversion.patch) = b7f2f1d46f11fb25ac24036b20f5745f01f04b6d8c08259c280cef411fe41892
SHA256 (0001-CMake-FIx-pkg-config-libdir-with-absolute-CMAKE_INST.patch) = 0e354a9947a807c900349dca61bd92f4f11a33d828a62dde129a55709c0f9c00

73
spirv-tools/0001-CMake-FIx-pkg-config-libdir-with-absolute-CMAKE_INST.patch Normal file
View File

@ -0,0 +1,73 @@
From de0b782723ccb25ce879a7b95c25c2a5e4c80eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 12 Oct 2020 12:25:03 +0200
Subject: [PATCH] CMake: FIx pkg-config libdir with absolute
CMAKE_INSTALL_LIBDIR
We lose the use of `${prefix}` for `libdir` and `includedir`, but at least the
paths should be valid.
Fixes #3905.
---
CMakeLists.txt | 8 ++++----
cmake/SPIRV-Tools-shared.pc.in | 4 ++--
cmake/SPIRV-Tools.pc.in | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30dde20a..f4327e91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,8 +313,8 @@ add_custom_target(spirv-tools-pkg-config ALL
-DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in
-DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-DSPIRV_LIBRARIES=${SPIRV_LIBRARIES}
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
DEPENDS "CHANGES" "cmake/SPIRV-Tools.pc.in" "cmake/write_pkg_config.cmake")
@@ -324,8 +324,8 @@ add_custom_target(spirv-tools-shared-pkg-config ALL
-DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in
-DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES}
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
DEPENDS "CHANGES" "cmake/SPIRV-Tools-shared.pc.in" "cmake/write_pkg_config.cmake")
diff --git a/cmake/SPIRV-Tools-shared.pc.in b/cmake/SPIRV-Tools-shared.pc.in
index 0dcaa276..c9ee4314 100644
--- a/cmake/SPIRV-Tools-shared.pc.in
+++ b/cmake/SPIRV-Tools-shared.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: SPIRV-Tools
Description: Tools for SPIR-V
diff --git a/cmake/SPIRV-Tools.pc.in b/cmake/SPIRV-Tools.pc.in
index 2984dc57..e4eba4f2 100644
--- a/cmake/SPIRV-Tools.pc.in
+++ b/cmake/SPIRV-Tools.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: SPIRV-Tools
Description: Tools for SPIR-V
--
2.28.0

314
spirv-tools/0001-Revert-CMake-Enable-building-with-BUILD_SHARED_LIBS-.patch Normal file
View File

@ -0,0 +1,314 @@
From 92dd0d8c6111d75b11e511217d5e6d5c6a8d7a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 12 Oct 2020 10:41:39 +0200
Subject: [PATCH] Revert "CMake: Enable building with BUILD_SHARED_LIBS=1
(#3490)"
This reverts commit 6aed7ffbc7bd42d292db10a800ec05954a5b7147.
---
external/CMakeLists.txt | 19 -------------------
source/CMakeLists.txt | 29 +++++++++--------------------
source/fuzz/CMakeLists.txt | 2 +-
source/link/CMakeLists.txt | 2 +-
source/opt/CMakeLists.txt | 4 ++--
source/reduce/CMakeLists.txt | 4 ++--
test/CMakeLists.txt | 6 +++---
test/val/CMakeLists.txt | 10 +++++-----
tools/CMakeLists.txt | 16 ++++++++--------
9 files changed, 31 insertions(+), 61 deletions(-)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 179a4012..e8b78673 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -13,19 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Utility functions for pushing & popping variables.
-function(push_variable var val)
- set("${var}_SAVE_STACK" "${${var}}" "${${var}_SAVE_STACK}" PARENT_SCOPE)
- set(${var} ${val} PARENT_SCOPE)
-endfunction()
-function(pop_variable var)
- set(save_stack "${${var}_SAVE_STACK}")
- list(GET save_stack 0 val)
- list(REMOVE_AT save_stack 0)
- set("${var}_SAVE_STACK" "${save_stack}" PARENT_SCOPE)
- set(${var} ${val} PARENT_SCOPE)
-endfunction()
-
if (DEFINED SPIRV-Headers_SOURCE_DIR)
# This allows flexible position of the SPIRV-Headers repo.
set(SPIRV_HEADER_DIR ${SPIRV-Headers_SOURCE_DIR})
@@ -74,11 +61,7 @@ if (NOT ${SPIRV_SKIP_TESTS})
"Use shared (DLL) run-time lib even when Google Test is built as static lib."
ON)
endif()
- # gtest requires special defines for building as a shared
- # library, simply always build as static.
- push_variable(BUILD_SHARED_LIBS 0)
add_subdirectory(${GMOCK_DIR} EXCLUDE_FROM_ALL)
- pop_variable(BUILD_SHARED_LIBS)
endif()
endif()
if (TARGET gmock)
@@ -125,9 +108,7 @@ if (NOT ${SPIRV_SKIP_TESTS})
if (NOT TARGET effcee)
set(EFFCEE_BUILD_TESTING OFF CACHE BOOL "Do not build Effcee test suite")
endif()
- push_variable(BUILD_SHARED_LIBS 0) # effcee does not export any symbols for building as a DLL. Always build as static.
add_subdirectory(effcee EXCLUDE_FROM_ALL)
- pop_variable(BUILD_SHARED_LIBS)
set_property(TARGET effcee PROPERTY FOLDER Effcee)
# Turn off warnings for effcee and re2
set_property(TARGET effcee APPEND PROPERTY COMPILE_OPTIONS -w)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index fa900e03..0a9c147e 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -346,21 +346,18 @@ set_source_files_properties(
spvtools_pch(SPIRV_SOURCES pch_source)
-add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
-spvtools_default_compile_options(${SPIRV_TOOLS}-static)
-target_include_directories(${SPIRV_TOOLS}-static
+add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
+spvtools_default_compile_options(${SPIRV_TOOLS})
+target_include_directories(${SPIRV_TOOLS}
PUBLIC
$<BUILD_INTERFACE:${spirv-tools_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE ${spirv-tools_BINARY_DIR}
PRIVATE ${SPIRV_HEADER_INCLUDE_DIR}
)
-set_property(TARGET ${SPIRV_TOOLS}-static PROPERTY FOLDER "SPIRV-Tools libraries")
-spvtools_check_symbol_exports(${SPIRV_TOOLS}-static)
-add_dependencies(${SPIRV_TOOLS}-static core_tables enum_string_mapping extinst_tables)
-
-# The static target does not have the '-static' suffix.
-set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}")
+set_property(TARGET ${SPIRV_TOOLS} PROPERTY FOLDER "SPIRV-Tools libraries")
+spvtools_check_symbol_exports(${SPIRV_TOOLS})
+add_dependencies( ${SPIRV_TOOLS} core_tables enum_string_mapping extinst_tables )
add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
@@ -378,26 +375,18 @@ target_compile_definitions(${SPIRV_TOOLS}-shared
PRIVATE SPIRV_TOOLS_IMPLEMENTATION
PUBLIC SPIRV_TOOLS_SHAREDLIB
)
-add_dependencies(${SPIRV_TOOLS}-shared core_tables enum_string_mapping extinst_tables)
-
-# Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static"
-# or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS.
-if(BUILD_SHARED_LIBS)
- add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-shared)
-else()
- add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static)
-endif()
+add_dependencies( ${SPIRV_TOOLS}-shared core_tables enum_string_mapping extinst_tables )
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
find_library(LIBRT rt)
if(LIBRT)
- target_link_libraries(${SPIRV_TOOLS}-static ${LIBRT})
+ target_link_libraries(${SPIRV_TOOLS} ${LIBRT})
target_link_libraries(${SPIRV_TOOLS}-shared ${LIBRT})
endif()
endif()
if(ENABLE_SPIRV_TOOLS_INSTALL)
- install(TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared EXPORT ${SPIRV_TOOLS}Targets
+ install(TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared EXPORT ${SPIRV_TOOLS}Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/source/fuzz/CMakeLists.txt b/source/fuzz/CMakeLists.txt
index cea05cf3..c35a89c5 100644
--- a/source/fuzz/CMakeLists.txt
+++ b/source/fuzz/CMakeLists.txt
@@ -419,7 +419,7 @@ if(SPIRV_BUILD_FUZZER)
# The fuzzer reuses a lot of functionality from the SPIRV-Tools library.
target_link_libraries(SPIRV-Tools-fuzz
- PUBLIC ${SPIRV_TOOLS}-static
+ PUBLIC ${SPIRV_TOOLS}
PUBLIC SPIRV-Tools-opt
PUBLIC protobuf::libprotobuf)
diff --git a/source/link/CMakeLists.txt b/source/link/CMakeLists.txt
index bb058ea2..d3083192 100644
--- a/source/link/CMakeLists.txt
+++ b/source/link/CMakeLists.txt
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-add_library(SPIRV-Tools-link STATIC
+add_library(SPIRV-Tools-link
linker.cpp
)
diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt
index 3630a060..8a6699a0 100644
--- a/source/opt/CMakeLists.txt
+++ b/source/opt/CMakeLists.txt
@@ -233,7 +233,7 @@ endif()
spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch_source_opt)
-add_library(SPIRV-Tools-opt STATIC ${SPIRV_TOOLS_OPT_SOURCES})
+add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
spvtools_default_compile_options(SPIRV-Tools-opt)
target_include_directories(SPIRV-Tools-opt
@@ -245,7 +245,7 @@ target_include_directories(SPIRV-Tools-opt
)
# We need the assembling and disassembling functionalities in the main library.
target_link_libraries(SPIRV-Tools-opt
- PUBLIC ${SPIRV_TOOLS}-static)
+ PUBLIC ${SPIRV_TOOLS})
set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
spvtools_check_symbol_exports(SPIRV-Tools-opt)
diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt
index e113ca25..0e8d5a00 100644
--- a/source/reduce/CMakeLists.txt
+++ b/source/reduce/CMakeLists.txt
@@ -78,7 +78,7 @@ endif()
spvtools_pch(SPIRV_TOOLS_REDUCE_SOURCES pch_source_reduce)
-add_library(SPIRV-Tools-reduce STATIC ${SPIRV_TOOLS_REDUCE_SOURCES})
+add_library(SPIRV-Tools-reduce ${SPIRV_TOOLS_REDUCE_SOURCES})
spvtools_default_compile_options(SPIRV-Tools-reduce)
target_include_directories(SPIRV-Tools-reduce
@@ -90,7 +90,7 @@ target_include_directories(SPIRV-Tools-reduce
)
# The reducer reuses a lot of functionality from the SPIRV-Tools library.
target_link_libraries(SPIRV-Tools-reduce
- PUBLIC ${SPIRV_TOOLS}-static
+ PUBLIC ${SPIRV_TOOLS}
PUBLIC SPIRV-Tools-opt)
set_property(TARGET SPIRV-Tools-reduce PROPERTY FOLDER "SPIRV-Tools libraries")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5dd4036c..70999f99 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -159,12 +159,12 @@ spvtools_pch(TEST_SOURCES pch_test)
add_spvtools_unittest(
TARGET spirv_unit_tests
SRCS ${TEST_SOURCES}
- LIBS ${SPIRV_TOOLS}-static)
+ LIBS ${SPIRV_TOOLS})
add_spvtools_unittest(
TARGET c_interface
SRCS c_interface_test.cpp
- LIBS ${SPIRV_TOOLS}-static)
+ LIBS ${SPIRV_TOOLS})
add_spvtools_unittest(
TARGET c_interface_shared
@@ -181,7 +181,7 @@ if (${SPIRV_TIMER_ENABLED})
add_spvtools_unittest(
TARGET timer
SRCS timer_test.cpp
- LIBS ${SPIRV_TOOLS}-static)
+ LIBS ${SPIRV_TOOLS})
endif()
diff --git a/test/val/CMakeLists.txt b/test/val/CMakeLists.txt
index c458a2f9..23d7a19e 100644
--- a/test/val/CMakeLists.txt
+++ b/test/val/CMakeLists.txt
@@ -41,21 +41,21 @@ add_spvtools_unittest(TARGET val_abcde
val_extension_spv_khr_terminate_invocation.cpp
val_ext_inst_test.cpp
${VAL_TEST_COMMON_SRCS}
- LIBS ${SPIRV_TOOLS}-static
+ LIBS ${SPIRV_TOOLS}
PCH_FILE pch_test_val
)
add_spvtools_unittest(TARGET val_capability
SRCS
val_capability_test.cpp
- LIBS ${SPIRV_TOOLS}-static
+ LIBS ${SPIRV_TOOLS}
PCH_FILE pch_test_val
)
add_spvtools_unittest(TARGET val_limits
SRCS val_limits_test.cpp
${VAL_TEST_COMMON_SRCS}
- LIBS ${SPIRV_TOOLS}-static
+ LIBS ${SPIRV_TOOLS}
PCH_FILE pch_test_val
)
@@ -76,7 +76,7 @@ add_spvtools_unittest(TARGET val_fghijklmnop
val_opencl_test.cpp
val_primitives_test.cpp
${VAL_TEST_COMMON_SRCS}
- LIBS ${SPIRV_TOOLS}-static
+ LIBS ${SPIRV_TOOLS}
PCH_FILE pch_test_val
)
@@ -91,6 +91,6 @@ add_spvtools_unittest(TARGET val_stuvw
val_version_test.cpp
val_webgpu_test.cpp
${VAL_TEST_COMMON_SRCS}
- LIBS ${SPIRV_TOOLS}-static
+ LIBS ${SPIRV_TOOLS}
PCH_FILE pch_test_val
)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 67d606a8..b3a4cc1a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -40,19 +40,19 @@ function(add_spvtools_tool)
endfunction()
if (NOT ${SPIRV_SKIP_EXECUTABLES})
- add_spvtools_tool(TARGET spirv-as SRCS as/as.cpp LIBS ${SPIRV_TOOLS}-static)
- add_spvtools_tool(TARGET spirv-dis SRCS dis/dis.cpp LIBS ${SPIRV_TOOLS}-static)
- add_spvtools_tool(TARGET spirv-val SRCS val/val.cpp util/cli_consumer.cpp LIBS ${SPIRV_TOOLS}-static)
- add_spvtools_tool(TARGET spirv-opt SRCS opt/opt.cpp util/cli_consumer.cpp LIBS SPIRV-Tools-opt ${SPIRV_TOOLS}-static)
+ add_spvtools_tool(TARGET spirv-as SRCS as/as.cpp LIBS ${SPIRV_TOOLS})
+ add_spvtools_tool(TARGET spirv-dis SRCS dis/dis.cpp LIBS ${SPIRV_TOOLS})
+ add_spvtools_tool(TARGET spirv-val SRCS val/val.cpp util/cli_consumer.cpp LIBS ${SPIRV_TOOLS})
+ add_spvtools_tool(TARGET spirv-opt SRCS opt/opt.cpp util/cli_consumer.cpp LIBS SPIRV-Tools-opt ${SPIRV_TOOLS})
if (NOT DEFINED IOS_PLATFORM) # iOS does not allow std::system calls which spirv-reduce requires
- add_spvtools_tool(TARGET spirv-reduce SRCS reduce/reduce.cpp util/cli_consumer.cpp LIBS SPIRV-Tools-reduce ${SPIRV_TOOLS}-static)
+ add_spvtools_tool(TARGET spirv-reduce SRCS reduce/reduce.cpp util/cli_consumer.cpp LIBS SPIRV-Tools-reduce ${SPIRV_TOOLS})
endif()
- add_spvtools_tool(TARGET spirv-link SRCS link/linker.cpp LIBS SPIRV-Tools-link ${SPIRV_TOOLS}-static)
+ add_spvtools_tool(TARGET spirv-link SRCS link/linker.cpp LIBS SPIRV-Tools-link ${SPIRV_TOOLS})
add_spvtools_tool(TARGET spirv-cfg
SRCS cfg/cfg.cpp
cfg/bin_to_dot.h
cfg/bin_to_dot.cpp
- LIBS ${SPIRV_TOOLS}-static)
+ LIBS ${SPIRV_TOOLS})
target_include_directories(spirv-cfg PRIVATE ${spirv-tools_SOURCE_DIR}
${SPIRV_HEADER_INCLUDE_DIR})
set(SPIRV_INSTALL_TARGETS spirv-as spirv-dis spirv-val spirv-opt
@@ -62,7 +62,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
endif()
if(SPIRV_BUILD_FUZZER)
- add_spvtools_tool(TARGET spirv-fuzz SRCS fuzz/fuzz.cpp util/cli_consumer.cpp LIBS SPIRV-Tools-fuzz ${SPIRV_TOOLS}-static)
+ add_spvtools_tool(TARGET spirv-fuzz SRCS fuzz/fuzz.cpp util/cli_consumer.cpp LIBS SPIRV-Tools-fuzz ${SPIRV_TOOLS})
set(SPIRV_INSTALL_TARGETS ${SPIRV_INSTALL_TARGETS} spirv-fuzz)
endif(SPIRV_BUILD_FUZZER)
--
2.28.0

20
spirv-tools/Pkgfile
View File

@ -4,11 +4,18 @@
# Depends on: spirv-headers
name=spirv-tools
version=2020.3
version=2020.5-b27e039
release=1
source=(https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz)
source=(
#https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz
https://github.com/KhronosGroup/SPIRV-Tools/archive/b27e039c68dd9eb959bb9249fcb2c9a54841474b.zip
0001-Revert-CMake-Enable-building-with-BUILD_SHARED_LIBS-.patch
spirv-tools-soversion.patch
0001-CMake-FIx-pkg-config-libdir-with-absolute-CMAKE_INST.patch)
build() {
mv SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b SPIRV-Tools-$version
local config="
-SSPIRV-Tools-$version \
-DCMAKE_INSTALL_PREFIX=/usr \
@ -19,11 +26,18 @@ build() {
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-GNinja"
# https://github.com/KhronosGroup/SPIRV-Tools/issues/3626
patch -d SPIRV-Tools-$version -p1 -i $SRC/0001-Revert-CMake-Enable-building-with-BUILD_SHARED_LIBS-.patch
patch -d SPIRV-Tools-$version -p1 -i $SRC/spirv-tools-soversion.patch
# https://github.com/KhronosGroup/SPIRV-Tools/pull/3906
patch -d SPIRV-Tools-$version -p1 -i $SRC/0001-CMake-FIx-pkg-config-libdir-with-absolute-CMAKE_INST.patch
cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF
cmake --build build-static
cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON
cmake --build build-static
cmake --build build-shared
DESTDIR=$PKG cmake --build build-static --target install
DESTDIR=$PKG cmake --build build-shared --target install

82
spirv-tools/spirv-tools-soversion.patch Normal file
View File

@ -0,0 +1,82 @@
Index: SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/CMakeLists.txt
===================================================================
--- SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/CMakeLists.txt
+++ SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/CMakeLists.txt 2020-10-12 10:42:21.665118296 +0200
@@ -28,6 +28,9 @@
enable_testing()
set(SPIRV_TOOLS "SPIRV-Tools")
+set(SPIRV_TOOLS_VERSION "0.0.0" CACHE STRING "Build version")
+set(SPIRV_TOOLS_SOVERSION "0" CACHE STRING "Library API version")
+
include(GNUInstallDirs)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
Index: SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/CMakeLists.txt
===================================================================
--- SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/CMakeLists.txt
+++ SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/CMakeLists.txt 2020-10-12 10:43:48.111036375 +0200
@@ -347,6 +347,7 @@
spvtools_pch(SPIRV_SOURCES pch_source)
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
+set_target_properties(${SPIRV_TOOLS} PROPERTIES VERSION ${SPIRV_TOOLS_VERSION} SOVERSION ${SPIRV_TOOLS_SOVERSION})
spvtools_default_compile_options(${SPIRV_TOOLS})
target_include_directories(${SPIRV_TOOLS}
PUBLIC
@@ -360,6 +361,7 @@
add_dependencies( ${SPIRV_TOOLS} core_tables enum_string_mapping extinst_tables )
add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES VERSION ${SPIRV_TOOLS_VERSION} SOVERSION ${SPIRV_TOOLS_SOVERSION})
spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
target_include_directories(${SPIRV_TOOLS}-shared
PUBLIC
Index: SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/fuzz/CMakeLists.txt
===================================================================
--- SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/fuzz/CMakeLists.txt
+++ SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/fuzz/CMakeLists.txt 2020-10-12 10:44:07.542017960 +0200
@@ -397,6 +397,7 @@
spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz)
add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES})
+ set_target_properties(${SPIRV_TOOLS}-fuzz PROPERTIES VERSION ${SPIRV_TOOLS_VERSION} SOVERSION ${SPIRV_TOOLS_SOVERSION})
spvtools_default_compile_options(SPIRV-Tools-fuzz)
Index: SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/opt/CMakeLists.txt
===================================================================
--- SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/opt/CMakeLists.txt
+++ SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/opt/CMakeLists.txt 2020-10-12 10:44:24.508001881 +0200
@@ -234,6 +234,7 @@
spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch_source_opt)
add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
+set_target_properties(${SPIRV_TOOLS}-opt PROPERTIES VERSION ${SPIRV_TOOLS_VERSION} SOVERSION ${SPIRV_TOOLS_SOVERSION})
spvtools_default_compile_options(SPIRV-Tools-opt)
target_include_directories(SPIRV-Tools-opt
Index: SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/link/CMakeLists.txt
===================================================================
--- SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/link/CMakeLists.txt
+++ SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/link/CMakeLists.txt 2020-10-12 10:44:16.013009932 +0200
@@ -14,6 +14,7 @@
add_library(SPIRV-Tools-link
linker.cpp
)
+set_target_properties(${SPIRV_TOOLS}-link PROPERTIES VERSION ${SPIRV_TOOLS_VERSION} SOVERSION ${SPIRV_TOOLS_SOVERSION})
spvtools_default_compile_options(SPIRV-Tools-link)
target_include_directories(SPIRV-Tools-link
Index: SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/reduce/CMakeLists.txt
===================================================================
--- SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/reduce/CMakeLists.txt
+++ SPIRV-Tools-b27e039c68dd9eb959bb9249fcb2c9a54841474b/source/reduce/CMakeLists.txt 2020-10-12 10:44:34.239992658 +0200
@@ -79,6 +79,7 @@
spvtools_pch(SPIRV_TOOLS_REDUCE_SOURCES pch_source_reduce)
add_library(SPIRV-Tools-reduce ${SPIRV_TOOLS_REDUCE_SOURCES})
+set_target_properties(${SPIRV_TOOLS}-reduce PROPERTIES VERSION ${SPIRV_TOOLS_VERSION} SOVERSION ${SPIRV_TOOLS_SOVERSION})
spvtools_default_compile_options(SPIRV-Tools-reduce)
target_include_directories(SPIRV-Tools-reduce

23
vkd3d/.footprint
View File

@ -1,24 +1,35 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/vkd3d-compiler
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/vkd3d/
-rw-r--r-- root/root usr/include/vkd3d/vkd3d.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_d3d12.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_d3d12sdklayers.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_d3dcommon.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_dxgibase.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_dxgiformat.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_shader.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_types.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_utils.h
-rw-r--r-- root/root usr/include/vkd3d/vkd3d_windows.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libvkd3d-shader.a
-rwxr-xr-x root/root usr/lib/libvkd3d-shader.la
lrwxrwxrwx root/root usr/lib/libvkd3d-shader.so -> libvkd3d-shader.so.1.0.0
lrwxrwxrwx root/root usr/lib/libvkd3d-shader.so.1 -> libvkd3d-shader.so.1.0.0
-rwxr-xr-x root/root usr/lib/libvkd3d-shader.so.1.0.0
-rw-r--r-- root/root usr/lib/libvkd3d-utils.a
-rwxr-xr-x root/root usr/lib/libvkd3d-utils.la
lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so -> libvkd3d-utils.so.1.0.1
lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.0.1
-rwxr-xr-x root/root usr/lib/libvkd3d-utils.so.1.0.1
lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so -> libvkd3d-utils.so.1.1.0
lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.1.0
-rwxr-xr-x root/root usr/lib/libvkd3d-utils.so.1.1.0
-rw-r--r-- root/root usr/lib/libvkd3d.a
-rwxr-xr-x root/root usr/lib/libvkd3d.la
lrwxrwxrwx root/root usr/lib/libvkd3d.so -> libvkd3d.so.1.1.0
lrwxrwxrwx root/root usr/lib/libvkd3d.so.1 -> libvkd3d.so.1.1.0
-rwxr-xr-x root/root usr/lib/libvkd3d.so.1.1.0
lrwxrwxrwx root/root usr/lib/libvkd3d.so -> libvkd3d.so.1.2.0
lrwxrwxrwx root/root usr/lib/libvkd3d.so.1 -> libvkd3d.so.1.2.0
-rwxr-xr-x root/root usr/lib/libvkd3d.so.1.2.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libvkd3d-shader.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libvkd3d-utils.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libvkd3d.pc

9
vkd3d/.signature
View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/fPHyoXq5/GuDvpF+HQlyQhGQkWBOgiGdkyqauRu/L8U/DN2kJRNQV4g0TPSATaqsAOrsjJJDPl3VFC/SfBcGAQ=
SHA256 (Pkgfile) = 9e7f0f651068d22251dfbe40553472c1e42f3149dbbe9a52c104bfb37e166e32
SHA256 (.footprint) = 83f0606cf8a591cff4886fc9d7f3b07b2de019a08bbc60f978ac3ebb8f40623f
SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6
SHA256 (vulkan-headers.patch) = d79ddf19adbe598693916a5e74d22a53aaa560937d5c099b0c6c96b4eaf90313
RWSE3ohX2g5d/Vwc1UzEV9pIJA5rWmaRZc8IpLI9qHccijc2t3ALd+35HKL+AVfEM7OUAxIJysdLm2SYEZUOSwMz1UFNiFGfaAA=
SHA256 (Pkgfile) = 04977f3a699b1d1bbb02b5c0c81684ac89c3e01a130c28137a4a0d970a239556
SHA256 (.footprint) = 607e89fc430bfead2f72078abeca2ce514c27bcfe397ea1f3b2ecfc0f8504223
SHA256 (vkd3d-1.2.tar.xz) = b04b030fcbf0f2dacc933c76c74b449bffef1fc1a18d50254ef1ad3e380df96b

14
vkd3d/Pkgfile
View File

@ -1,21 +1,17 @@
# Description: Direct3D 12 to Vulkan translation library By WineHQ.
# URL: https://github.com/d3d12/vkd3d
# Maintainer: Danny Rawlins, crux at romster dot me
# Depends on: spirv-headers vulkan-loader xorg-xcb-util-keysyms
# Depends on: spirv-tools vulkan-loader xorg-xcb-util-keysyms
name=vkd3d
version=1.1
release=3
source=(https://dl.winehq.org/vkd3d/source/$name-$version.tar.xz
vulkan-headers.patch)
version=1.2
release=1
source=(https://dl.winehq.org/vkd3d/source/$name-$version.tar.xz)
build() {
cd $name-$version
patch -p1 -i $SRC/vulkan-headers.patch
./configure --prefix=/usr
./configure --prefix=/usr --with-spirv-tools
make
make DESTDIR=$PKG install
}

24
vkd3d/vulkan-headers.patch
View File

@ -1,24 +0,0 @@
https://github.com/d3d12/vkd3d/commit/8e7bf8a5c3e004763a62822ff2d79cf76907b712
vkd3d: Do not use VK_PIPELINE_BIND_POINT_RANGE_SIZE.
These constants were removed in Vulkan 1.2.140 headers.
diff -pruN vkd3d-1.1.orig/libs/vkd3d/vkd3d_private.h vkd3d-1.1/libs/vkd3d/vkd3d_private.h
--- vkd3d-1.1.orig/libs/vkd3d/vkd3d_private.h 2020-08-18 17:10:16.429411508 +1000
+++ vkd3d-1.1/libs/vkd3d/vkd3d_private.h 2020-08-18 17:17:39.520672309 +1000
@@ -49,6 +49,8 @@
#define VKD3D_MAX_SHADER_STAGES 5u
+#define VKD3D_PIPELINE_BIND_POINT_COUNT 2u
+
struct d3d12_command_list;
struct d3d12_device;
@@ -677,7 +679,7 @@ struct d3d12_command_list
VkFramebuffer current_framebuffer;
VkPipeline current_pipeline;
VkRenderPass current_render_pass;
- struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
+ struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT];
struct d3d12_pipeline_state *state;

6
vulkan-headers/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/eyF1GXL4SbY7P3dsRiZW97YF8eicRNKxPzhuU4AYfqK8HKlC37kpgwgnaK6udKOoo5j2nb1ZDQK8D89ieifdwU=
SHA256 (Pkgfile) = d3450b0d4695a17b98c95c72aa2be5821b63f8db651c8dcf644cd20f52728139
RWSE3ohX2g5d/bfjhpgpSG+vpELZZBRlbZCkaPTiOxDZo3WsSY3utORqHvRg5OwV9ZejySxvygOAa/Vu4Ir7HiizBwAkXqzVBQY=
SHA256 (Pkgfile) = 35ca98da3e1b6802a1119fdb6b118de5c554facb2db99f0939007148b7107a6a
SHA256 (.footprint) = effd18e132c150c8a69399e92fd4eeed22b5271d37121dd6248212ff0043d3d5
SHA256 (Vulkan-Headers-v1.2.148.tar.gz) = fecaa9af5f7c4d85abdbbe2a63d4b8ebdf48a532e992710ba204d5dfa7513866
SHA256 (Vulkan-Headers-sdk-1.2.154.0.tar.gz) = a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9

6
vulkan-headers/Pkgfile
View File

@ -4,12 +4,12 @@
# Depends on: cmake ninja
name=vulkan-headers
version=1.2.148
version=1.2.154.0
release=1
source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/v$version/Vulkan-Headers-v$version.tar.gz)
source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$version/Vulkan-Headers-sdk-$version.tar.gz)
build() {
cmake -SVulkan-Headers-$version -Bbuild -GNinja \
cmake -SVulkan-Headers-sdk-$version -Bbuild -GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release

4
vulkan-loader/.footprint
View File

@ -1,7 +1,7 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libvulkan.so -> libvulkan.so.1
lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.148
-rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.148
lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.154
-rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.154
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/vulkan.pc

8
vulkan-loader/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RWZ9duBFz9vekeHvDjTnFjsh1M8SUC6kuPZbU7eDo+mcf5j9VMA82o70Y240uhIoXEu6b705kFnw72Y+6DW7go=
SHA256 (Pkgfile) = 5b5449ff8cb6677ffca140543dffbde4a10216bf2bc6a3a6f41068b01731f7a1
SHA256 (.footprint) = 3c43fc6a02b85596541a1148d6a4a54b93e33a19086904aa9cb6585b5a5e1e4c
SHA256 (Vulkan-Loader-v1.2.148.tar.gz) = 8f4dca3d125965dcb4c4f19ff9dddae893b5f071d63cfd9e47658ccae2414843
RWSE3ohX2g5d/XZzvne3ZhNSYL//ZM/JMpUOwAlw7ddlluNMwt4N7i0A/qpmHUbqHhvtncJxNHvhTT1k6IB3IPNzD/U9Pov0Ogc=
SHA256 (Pkgfile) = 168d3b511297f39980c32d170b96f669f26f64f35db7299e2d5626def061e2b4
SHA256 (.footprint) = af7e63f64dd91074d8024bf68de7d3b0ab929a5776c1d786aa0cb5498e12e4b6
SHA256 (Vulkan-Loader-sdk-1.2.154.0.tar.gz) = 418017d7bab907e72291476df231dd0e7dc7fe20b97e55389c975bcfc48d6433

6
vulkan-loader/Pkgfile
View File

@ -4,12 +4,12 @@
# Depends on: vulkan-headers xorg-libxrandr
name=vulkan-loader
version=1.2.148
version=1.2.154.0
release=1
source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/v$version/Vulkan-Loader-v$version.tar.gz)
source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$version/Vulkan-Loader-sdk-$version.tar.gz)
build() {
cmake -SVulkan-Loader-$version -Bbuild -GNinja \
cmake -SVulkan-Loader-sdk-$version -Bbuild -GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \

6
vulkan-tools/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/VYefMormjmcjDX2fNS/7h+EK2dG9q91Q0xYfWen8pyYplhqJ34EAGfyUhIY25eN/Y9ZBU4qyil0qIETH2EUUgw=
SHA256 (Pkgfile) = 8d9f9f8ed630701ce1e22d751ae4b263b8af97175db6541adfe862875b030a85
RWSE3ohX2g5d/RgLFzOEBsUXRvZ3it02TZov2iWpEkk3TCYU6NPd/lssrtk8qKN5SKSx0ohTAqv4pbSRgHmtKPysFJo53+B/JwY=
SHA256 (Pkgfile) = ba8d9af417874baa8d3f2c1cd99265e5f95dfdff86c2f80a9cf3e3a4de08ae2c
SHA256 (.footprint) = 2193acbc7cabcf79829a7caf3821d84e01bc4e695a36a948b8eb4379bbf8150f
SHA256 (Vulkan-Tools-v1.2.147.tar.gz) = 9f6aa9dd3ea4fbd9e33636aac492512e04590c5468d0d448987ffeddb22b4205
SHA256 (Vulkan-Tools-sdk-1.2.154.0.tar.gz) = c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272

10
vulkan-tools/Pkgfile
View File

@ -2,14 +2,15 @@
# URL: https://www.khronos.org/vulkan/
# Maintainer: Danny Rawlins, crux at romster dot me
# Depends on: glslang vulkan-loader
# Optional: wayland
name=vulkan-tools
version=1.2.147
version=1.2.154.0
release=1
source=(https://github.com/KhronosGroup/Vulkan-Tools/archive/v$version/Vulkan-Tools-v$version.tar.gz)
source=(https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$version/Vulkan-Tools-sdk-$version.tar.gz)
build() {
cmake -SVulkan-Tools-$version -Bbuild -GNinja \
cmake -SVulkan-Tools-sdk-$version -Bbuild -GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DGLSLANG_INSTALL_DIR=/usr \
@ -19,7 +20,8 @@ build() {
-DBUILD_WSI_XCB_SUPPORT=True \
-DBUILD_WSI_XLIB_SUPPORT=True \
-DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \
-DBUILD_ICD=OFF
-DBUILD_ICD=OFF \
-Wno-dev
cmake --build build
DESTDIR=$PKG cmake --install build

6
vulkan-validation-layers/.footprint
View File

@ -27,8 +27,10 @@ drwxr-xr-x root/root usr/include/vulkan/
-rw-r--r-- root/root usr/include/vulkan/xxhash.c
-rw-r--r-- root/root usr/include/vulkan/xxhash.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so
-rwxr-xr-x root/root usr/lib/libVkLayer_utils.so
lrwxrwxrwx root/root usr/lib/libVkLayer_khronos_validation.so -> libVkLayer_khronos_validation.so.1
lrwxrwxrwx root/root usr/lib/libVkLayer_khronos_validation.so.1 -> libVkLayer_khronos_validation.so.1.2.154.0
-rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so.1.2.154.0
-rw-r--r-- root/root usr/lib/libVkLayer_utils.a
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/vulkan/
drwxr-xr-x root/root usr/share/vulkan/explicit_layer.d/

11
vulkan-validation-layers/.signature
View File

@ -1,7 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/ZlIqDQS6fSeX0oW9N4euIMOoktI1Ho5OMUa4p7E5bHndAQCNwUv1xw0UIYf9E3mbnWc80VJSPUnxb07dHKwrAQ=
SHA256 (Pkgfile) = cf8a58f5bb2735a87d475a29dfc6feb7b0556f1fb4cd56c79a5e653e0be63999
SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f
SHA256 (Vulkan-ValidationLayers-v1.2.141.tar.gz) = 3f2ebc5c0d69ead2031893f5c5da9bb4f328a90d30c1665a618a637a48d27ee0
SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0
SHA256 (16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch) = cb8d8bb4526c57460d7f8cdc3c09c4360fdf1f1bce7f3505d52aab0363af1c8a
RWSE3ohX2g5d/XLGF0AxyYxcIhn8pE/oidODQHy1G4V2hl9za4bdmd9+7K4765csaVDwLFhOXl4KWrHJ0V14TI5+c3WQd8Fp0g4=
SHA256 (Pkgfile) = 4ab298630f0f3a91a060145039c8b6f85cbc88c471bc59792f71282fc3c54a18
SHA256 (.footprint) = f4a25e1503aed06fc0fb6d40e813696ede69afecbcd3e20de97d66629a99b265
SHA256 (Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9
SHA256 (validation-layers-soversion.patch) = 55fa92f03aa5d126db2ab75fb06ea9102019eb68437d9720a8c075a87f3baba8

30
vulkan-validation-layers/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch
View File

@ -1,30 +0,0 @@
From 16d17ebf3762f24b3eb06e04843efb7f7dbf8438 Mon Sep 17 00:00:00 2001
From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Date: Tue, 10 Dec 2019 11:23:23 -0800
Subject: [PATCH] build: Fix Vulkan registry detection
Fix incomplete VULKAN_REGISTRY_PATH_HINT for the case where
VULKAN_HEADERS_INSTALL_DIR is not specified. The hint extracted the
DIRECTORY of the include dir (e.g. "/usr"), but missed the rest of the
expected path for finding vk.xml (e.g. "/usr/share/vulkan/registry").
Tested with CMake 3.16.0.
Fixes: 18664450a ("build: Fix Vulkan headers detection with CMake.")
---
cmake/FindVulkanHeaders.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindVulkanHeaders.cmake b/cmake/FindVulkanHeaders.cmake
index 68e261159..1c71ffe10 100644
--- a/cmake/FindVulkanHeaders.cmake
+++ b/cmake/FindVulkanHeaders.cmake
@@ -76,7 +76,7 @@ else()
# do a normal search without hints.
find_path(VulkanHeaders_INCLUDE_DIR NAMES vulkan/vulkan.h)
get_filename_component(VULKAN_REGISTRY_PATH_HINT ${VulkanHeaders_INCLUDE_DIR} DIRECTORY)
- find_path(VulkanRegistry_DIR NAMES vk.xml HINTS ${VULKAN_REGISTRY_PATH_HINT})
+ find_path(VulkanRegistry_DIR NAMES vk.xml HINTS /usr/share/vulkan/registry)
endif()
set(VulkanHeaders_INCLUDE_DIRS ${VulkanHeaders_INCLUDE_DIR})

17
vulkan-validation-layers/Pkgfile
View File

@ -4,25 +4,26 @@
# Depends on: glslang vulkan-loader
name=vulkan-validation-layers
version=1.2.141
version=1.2.154.0
release=1
source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v$version/Vulkan-ValidationLayers-v$version.tar.gz
fix_shared.patch
16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch)
source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-sdk-$version.tar.gz
validation-layers-soversion.patch)
build() {
patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/fix_shared.patch
patch -d Vulkan-ValidationLayers-$version -p1 -i $SRC/16d17ebf3762f24b3eb06e04843efb7f7dbf8438.patch
patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/validation-layers-soversion.patch
cmake -SVulkan-ValidationLayers-$version -Bbuild -GNinja \
cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \
-DCMAKE_INSTALL_PREFIX='/usr' \
-DCMAKE_INSTALL_LIBDIR='lib' \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DBUILD_TESTS=OFF \
-DGLSLANG_INSTALL_DIR='/usr' \
-DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \
-DBUILD_LAYER_SUPPORT_FILES=ON \
-DVKLAYERS_SOVERSION='1' \
-DVKLAYERS_VERSION="$version" \
-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv/' \
-DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \
-DBUILD_WSI_XCB_SUPPORT=ON \
-DBUILD_WSI_XLIB_SUPPORT=ON \
-DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \

12
vulkan-validation-layers/fix_shared.patch
View File

@ -1,12 +0,0 @@
diff -up Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt
--- Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma 2019-02-13 09:20:44.590959278 +1000
+++ Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt 2019-02-13 09:21:29.178151673 +1000
@@ -294,7 +294,7 @@ set_target_properties(generate_helper_fi
# files directly in layers.
add_library(VkLayer_utils
- STATIC
+ SHARED
layers/vk_layer_config.cpp
layers/vk_layer_extension_utils.cpp
layers/vk_layer_utils.cpp

28
vulkan-validation-layers/validation-layers-soversion.patch Normal file
View File

@ -0,0 +1,28 @@
Index: Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt 2019-09-25 12:25:23.778410890 +0200
@@ -27,6 +27,9 @@
enable_testing()
+set(VKLAYERS_VERSION "1.0.0" CACHE STRING "Build version")
+set(VKLAYERS_SOVERSION "1" CACHE STRING "Library API version")
+
# User-interface declarations ----------------------------------------------------------------------------------------------------
# This section contains variables that affect development GUIs (e.g. CMake GUI and IDEs), such as option(), folders, and variables
# with the CACHE property.
Index: Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt 2019-09-25 12:25:23.779410888 +0200
@@ -133,6 +133,9 @@
else(UNIX AND NOT APPLE) # i.e.: Linux
macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS)
add_library(VkLayer_${target} SHARED ${ARGN})
+ set_target_properties(VkLayer_${target} PROPERTIES
+ VERSION ${VKLAYERS_VERSION}
+ SOVERSION ${VKLAYERS_SOVERSION})
target_compile_definitions(VkLayer_${target} PUBLIC ${LAYER_COMPILE_DEFINITIONS})
target_link_libraries(VkLayer_${target} PRIVATE VkLayer_utils)
add_dependencies(VkLayer_${target} VkLayer_utils)

7
xfsprogs/.footprint
View File

@ -52,14 +52,19 @@ drwxr-xr-x root/root usr/share/man/man2/
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_bulkstat.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fsbulkstat.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fscounts.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fsgeometry.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fsgetxattr.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fsgetxattra.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fsinumbers.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fsop_geometry.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_fssetxattr.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_getbmap.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_getbmapa.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_getbmapx.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_getresblks.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_goingdown.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_inumbers.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_scrub_metadata.2.gz
-rw-r--r-- root/root usr/share/man/man2/ioctl_xfs_setresblks.2.gz
drwxr-xr-x root/root usr/share/man/man3/
lrwxrwxrwx root/root usr/share/man/man3/attr_list_by_handle.3.gz -> path_to_handle.3.gz
lrwxrwxrwx root/root usr/share/man/man3/attr_multi_by_handle.3.gz -> path_to_handle.3.gz

8
xfsprogs/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/XYA/y5Vq9EXadm+hWEAEBGOIZ2VvLS9wrZsNchriWYIYRKcA62sguhtA5jKiHIWVI5MWrtS9zq8/k8+8UxEOgE=
SHA256 (Pkgfile) = b254293f053653390ed016b6038186719d547cd1d5a075e5d42ff4837255b803
SHA256 (.footprint) = c050ba8335fd0014bdd2d9e8a5fbfe547d73336c27aa43509bbf8ce4cb17e2d3
SHA256 (xfsprogs-5.8.0.tar.xz) = 8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b
RWSE3ohX2g5d/fPn4m/gPSxlD7q4ZE3Wwbaq/poDTbrGWpI1Wj+yT6IgQ9goiN0HZyNf/CDcnVh5f+6f43bGY0mgaFmzMTqm/Qs=
SHA256 (Pkgfile) = 40ff65a4a95ceac1f73e72a40dc9d2e176005dd67ed3dfdee1f1651c32061ab5
SHA256 (.footprint) = 39739b70c8f8dd33bab25ef1c7097731a2455b0903b06d24bfc7b7d4f5656687
SHA256 (xfsprogs-5.9.0.tar.xz) = bc5c805596bc609a18dc1f1b4ed6a2821dba9f47408ec00e7799ceea1b2097f1

2
xfsprogs/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: libdevmapper
name=xfsprogs
version=5.8.0
version=5.9.0
release=1
source=(https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$name-$version.tar.xz)