Accepting request 545246 from X11:Wayland

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/545246
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spirv-tools?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2017-11-29 09:52:23 +00:00 committed by Git OBS Bridge
commit b2fbe41bea
7 changed files with 55 additions and 30 deletions

View File

@ -3,8 +3,8 @@
<param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/SPIRV-Tools</param>
<param name="filename">spirv-tools</param>
<param name="parent-tag">68c5f0436f1d4f1f137e608780190865d0b193ca</param>
<param name="versionformat">2016.7~g@TAG_OFFSET@</param>
<param name="parent-tag">d16403a</param>
<param name="versionformat">2017.0.g@TAG_OFFSET@</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>

View File

@ -1 +1 @@
libSPIRV-Tools-suse3
libSPIRV-Tools-suse4

View File

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

View File

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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Nov 17 13:32:51 UTC 2017 - jengelh@inai.de
- Update to new snapshot 2017.0.g103
* Update MARK-V to version 1.01
* Add new checks to validate arithmetics pass
* Recognize SPV_AMD_shader_fragment_mask
* Add validate logicals pass to the validator
* Detach MARK-V from the validator
-------------------------------------------------------------------
Tue Jul 18 09:01:25 UTC 2017 - jengelh@inai.de

View File

@ -16,11 +16,11 @@
#
%define version_unconverted 2016.7~g154
%define lname libSPIRV-Tools-suse3
%define version_unconverted 2017.0.g103
%define lname libSPIRV-Tools-suse4
Name: spirv-tools
Version: 2016.7~g154
Version: 2017.0.g103
Release: 0
Summary: API and commands for processing SPIR-V modules
License: Apache-2.0
@ -38,7 +38,7 @@ BuildRequires: gcc-c++
BuildRequires: python
BuildRequires: python-xml
BuildRequires: python3
BuildRequires: spirv-headers
BuildRequires: spirv-headers >= 1.2
%description
The package includes an assembler, binary module parser,
@ -70,7 +70,7 @@ integration into other code bases directly.
%patch -P 1 -P 2 -p1
%build
%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix"
%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" -DSPIRV_BUILD_COMPRESSION=BOOL:ON
make %{?_smp_mflags}
%install
@ -89,12 +89,14 @@ b="%buildroot"
%defattr(-,root,root)
%_libdir/libSPIRV-Tools.so.*
%_libdir/libSPIRV-Tools-comp.so.*
%_libdir/libSPIRV-Tools-link.so.*
%_libdir/libSPIRV-Tools-opt.so.*
%files devel
%defattr(-,root,root)
%_libdir/libSPIRV-Tools.so
%_libdir/libSPIRV-Tools-comp.so
%_libdir/libSPIRV-Tools-link.so
%_libdir/libSPIRV-Tools-opt.so
%_includedir/spirv-tools/

View File

@ -6,14 +6,15 @@ Unversioned libraries suck!
---
source/CMakeLists.txt | 1 +
source/comp/CMakeLists.txt | 1 +
source/link/CMakeLists.txt | 1 +
source/opt/CMakeLists.txt | 1 +
3 files changed, 3 insertions(+)
4 files changed, 4 insertions(+)
Index: spirv-tools-2016.7~g154/source/CMakeLists.txt
Index: spirv-tools-2017.0.g103/source/CMakeLists.txt
===================================================================
--- spirv-tools-2016.7~g154.orig/source/CMakeLists.txt
+++ spirv-tools-2016.7~g154/source/CMakeLists.txt
@@ -281,6 +281,7 @@ set_source_files_properties(
--- spirv-tools-2017.0.g103.orig/source/CMakeLists.txt
+++ spirv-tools-2017.0.g103/source/CMakeLists.txt
@@ -288,6 +288,7 @@ set_source_files_properties(
PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}")
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
@ -21,24 +22,36 @@ Index: spirv-tools-2016.7~g154/source/CMakeLists.txt
spvtools_default_compile_options(${SPIRV_TOOLS})
target_include_directories(${SPIRV_TOOLS}
PUBLIC ${spirv-tools_SOURCE_DIR}/include
Index: spirv-tools-2016.7~g154/source/comp/CMakeLists.txt
Index: spirv-tools-2017.0.g103/source/comp/CMakeLists.txt
===================================================================
--- spirv-tools-2016.7~g154.orig/source/comp/CMakeLists.txt
+++ spirv-tools-2016.7~g154/source/comp/CMakeLists.txt
@@ -13,6 +13,7 @@
# limitations under the License.
--- spirv-tools-2017.0.g103.orig/source/comp/CMakeLists.txt
+++ spirv-tools-2017.0.g103/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 suse3)
+ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse4)
spvtools_default_compile_options(SPIRV-Tools-comp)
target_include_directories(SPIRV-Tools-comp
Index: spirv-tools-2016.7~g154/source/opt/CMakeLists.txt
Index: spirv-tools-2017.0.g103/source/link/CMakeLists.txt
===================================================================
--- spirv-tools-2016.7~g154.orig/source/opt/CMakeLists.txt
+++ spirv-tools-2016.7~g154/source/opt/CMakeLists.txt
@@ -82,6 +82,7 @@ add_library(SPIRV-Tools-opt
unify_const_pass.cpp
--- spirv-tools-2017.0.g103.orig/source/link/CMakeLists.txt
+++ spirv-tools-2017.0.g103/source/link/CMakeLists.txt
@@ -14,6 +14,7 @@
add_library(SPIRV-Tools-link
linker.cpp
)
+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse4)
spvtools_default_compile_options(SPIRV-Tools-link)
target_include_directories(SPIRV-Tools-link
Index: spirv-tools-2017.0.g103/source/opt/CMakeLists.txt
===================================================================
--- spirv-tools-2017.0.g103.orig/source/opt/CMakeLists.txt
+++ spirv-tools-2017.0.g103/source/opt/CMakeLists.txt
@@ -106,6 +106,7 @@ add_library(SPIRV-Tools-opt
instruction_list.cpp
)
+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse3)