From 82aea68806f79354fd3857b8be500a003cc147dda8c5003e3c37dde913a5a19d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Mar 2018 00:36:56 +0000 Subject: [PATCH] - Update to new upstream release 2018.2 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=23 --- _service | 6 ++--- baselibs.conf | 2 +- spirv-tools-2018.0.tar.xz | 3 --- spirv-tools-2018.2.tar.xz | 3 +++ spirv-tools.changes | 7 ++++++ spirv-tools.spec | 11 +++++---- ver.diff | 48 +++++++++++++++++++++++---------------- 7 files changed, 49 insertions(+), 31 deletions(-) delete mode 100644 spirv-tools-2018.0.tar.xz create mode 100644 spirv-tools-2018.2.tar.xz diff --git a/_service b/_service index b0aff83..ce77fb6 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - v2018.0 - v2018.0 - 2018.0 + v2018.2 + v2018.2 + 2018.2 *.tar diff --git a/baselibs.conf b/baselibs.conf index 4cd4475..e24d3b7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libSPIRV-Tools-suse5 +libSPIRV-Tools-suse6 diff --git a/spirv-tools-2018.0.tar.xz b/spirv-tools-2018.0.tar.xz deleted file mode 100644 index 3c54e08..0000000 --- a/spirv-tools-2018.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5dbc7474636266cf34762244e31f303d497be230286469ad26ac82d2fd005a0 -size 663044 diff --git a/spirv-tools-2018.2.tar.xz b/spirv-tools-2018.2.tar.xz new file mode 100644 index 0000000..9097d18 --- /dev/null +++ b/spirv-tools-2018.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:288192fc724b92445f87ffdaa35fce2151df2c06ef09ca1a57a7bbfc351c5aab +size 722924 diff --git a/spirv-tools.changes b/spirv-tools.changes index 611c9f1..d02a5ae 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 8 00:14:25 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 2018.2 + * SubgroupBallotKHR can enable SubgroupSize & SubgroupLocalInvocationId + * Support SPIR-V 1.3 and Vulkan 1.1 + ------------------------------------------------------------------- Wed Feb 7 22:22:02 UTC 2018 - jengelh@inai.de diff --git a/spirv-tools.spec b/spirv-tools.spec index 56bfe42..588737a 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -16,11 +16,11 @@ # -%define version_unconverted 2018.0 -%define lname libSPIRV-Tools-suse5 +%define version_unconverted 2018.2 +%define lname libSPIRV-Tools-suse6 Name: spirv-tools -Version: 2018.0 +Version: 2018.2 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.2.g22 +BuildRequires: spirv-headers >= 1.3.g0 %description The package includes an assembler, binary module parser, @@ -87,13 +87,16 @@ make %{?_smp_mflags} %_libdir/libSPIRV-Tools-comp.so.* %_libdir/libSPIRV-Tools-link.so.* %_libdir/libSPIRV-Tools-opt.so.* +%_libdir/libSPIRV-Tools-shared.so.* %files devel %_libdir/libSPIRV-Tools.so %_libdir/libSPIRV-Tools-comp.so %_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-opt.so +%_libdir/libSPIRV-Tools-shared.so %_libdir/pkgconfig/SPIRV-Tools.pc +%_libdir/pkgconfig/SPIRV-Tools-shared.pc %_includedir/spirv-tools/ %changelog diff --git a/ver.diff b/ver.diff index 6a77885..57dc768 100644 --- a/ver.diff +++ b/ver.diff @@ -4,57 +4,65 @@ Date: 2016-06-13 11:46:16.846841814 +0200 Unversioned libraries suck! --- - source/CMakeLists.txt | 1 + + source/CMakeLists.txt | 2 ++ source/comp/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + - 4 files changed, 4 insertions(+) + 4 files changed, 5 insertions(+) -Index: spirv-tools-2018.0.g0/source/CMakeLists.txt +Index: spirv-tools-2018.2/source/CMakeLists.txt =================================================================== ---- spirv-tools-2018.0.g0.orig/source/CMakeLists.txt -+++ spirv-tools-2018.0.g0/source/CMakeLists.txt -@@ -324,6 +324,7 @@ set_source_files_properties( +--- 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}") add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse5) ++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse6) spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2018.0.g0/source/comp/CMakeLists.txt +@@ -341,6 +342,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 suse6) + 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 =================================================================== ---- spirv-tools-2018.0.g0.orig/source/comp/CMakeLists.txt -+++ spirv-tools-2018.0.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 suse5) ++ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse6) spvtools_default_compile_options(SPIRV-Tools-comp) target_include_directories(SPIRV-Tools-comp -Index: spirv-tools-2018.0.g0/source/link/CMakeLists.txt +Index: spirv-tools-2018.2/source/link/CMakeLists.txt =================================================================== ---- spirv-tools-2018.0.g0.orig/source/link/CMakeLists.txt -+++ spirv-tools-2018.0.g0/source/link/CMakeLists.txt +--- spirv-tools-2018.2.orig/source/link/CMakeLists.txt ++++ spirv-tools-2018.2/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse5) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse6) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: spirv-tools-2018.0.g0/source/opt/CMakeLists.txt +Index: spirv-tools-2018.2/source/opt/CMakeLists.txt =================================================================== ---- spirv-tools-2018.0.g0.orig/source/opt/CMakeLists.txt -+++ spirv-tools-2018.0.g0/source/opt/CMakeLists.txt -@@ -142,6 +142,7 @@ add_library(SPIRV-Tools-opt +--- 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 ) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse5) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse6) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC ${spirv-tools_SOURCE_DIR}/include