pool/spirv-tools
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 584122 from X11:Wayland

Browse Source 
- Update to new upstream release 2018.2

OBS-URL: https://build.opensuse.org/request/show/584122
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spirv-tools?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2018-03-12 11:07:25 +00:00 committed by Git OBS Bridge
commit edccc89002
7 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -3,9 +3,9 @@
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/SPIRV-Tools</param> <param name="url">https://github.com/KhronosGroup/SPIRV-Tools</param>
<param name="filename">spirv-tools</param> <param name="filename">spirv-tools</param>
<param name="revision">v2018.0</param> <param name="revision">v2018.2</param>
<param name="parent-tag">v2018.0</param> <param name="parent-tag">v2018.2</param>
<param name="versionformat">2018.0</param> <param name="versionformat">2018.2</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

2
baselibs.conf
View File

@ -1 +1 @@
libSPIRV-Tools-suse5 libSPIRV-Tools-suse6

3
spirv-tools-2018.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5dbc7474636266cf34762244e31f303d497be230286469ad26ac82d2fd005a0
size 663044

3
spirv-tools-2018.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:288192fc724b92445f87ffdaa35fce2151df2c06ef09ca1a57a7bbfc351c5aab
size 722924

7
spirv-tools.changes
View File

@ -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 Wed Feb 7 22:22:02 UTC 2018 - jengelh@inai.de

11
spirv-tools.spec
View File

@ -16,11 +16,11 @@
# #
%define version_unconverted 2018.0 %define version_unconverted 2018.2
%define lname libSPIRV-Tools-suse5 %define lname libSPIRV-Tools-suse6
Name: spirv-tools Name: spirv-tools
Version: 2018.0 Version: 2018.2
Release: 0 Release: 0
Summary: API and commands for processing SPIR-V modules Summary: API and commands for processing SPIR-V modules
License: Apache-2.0 License: Apache-2.0
@ -37,7 +37,7 @@ BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: python3-xml BuildRequires: python3-xml
BuildRequires: spirv-headers >= 1.2.g22 BuildRequires: spirv-headers >= 1.3.g0
%description %description
The package includes an assembler, binary module parser, The package includes an assembler, binary module parser,
@ -87,13 +87,16 @@ make %{?_smp_mflags}
%_libdir/libSPIRV-Tools-comp.so.* %_libdir/libSPIRV-Tools-comp.so.*
%_libdir/libSPIRV-Tools-link.so.* %_libdir/libSPIRV-Tools-link.so.*
%_libdir/libSPIRV-Tools-opt.so.* %_libdir/libSPIRV-Tools-opt.so.*
%_libdir/libSPIRV-Tools-shared.so.*
%files devel %files devel
%_libdir/libSPIRV-Tools.so %_libdir/libSPIRV-Tools.so
%_libdir/libSPIRV-Tools-comp.so %_libdir/libSPIRV-Tools-comp.so
%_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-link.so
%_libdir/libSPIRV-Tools-opt.so %_libdir/libSPIRV-Tools-opt.so
%_libdir/libSPIRV-Tools-shared.so
%_libdir/pkgconfig/SPIRV-Tools.pc %_libdir/pkgconfig/SPIRV-Tools.pc
%_libdir/pkgconfig/SPIRV-Tools-shared.pc
%_includedir/spirv-tools/ %_includedir/spirv-tools/
%changelog %changelog

48
ver.diff
View File

@ -4,57 +4,65 @@ Date: 2016-06-13 11:46:16.846841814 +0200
Unversioned libraries suck! Unversioned libraries suck!
--- ---
source/CMakeLists.txt | 1 + source/CMakeLists.txt | 2 ++
source/comp/CMakeLists.txt | 1 + source/comp/CMakeLists.txt | 1 +
source/link/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 +
source/opt/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.2.orig/source/CMakeLists.txt
+++ spirv-tools-2018.0.g0/source/CMakeLists.txt +++ spirv-tools-2018.2/source/CMakeLists.txt
@@ -324,6 +324,7 @@ set_source_files_properties( @@ -331,6 +331,7 @@ set_source_files_properties(
PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}")
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) 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}) spvtools_default_compile_options(${SPIRV_TOOLS})
target_include_directories(${SPIRV_TOOLS} target_include_directories(${SPIRV_TOOLS}
PUBLIC ${spirv-tools_SOURCE_DIR}/include 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.2.orig/source/comp/CMakeLists.txt
+++ spirv-tools-2018.0.g0/source/comp/CMakeLists.txt +++ spirv-tools-2018.2/source/comp/CMakeLists.txt
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
if(SPIRV_BUILD_COMPRESSION) if(SPIRV_BUILD_COMPRESSION)
add_library(SPIRV-Tools-comp markv_codec.cpp) 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) spvtools_default_compile_options(SPIRV-Tools-comp)
target_include_directories(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.2.orig/source/link/CMakeLists.txt
+++ spirv-tools-2018.0.g0/source/link/CMakeLists.txt +++ spirv-tools-2018.2/source/link/CMakeLists.txt
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
add_library(SPIRV-Tools-link add_library(SPIRV-Tools-link
linker.cpp 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) spvtools_default_compile_options(SPIRV-Tools-link)
target_include_directories(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.2.orig/source/opt/CMakeLists.txt
+++ spirv-tools-2018.0.g0/source/opt/CMakeLists.txt +++ spirv-tools-2018.2/source/opt/CMakeLists.txt
@@ -142,6 +142,7 @@ add_library(SPIRV-Tools-opt @@ -157,6 +157,7 @@ add_library(SPIRV-Tools-opt
workaround1209.cpp 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) spvtools_default_compile_options(SPIRV-Tools-opt)
target_include_directories(SPIRV-Tools-opt target_include_directories(SPIRV-Tools-opt
PUBLIC ${spirv-tools_SOURCE_DIR}/include PUBLIC ${spirv-tools_SOURCE_DIR}/include