diff --git a/_service b/_service index bdd4658..c2a7dea 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - 0cbdc7a2 + dc59b4b0 22ce39c8 2019.5~git@TAG_OFFSET@ diff --git a/baselibs.conf b/baselibs.conf index f824481..52d14b2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse13 +libSPIRV-Tools-suse14 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse13- = " + requires "libSPIRV-Tools-suse14- = " diff --git a/spirv-tools-2019.5~git11.tar.xz b/spirv-tools-2019.5~git11.tar.xz deleted file mode 100644 index f528e60..0000000 --- a/spirv-tools-2019.5~git11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70831190b0d560c2cd8f421bc7c7f2847874b4b7735f3fe6df8a6f9ff57bdaa5 -size 1132180 diff --git a/spirv-tools-2019.5~git157.tar.xz b/spirv-tools-2019.5~git157.tar.xz new file mode 100644 index 0000000..e6abf26 --- /dev/null +++ b/spirv-tools-2019.5~git157.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:449a372c4cafba048885161daa8e81372f0b37d32e5968857df7b7492ed8edff +size 1264716 diff --git a/spirv-tools.changes b/spirv-tools.changes index bcba456..4f70859 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 7 09:03:03 UTC 2019 - Jan Engelhardt + +- Update to snapshot 2019.5~git157 + * Extend reducer to remove relaxed precision decorations + * SPIRV-Tools support for SPIR-V 1.5 + * Add SPV_KHR_shader_clock validation + * Add fuzzer for spirv-dis call path + ------------------------------------------------------------------- Wed Aug 21 07:56:49 UTC 2019 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index b011796..dae5c2f 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -16,11 +16,11 @@ # -%define version_unconverted 2019.5~git11 -%define lname libSPIRV-Tools-suse13 +%define version_unconverted 2019.5~git157 +%define lname libSPIRV-Tools-suse14 Name: spirv-tools -Version: 2019.5~git11 +Version: 2019.5~git157 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -38,7 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.4.1.g30 +BuildRequires: spirv-headers >= 1.5.1.corrected %description The package includes an assembler, binary module parser, @@ -91,6 +91,7 @@ make %{?_smp_mflags} %_libdir/libSPIRV-Tools-shared.so.* %files devel +%_prefix/lib/cmake/ %_libdir/libSPIRV-Tools.so %_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-opt.so diff --git a/ver.diff b/ver.diff index 204ba6d..ba8c227 100644 --- a/ver.diff +++ b/ver.diff @@ -11,71 +11,71 @@ Unversioned libraries suck! source/reduce/CMakeLists.txt | 1 + 5 files changed, 6 insertions(+) -Index: spirv-tools-2019.4~git33/source/CMakeLists.txt +Index: spirv-tools-2019.5~git157/source/CMakeLists.txt =================================================================== ---- spirv-tools-2019.4~git33.orig/source/CMakeLists.txt -+++ spirv-tools-2019.4~git33/source/CMakeLists.txt +--- spirv-tools-2019.5~git157.orig/source/CMakeLists.txt ++++ spirv-tools-2019.5~git157/source/CMakeLists.txt @@ -336,6 +336,7 @@ set_source_files_properties( spvtools_pch(SPIRV_SOURCES pch_source) add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse13) ++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse14) spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} - PUBLIC ${spirv-tools_SOURCE_DIR}/include -@@ -347,6 +348,7 @@ spvtools_check_symbol_exports(${SPIRV_TO + PUBLIC +@@ -349,6 +350,7 @@ spvtools_check_symbol_exports(${SPIRV_TO 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 SOVERSION suse13) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse14) spvtools_default_compile_options(${SPIRV_TOOLS}-shared) target_include_directories(${SPIRV_TOOLS}-shared - PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2019.4~git33/source/fuzz/CMakeLists.txt + PUBLIC +Index: spirv-tools-2019.5~git157/source/fuzz/CMakeLists.txt =================================================================== ---- spirv-tools-2019.4~git33.orig/source/fuzz/CMakeLists.txt -+++ spirv-tools-2019.4~git33/source/fuzz/CMakeLists.txt -@@ -62,6 +62,7 @@ if(SPIRV_BUILD_FUZZER) +--- spirv-tools-2019.5~git157.orig/source/fuzz/CMakeLists.txt ++++ spirv-tools-2019.5~git157/source/fuzz/CMakeLists.txt +@@ -146,6 +146,7 @@ if(SPIRV_BUILD_FUZZER) 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 SOVERSION suse13) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse14) spvtools_default_compile_options(SPIRV-Tools-fuzz) target_compile_definitions(SPIRV-Tools-fuzz PUBLIC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_USE_UNALIGNED=0) -Index: spirv-tools-2019.4~git33/source/link/CMakeLists.txt +Index: spirv-tools-2019.5~git157/source/link/CMakeLists.txt =================================================================== ---- spirv-tools-2019.4~git33.orig/source/link/CMakeLists.txt -+++ spirv-tools-2019.4~git33/source/link/CMakeLists.txt +--- spirv-tools-2019.5~git157.orig/source/link/CMakeLists.txt ++++ spirv-tools-2019.5~git157/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse13) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse14) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: spirv-tools-2019.4~git33/source/opt/CMakeLists.txt +Index: spirv-tools-2019.5~git157/source/opt/CMakeLists.txt =================================================================== ---- spirv-tools-2019.4~git33.orig/source/opt/CMakeLists.txt -+++ spirv-tools-2019.4~git33/source/opt/CMakeLists.txt -@@ -221,6 +221,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch +--- spirv-tools-2019.5~git157.orig/source/opt/CMakeLists.txt ++++ spirv-tools-2019.5~git157/source/opt/CMakeLists.txt +@@ -231,6 +231,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse13) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse14) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt - PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2019.4~git33/source/reduce/CMakeLists.txt + PUBLIC +Index: spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt =================================================================== ---- spirv-tools-2019.4~git33.orig/source/reduce/CMakeLists.txt -+++ spirv-tools-2019.4~git33/source/reduce/CMakeLists.txt +--- spirv-tools-2019.5~git157.orig/source/reduce/CMakeLists.txt ++++ spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt @@ -83,6 +83,7 @@ target_include_directories(SPIRV-Tools-r - PUBLIC ${SPIRV_HEADER_INCLUDE_DIR} + $ PRIVATE ${spirv-tools_BINARY_DIR} ) -+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse13) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse14) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS}