diff --git a/_service b/_service index 3810b06..3467264 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - v2018.4 - v2018.4 - 2018.4.g@TAG_OFFSET@ + v2018.6 + v2018.6 + 2018.6.g@TAG_OFFSET@ *.tar diff --git a/baselibs.conf b/baselibs.conf index 8b6b4b9..e97dc51 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libSPIRV-Tools-suse7 +libSPIRV-Tools-suse8 spirv-tools-devel diff --git a/spirv-tools-2018.4.g0.tar.xz b/spirv-tools-2018.4.g0.tar.xz deleted file mode 100644 index aaafe75..0000000 --- a/spirv-tools-2018.4.g0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9ef3b163f918543b048a2c0a0f04a4090df1e7080f7db9256a0034ff412d55f -size 909184 diff --git a/spirv-tools-2018.6.g0.tar.xz b/spirv-tools-2018.6.g0.tar.xz new file mode 100644 index 0000000..cebab4d --- /dev/null +++ b/spirv-tools-2018.6.g0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d103d6f25eb55b3500a7679d342fe9faad4720e6c4baf298510b0f52881fe484 +size 949676 diff --git a/spirv-tools.changes b/spirv-tools.changes index 9a2d80b..b258466 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 10 12:24:41 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 2018.6 + * Added support for the Nvidia Turing and ray tracing extensions. + ------------------------------------------------------------------- Fri Aug 24 19:05:26 UTC 2018 - jengelh@inai.de diff --git a/spirv-tools.spec b/spirv-tools.spec index 2980280..657abfc 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define version_unconverted 2018.4.g0 -%define lname libSPIRV-Tools-suse7 +%define version_unconverted 2018.6.g0 +%define lname libSPIRV-Tools-suse8 Name: spirv-tools -Version: 2018.4.g0 +Version: 2018.6.g0 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -37,7 +37,7 @@ BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.3.g0 +BuildRequires: spirv-headers >= 1.3.g44 %description The package includes an assembler, binary module parser, diff --git a/ver.diff b/ver.diff index 60776af..592d2fb 100644 --- a/ver.diff +++ b/ver.diff @@ -10,59 +10,59 @@ Unversioned libraries suck! source/opt/CMakeLists.txt | 1 + 4 files changed, 5 insertions(+) -Index: spirv-tools-2018.2/source/CMakeLists.txt +Index: spirv-tools-2018.6.g0/source/CMakeLists.txt =================================================================== ---- spirv-tools-2018.2.orig/source/CMakeLists.txt -+++ spirv-tools-2018.2/source/CMakeLists.txt -@@ -331,6 +331,7 @@ set_source_files_properties( - PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") +--- spirv-tools-2018.6.g0.orig/source/CMakeLists.txt ++++ spirv-tools-2018.6.g0/source/CMakeLists.txt +@@ -348,6 +348,7 @@ set_source_files_properties( + spvtools_pch(SPIRV_SOURCES pch_source) add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse7) ++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse8) spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC ${spirv-tools_SOURCE_DIR}/include -@@ -341,6 +342,7 @@ set_property(TARGET ${SPIRV_TOOLS} PROPE +@@ -358,6 +359,7 @@ set_property(TARGET ${SPIRV_TOOLS} PROPE spvtools_check_symbol_exports(${SPIRV_TOOLS}) add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse7) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse8) spvtools_default_compile_options(${SPIRV_TOOLS}-shared) target_include_directories(${SPIRV_TOOLS}-shared PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2018.2/source/comp/CMakeLists.txt +Index: spirv-tools-2018.6.g0/source/comp/CMakeLists.txt =================================================================== ---- spirv-tools-2018.2.orig/source/comp/CMakeLists.txt -+++ spirv-tools-2018.2/source/comp/CMakeLists.txt -@@ -14,6 +14,7 @@ - - if(SPIRV_BUILD_COMPRESSION) - add_library(SPIRV-Tools-comp markv_codec.cpp) -+ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse7) +--- spirv-tools-2018.6.g0.orig/source/comp/CMakeLists.txt ++++ spirv-tools-2018.6.g0/source/comp/CMakeLists.txt +@@ -29,6 +29,7 @@ if(SPIRV_BUILD_COMPRESSION) + move_to_front.h + move_to_front.cpp) ++ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse8) spvtools_default_compile_options(SPIRV-Tools-comp) target_include_directories(SPIRV-Tools-comp -Index: spirv-tools-2018.2/source/link/CMakeLists.txt + PUBLIC ${spirv-tools_SOURCE_DIR}/include +Index: spirv-tools-2018.6.g0/source/link/CMakeLists.txt =================================================================== ---- spirv-tools-2018.2.orig/source/link/CMakeLists.txt -+++ spirv-tools-2018.2/source/link/CMakeLists.txt +--- spirv-tools-2018.6.g0.orig/source/link/CMakeLists.txt ++++ spirv-tools-2018.6.g0/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse7) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse8) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: spirv-tools-2018.2/source/opt/CMakeLists.txt +Index: spirv-tools-2018.6.g0/source/opt/CMakeLists.txt =================================================================== ---- spirv-tools-2018.2.orig/source/opt/CMakeLists.txt -+++ spirv-tools-2018.2/source/opt/CMakeLists.txt -@@ -157,6 +157,7 @@ add_library(SPIRV-Tools-opt - workaround1209.cpp - ) +--- spirv-tools-2018.6.g0.orig/source/opt/CMakeLists.txt ++++ spirv-tools-2018.6.g0/source/opt/CMakeLists.txt +@@ -194,6 +194,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse7) + add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES}) + ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse8) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC ${spirv-tools_SOURCE_DIR}/include