Accepting request 1231577 from X11:Wayland

- Update to release 2024.4~rc2

OBS-URL: https://build.opensuse.org/request/show/1231577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spirv-tools?expand=0&rev=47

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1734379448
+commit: aae3b7f43c6c579079d06523fe5ec101506338f9512020604a4459b40c46044e
+url: https://src.opensuse.org/jengelh/spirv-tools
+revision: master

baselibs.conf

@@ -1,4 +1,4 @@
-libSPIRV-Tools-2025_3_rc1
+libSPIRV-Tools-2024_4_rc2
 spirv-tools-devel
 	requires -spirv-tools-<targettype>
-	requires "libSPIRV-Tools-2025_3_rc1-<targettype> = <version>"
+	requires "libSPIRV-Tools-2024_4_rc2-<targettype> = <version>"

build.specials.obscpio

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

spirv-tools.changes

@@ -1,49 +1,3 @@
--------------------------------------------------------------------
-Fri Jun 27 16:13:54 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2025.3~rc1
-  * Add spvtools::utils::Span, spvtools::utils::IndexRange
-  * Add instruction printingClass value to InstructionDesc
-  * Add support for SPV_ARM_tensors
-  * Add initial support for SPV_EXT_float8
-  * Add validation support for MeshEXT
-  * Add minimal as/dis support for TOSA.001000.1 extended
-    instruction set
-  * Add --canonicalize-ids pass
-
--------------------------------------------------------------------
-Fri Apr 25 22:36:50 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2025.2~rc2
-  * Add SPV_KHR_bfloat16 support
-  * Support scalar replacement of large structs
-  * Support optimization of OpCopyLogical
-  * Add QuadControlKHR to trim pass and allow lists
-
--------------------------------------------------------------------
-Thu Mar 13 16:56:20 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Bump BuildRequires to match spirv-headers
-
--------------------------------------------------------------------
-Wed Mar 12 16:37:33 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2025.1~rc1
-  * Added OpImageSampleFootprintNV to IsAllowedSampledImageOperand
-  * spirv-val: Validate zero product workgroup size
-  * Added EXT_mesh_shader validation support
-  * Added support for SPV_INTEL_subgroup_matrix_multiply_accumulate
-  * Added SPV_AMDX_shader_enqueue version 2 support
-  * Now validates SPV_NV_cooperative_vector
-  * Added validation for SPV_NV_cluster_acceleration_structure,
-    SPV_NV_linear_swept_spheres
-
--------------------------------------------------------------------
-Thu Mar  6 14:18:19 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
-
-- Build with GCC 13 on Leap/SLES 15 in the hope to fix Mesa build
-  (bsc#1238713) 
-
 -------------------------------------------------------------------
 Sun Dec 15 18:56:06 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

spirv-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package spirv-tools
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,32 +17,29 @@
 
 
 %define _lto_cflags %nil
-%define lname libSPIRV-Tools-2025_3_rc1
-
-# Leap 15 and SLES 15 defaults to GCC 7, which does not have stable C++17 ABI.
-# See https://bugzilla.suse.com/show_bug.cgi?id=1235697
-%if 0%{?suse_version} < 1600
-%define gcc_version 13
-%endif
+%define lname libSPIRV-Tools-2024_4_rc2
 
 Name:           spirv-tools
-Version:        2025.3~rc1
+Version:        2024.4~rc2
 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:         https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2025.3.rc1.tar.gz
+Source:         https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.4.rc2.tar.gz
 Source9:        baselibs.conf
 Patch1:         ver.diff
 BuildRequires:  bison
 BuildRequires:  cmake >= 3.17.2
-BuildRequires:  gcc%{?gcc_version} >= 9
-BuildRequires:  gcc%{?gcc_version}-c++ >= 9
+%if 0%{?suse_version} >= 1599
+BuildRequires:  gcc-c++
+%else
+BuildRequires:  gcc12-c++
+%endif
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  python3-xml
-BuildRequires:  spirv-headers >= 1.6.4+sdk313+git19
+BuildRequires:  spirv-headers >= 1.6.4+sdk303
 
 %description
 The package includes an assembler, binary module parser,
@@ -70,14 +67,15 @@ validator, and is used in the standalone tools whilst also enabling
 integration into other code bases directly.
 
 %prep
-%autosetup -p1 -n SPIRV-Tools-2025.3.rc1
+%autosetup -p1 -n SPIRV-Tools-2024.4.rc2
 find . -type f -name CMakeLists.txt -exec \
 	perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt {} +
 
 %build
+%if 0%{?suse_version} && 0%{?suse_version} < 1599
+export CXX=g++-12
+%endif
 %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \
-	-DCMAKE_C_COMPILER="gcc%{?gcc_version:-%{gcc_version}}" \
-	-DCMAKE_CXX_COMPILER="g++%{?gcc_version:-%{gcc_version}}" \
 	-DSPIRV_TOOLS_BUILD_STATIC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON
 %cmake_build
 

ver.diff

@@ -4,49 +4,40 @@ Date: 2016-06-13 11:46:16.846841814 +0200
 Unversioned libraries suck!
 
 ---
- source/CMakeLists.txt        |    4 +++-
+ source/CMakeLists.txt        |    2 ++
  source/diff/CMakeLists.txt   |    1 +
  source/fuzz/CMakeLists.txt   |    1 +
  source/link/CMakeLists.txt   |    1 +
  source/lint/CMakeLists.txt   |    1 +
  source/opt/CMakeLists.txt    |    1 +
  source/reduce/CMakeLists.txt |    1 +
- 7 files changed, 9 insertions(+), 1 deletion(-)
+ 7 files changed, 8 insertions(+)
 
-Index: SPIRV-Tools-2025.3.rc1/source/CMakeLists.txt
+Index: SPIRV-Tools-sdk-1.3.216.0/source/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/CMakeLists.txt
-@@ -344,6 +344,7 @@ if (SPIRV_TOOLS_USE_MIMALLOC)
- endif()
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/CMakeLists.txt
+@@ -377,6 +377,7 @@ endfunction()
+ add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
  spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
  set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
 +set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}-shared-@PACKAGE_VERSION@")
  target_compile_definitions(${SPIRV_TOOLS}-shared
    PRIVATE SPIRV_TOOLS_IMPLEMENTATION
    PUBLIC SPIRV_TOOLS_SHAREDLIB
-@@ -353,7 +354,7 @@ if(SPIRV_TOOLS_BUILD_STATIC)
-   add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
-   spirv_tools_default_target_options(${SPIRV_TOOLS}-static)
-   # The static target does not have the '-static' suffix.
--  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}")
-+  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}-@PACKAGE_VERSION@")
- 
-   # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static"
-   # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS.
-@@ -370,6 +371,7 @@ else()
-     target_link_libraries(${SPIRV_TOOLS} PRIVATE mimalloc-static)
-   endif()
-   spirv_tools_default_target_options(${SPIRV_TOOLS})
+@@ -399,6 +400,7 @@ if(SPIRV_TOOLS_BUILD_STATIC)
+   set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
+ else()
+   add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
 +  set_target_properties(${SPIRV_TOOLS} PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}-@PACKAGE_VERSION@")
+   spirv_tools_default_target_options(${SPIRV_TOOLS})
    set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
  endif()
- 
-Index: SPIRV-Tools-2025.3.rc1/source/diff/CMakeLists.txt
+Index: SPIRV-Tools-sdk-1.3.216.0/source/diff/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/diff/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/diff/CMakeLists.txt
-@@ -44,6 +44,7 @@ target_link_libraries(SPIRV-Tools-diff
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/diff/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/diff/CMakeLists.txt
+@@ -36,6 +36,7 @@ target_link_libraries(SPIRV-Tools-diff
    PUBLIC SPIRV-Tools-opt)
  
  set_property(TARGET SPIRV-Tools-diff PROPERTY FOLDER "SPIRV-Tools libraries")
@@ -54,22 +45,22 @@ Index: SPIRV-Tools-2025.3.rc1/source/diff/CMakeLists.txt
  spvtools_check_symbol_exports(SPIRV-Tools-diff)
  
  if(ENABLE_SPIRV_TOOLS_INSTALL)
-Index: SPIRV-Tools-2025.3.rc1/source/fuzz/CMakeLists.txt
+Index: SPIRV-Tools-sdk-1.3.216.0/source/fuzz/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/fuzz/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/fuzz/CMakeLists.txt
-@@ -443,6 +443,7 @@ if(SPIRV_BUILD_FUZZER)
-   endif()
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/fuzz/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/fuzz/CMakeLists.txt
+@@ -439,6 +439,7 @@ if(SPIRV_BUILD_FUZZER)
+   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 OUTPUT_NAME "SPIRV-Tools-fuzz-@PACKAGE_VERSION@")
  
-   if (SPIRV_TOOLS_USE_MIMALLOC AND NOT SPIRV_TOOLS_BUILD_STATIC)
-     target_link_libraries(SPIRV-Tools-fuzz PRIVATE mimalloc-static)
-Index: SPIRV-Tools-2025.3.rc1/source/link/CMakeLists.txt
+   spvtools_default_compile_options(SPIRV-Tools-fuzz)
+ 
+Index: SPIRV-Tools-sdk-1.3.216.0/source/link/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/link/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/link/CMakeLists.txt
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/link/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/link/CMakeLists.txt
 @@ -14,6 +14,7 @@
  add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE}
    linker.cpp
@@ -78,10 +69,10 @@ Index: SPIRV-Tools-2025.3.rc1/source/link/CMakeLists.txt
  
  spvtools_default_compile_options(SPIRV-Tools-link)
  target_include_directories(SPIRV-Tools-link
-Index: SPIRV-Tools-2025.3.rc1/source/lint/CMakeLists.txt
+Index: SPIRV-Tools-sdk-1.3.216.0/source/lint/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/lint/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/lint/CMakeLists.txt
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/lint/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/lint/CMakeLists.txt
 @@ -27,6 +27,7 @@ endif()
  
  add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES})
@@ -90,22 +81,22 @@ Index: SPIRV-Tools-2025.3.rc1/source/lint/CMakeLists.txt
  spvtools_default_compile_options(SPIRV-Tools-lint)
  target_include_directories(SPIRV-Tools-lint
    PUBLIC
-Index: SPIRV-Tools-2025.3.rc1/source/opt/CMakeLists.txt
+Index: SPIRV-Tools-sdk-1.3.216.0/source/opt/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/opt/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/opt/CMakeLists.txt
-@@ -272,6 +272,7 @@ if (SPIRV_TOOLS_USE_MIMALLOC AND NOT SPI
-   target_link_libraries(SPIRV-Tools-opt PRIVATE mimalloc-static)
- endif()
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/opt/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/opt/CMakeLists.txt
+@@ -249,6 +249,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch
+ 
+ add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES})
  
 +set_target_properties(SPIRV-Tools-opt PROPERTIES OUTPUT_NAME "SPIRV-Tools-opt-@PACKAGE_VERSION@")
  spvtools_default_compile_options(SPIRV-Tools-opt)
  target_include_directories(SPIRV-Tools-opt
    PUBLIC
-Index: SPIRV-Tools-2025.3.rc1/source/reduce/CMakeLists.txt
+Index: SPIRV-Tools-sdk-1.3.216.0/source/reduce/CMakeLists.txt
 ===================================================================
---- SPIRV-Tools-2025.3.rc1.orig/source/reduce/CMakeLists.txt
-+++ SPIRV-Tools-2025.3.rc1/source/reduce/CMakeLists.txt
+--- SPIRV-Tools-sdk-1.3.216.0.orig/source/reduce/CMakeLists.txt
++++ SPIRV-Tools-sdk-1.3.216.0/source/reduce/CMakeLists.txt
 @@ -92,6 +92,7 @@ target_include_directories(SPIRV-Tools-r
  	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
    PRIVATE ${spirv-tools_BINARY_DIR}