From 9dd18741756284d56392fa9e80e908e0bf5c35108a2464aa59099cb050ec7f7d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Feb 2020 10:18:37 +0000 Subject: [PATCH 1/2] - Update to release 2020.1 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=48 --- _service | 6 +++--- baselibs.conf | 4 ++-- spirv-tools-2020.1~git24.tar.xz | 3 --- spirv-tools.changes | 12 ++++++++++++ spirv-tools.spec | 10 +++++----- v2020.1.tar.gz | 3 +++ ver.diff | 12 ++++++------ 7 files changed, 31 insertions(+), 19 deletions(-) delete mode 100644 spirv-tools-2020.1~git24.tar.xz create mode 100644 v2020.1.tar.gz diff --git a/_service b/_service index 1e35c90..161a6e0 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - 323a81fc - v2019.5 - 2020.1~git@TAG_OFFSET@ + v2020.1 + v2020.1 + 2020.1 *.tar diff --git a/baselibs.conf b/baselibs.conf index 57335ef..a252de7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse15 +libSPIRV-Tools-suse16 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse15- = " + requires "libSPIRV-Tools-suse16- = " diff --git a/spirv-tools-2020.1~git24.tar.xz b/spirv-tools-2020.1~git24.tar.xz deleted file mode 100644 index ce2f68b..0000000 --- a/spirv-tools-2020.1~git24.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e99e5700526c0f46fbf53d4885137c734c37e58813d0c41231ff9e6bca9cb560 -size 1380612 diff --git a/spirv-tools.changes b/spirv-tools.changes index 3607319..8ad3170 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Feb 20 10:10:56 UTC 2020 - Jan Engelhardt + +- Update to release 2020.1 + * Add spvParseVulkanEnv + * Handle TimeAMD in AmdExtensionToKhrPass + +------------------------------------------------------------------- +Thu Feb 20 10:10:29 UTC 2020 - Jan Engelhardt + +- Update to release 2020.1 + ------------------------------------------------------------------- Sun Jan 19 11:04:32 UTC 2020 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 4546c78..907b9c8 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -16,18 +16,18 @@ # -%define version_unconverted 2020.1~git24 -%define lname libSPIRV-Tools-suse15 +%define version_unconverted 2020.1 +%define lname libSPIRV-Tools-suse16 Name: spirv-tools -Version: 2020.1~git24 +Version: 2020.1 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Tools -Source: %name-%version.tar.xz +Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.tar.gz Source9: baselibs.conf Patch1: ver.diff Patch2: gcc48.diff @@ -66,7 +66,7 @@ validator, and is used in the standalone tools whilst also enabling integration into other code bases directly. %prep -%setup -q +%setup -qn SPIRV-Tools-%version %autopatch -p1 %build diff --git a/v2020.1.tar.gz b/v2020.1.tar.gz new file mode 100644 index 0000000..92999c2 --- /dev/null +++ b/v2020.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eaa5e09c638d7113b60d825e6ce44406b35031be68db894a016b5faf45de568 +size 2053947 diff --git a/ver.diff b/ver.diff index 6c67322..64d8487 100644 --- a/ver.diff +++ b/ver.diff @@ -19,7 +19,7 @@ Index: spirv-tools-2019.5~git157/source/CMakeLists.txt spvtools_pch(SPIRV_SOURCES pch_source) add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse15) ++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse16) spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC @@ -27,7 +27,7 @@ Index: spirv-tools-2019.5~git157/source/CMakeLists.txt 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 suse15) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse16) spvtools_default_compile_options(${SPIRV_TOOLS}-shared) target_include_directories(${SPIRV_TOOLS}-shared PUBLIC @@ -39,7 +39,7 @@ Index: spirv-tools-2019.5~git157/source/fuzz/CMakeLists.txt 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 suse15) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse16) spvtools_default_compile_options(SPIRV-Tools-fuzz) target_compile_definitions(SPIRV-Tools-fuzz PUBLIC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_USE_UNALIGNED=0) @@ -51,7 +51,7 @@ Index: spirv-tools-2019.5~git157/source/link/CMakeLists.txt add_library(SPIRV-Tools-link linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse15) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse16) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link @@ -63,7 +63,7 @@ Index: spirv-tools-2019.5~git157/source/opt/CMakeLists.txt add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse15) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse16) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC @@ -75,7 +75,7 @@ Index: spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt $ PRIVATE ${spirv-tools_BINARY_DIR} ) -+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse15) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse16) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS} From 624c59a63f57bbb49f00c70012e630e47fa3bfa24d00fa6f5b5a8f2effcee0a6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Feb 2020 10:18:45 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=49 --- spirv-tools.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spirv-tools.changes b/spirv-tools.changes index 8ad3170..65f36d0 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -5,11 +5,6 @@ Thu Feb 20 10:10:56 UTC 2020 - Jan Engelhardt * Add spvParseVulkanEnv * Handle TimeAMD in AmdExtensionToKhrPass -------------------------------------------------------------------- -Thu Feb 20 10:10:29 UTC 2020 - Jan Engelhardt - -- Update to release 2020.1 - ------------------------------------------------------------------- Sun Jan 19 11:04:32 UTC 2020 - Jan Engelhardt