diff --git a/_service b/_service index 0adb3b2..28c4b7b 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - 2ac348b5 - 61dfd8492b6e324f684863ecbd79c299a06e6517 - 2019.2.git@TAG_OFFSET@ + 2c0111e6eba779cf30e8c7f5a733ea0762895ba0 + 84aa4946edb7e9b50d9625e2288ecf3e0ddf9327 + 2019.4~git@TAG_OFFSET@ *.tar diff --git a/baselibs.conf b/baselibs.conf index fd14860..9a93308 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse11 +libSPIRV-Tools-suse12 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse11- = " + requires "libSPIRV-Tools-suse12- = " diff --git a/spirv-tools-2019.2.git25.tar.xz b/spirv-tools-2019.2.git25.tar.xz deleted file mode 100644 index 9767c7d..0000000 --- a/spirv-tools-2019.2.git25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65cb75a277b913596e9bdafccb90b177e8a5836265b524ff47170190c62d588a -size 1057564 diff --git a/spirv-tools-2019.4~git33.tar.xz b/spirv-tools-2019.4~git33.tar.xz new file mode 100644 index 0000000..f8c3f0a --- /dev/null +++ b/spirv-tools-2019.4~git33.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:289010824cf954659996e5c6af675f901a11a1126dc3a02e4a43e288fe5e6886 +size 1041040 diff --git a/spirv-tools.changes b/spirv-tools.changes index a1a8bc7..43701ce 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 4 12:23:07 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 2019.4~git33 + * Support SPIR-V 1.4 + * Add library for spirv-fuzz + * Add spirv-fuzz tool. + * Add "split block" transformation. + * Add validation for SPV_EXT_fragment_shader_interlock + ------------------------------------------------------------------- Sun Mar 17 13:25:59 UTC 2019 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 31842fc..9ae0cfe 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -16,11 +16,11 @@ # -%define version_unconverted 2019.2.git25 -%define lname libSPIRV-Tools-suse11 +%define version_unconverted 2019.4~git33 +%define lname libSPIRV-Tools-suse12 Name: spirv-tools -Version: 2019.2.git25 +Version: 2019.4~git33 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -70,7 +70,7 @@ integration into other code bases directly. %autopatch -p1 %build -%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" -DSPIRV_BUILD_COMPRESSION=BOOL:ON +%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" make %{?_smp_mflags} %install @@ -85,7 +85,6 @@ make %{?_smp_mflags} %files -n %lname %_libdir/libSPIRV-Tools.so.* -%_libdir/libSPIRV-Tools-comp.so.* %_libdir/libSPIRV-Tools-link.so.* %_libdir/libSPIRV-Tools-opt.so.* %_libdir/libSPIRV-Tools-reduce.so.* @@ -93,7 +92,6 @@ make %{?_smp_mflags} %files devel %_libdir/libSPIRV-Tools.so -%_libdir/libSPIRV-Tools-comp.so %_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-opt.so %_libdir/libSPIRV-Tools-reduce.so diff --git a/ver.diff b/ver.diff index d73b82e..899df7d 100644 --- a/ver.diff +++ b/ver.diff @@ -5,77 +5,77 @@ Unversioned libraries suck! --- source/CMakeLists.txt | 2 ++ - source/comp/CMakeLists.txt | 1 + + source/fuzz/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + source/reduce/CMakeLists.txt | 1 + 5 files changed, 6 insertions(+) -Index: spirv-tools-2019.1/source/CMakeLists.txt +Index: spirv-tools-2019.4~git33/source/CMakeLists.txt =================================================================== ---- spirv-tools-2019.1.orig/source/CMakeLists.txt -+++ spirv-tools-2019.1/source/CMakeLists.txt -@@ -335,6 +335,7 @@ set_source_files_properties( +--- spirv-tools-2019.4~git33.orig/source/CMakeLists.txt ++++ spirv-tools-2019.4~git33/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 suse11) ++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse12) spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC ${spirv-tools_SOURCE_DIR}/include -@@ -346,6 +347,7 @@ spvtools_check_symbol_exports(${SPIRV_TO +@@ -347,6 +348,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 suse11) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse12) spvtools_default_compile_options(${SPIRV_TOOLS}-shared) target_include_directories(${SPIRV_TOOLS}-shared PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2019.1/source/comp/CMakeLists.txt +Index: spirv-tools-2019.4~git33/source/fuzz/CMakeLists.txt =================================================================== ---- spirv-tools-2019.1.orig/source/comp/CMakeLists.txt -+++ spirv-tools-2019.1/source/comp/CMakeLists.txt -@@ -29,6 +29,7 @@ if(SPIRV_BUILD_COMPRESSION) - move_to_front.h - move_to_front.cpp) +--- 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) + spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) -+ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse11) - spvtools_default_compile_options(SPIRV-Tools-comp) - target_include_directories(SPIRV-Tools-comp - PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2019.1/source/link/CMakeLists.txt + add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES}) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse12) + + 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 =================================================================== ---- spirv-tools-2019.1.orig/source/link/CMakeLists.txt -+++ spirv-tools-2019.1/source/link/CMakeLists.txt +--- spirv-tools-2019.4~git33.orig/source/link/CMakeLists.txt ++++ spirv-tools-2019.4~git33/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse11) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse12) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: spirv-tools-2019.1/source/opt/CMakeLists.txt +Index: spirv-tools-2019.4~git33/source/opt/CMakeLists.txt =================================================================== ---- spirv-tools-2019.1.orig/source/opt/CMakeLists.txt -+++ spirv-tools-2019.1/source/opt/CMakeLists.txt -@@ -202,6 +202,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch +--- 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 add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse11) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse12) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2019.1/source/reduce/CMakeLists.txt +Index: spirv-tools-2019.4~git33/source/reduce/CMakeLists.txt =================================================================== ---- spirv-tools-2019.1.orig/source/reduce/CMakeLists.txt -+++ spirv-tools-2019.1/source/reduce/CMakeLists.txt -@@ -58,6 +58,7 @@ target_include_directories(SPIRV-Tools-r +--- spirv-tools-2019.4~git33.orig/source/reduce/CMakeLists.txt ++++ spirv-tools-2019.4~git33/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 suse11) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse12) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS}