SPECS/spirv-tools.spec

@@ -1,8 +1,10 @@
+%undefine __cmake_in_source_build
+
 %global sdkver 1.3.239.0
 
 Name:           spirv-tools
 Version:        2023.1
-Release:        2%{?dist}
+Release:        2%{?gitrel}%{?dist}
 Summary:        API and commands for processing SPIR-V modules
 
 License:        ASL 2.0
@@ -10,8 +12,7 @@ URL:            https://github.com/KhronosGroup/SPIRV-Tools
 Source0:        %url/archive/sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz
 
 Patch0:         0001-opt-fix-spirv-ABI-on-Linux-again.patch
-
-BuildRequires:  cmake
+BuildRequires:  cmake3
 BuildRequires:  gcc-c++
 BuildRequires:  ninja-build
 %if 0%{?rhel} == 7
@@ -45,19 +46,16 @@ Development files for %{name}
 %autosetup -p1 -n SPIRV-Tools-sdk-%{sdkver}
 
 %build
-%__mkdir_p %_target_platform
-pushd %_target_platform
-%cmake -DCMAKE_BUILD_TYPE=Release \
+%cmake3 -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_LIBDIR=%{_lib} \
         -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
         -DPYTHON_EXECUTABLE=%{__python3} \
         -DSPIRV_TOOLS_BUILD_STATIC=OFF \
-        -GNinja ..
-%ninja_build
-popd
+        -GNinja
+%cmake3_build
 
 %install
-%ninja_install -C %_target_platform
+%cmake3_install
 
 %ldconfig_scriptlets libs
 
@@ -79,9 +77,9 @@ popd
 %{_libdir}/libSPIRV-Tools-link.so
 %{_libdir}/libSPIRV-Tools-lint.so
 %{_libdir}/libSPIRV-Tools-opt.so
-%{_libdir}/libSPIRV-Tools-shared.so
-%{_libdir}/libSPIRV-Tools-reduce.so
 %{_libdir}/libSPIRV-Tools.so
+%{_libdir}/libSPIRV-Tools-reduce.so
+%{_libdir}/libSPIRV-Tools-shared.so
 
 %files devel
 %{_includedir}/spirv-tools/
@@ -91,42 +89,80 @@ popd
 
 %changelog
 * Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 2023.1-2
-- fix spirv-tools ABI break
+- Restore spirv-tools ABI
 
-* Mon Feb 13 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
-- Update to 1.3.239.0 SDK version
+* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
+- Update to 1.3.239.0 SDK release
 
-* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
-- Update to 1.3.224.0 SDK version
+* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 2022.2-3
+- Update to 1.3.224.0 SDK release.
 
-* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 2022.2-1
-- Update to 1.3.216.0 SDK version
+* Wed Jun 22 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
+- Update to 1.3.216.0 SDK release.
 
-* Mon Feb 21 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1
-- Update to 1.3.204.0 SDK version
+* Sat Feb 26 2022 Dave Airlie <airlied@redhat.com> - 2022.1-2.20220202.git45dd184
+- workaround build problem bump
 
-* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 2020.5-3
+* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1.20220202.git45dd184
+- Update to 1.3.204.0 SDK Version
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.2-2.20210619.git5dd2f76
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jul 30 2021 Dave Airlie <airlied@redhat.com> - 2021.2-1
+- Update to 1.2.182.0 SDK Version
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2020.5-6.20201208.gitb27b1af
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 2020.5-5
 - Update to 1.2.162.0 SDK version
 
-* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 2020.5-1
-- update to latest upstream
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.5-4.20201031.gitf7da527
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Dec 04 2020 Jeff Law <law@redhat.com> - 2020.5-3.20201031.gitf7da5277
+- Fix undesirable strncpy call to instead use memcpy to avoid
+  gcc-11 diagnostic
+
+* Mon Nov 02 2020 Dave Airlie <airlied@redhat.com> - 2020.5-2.20201031.gitf7da5277
+- update to latest spirv-tools
+
+* Tue Aug 04 2020 Dave Airlie <airlied@redhat.com> - 2029.5-1.20200803.git92a71657
+- update to latest spirv-tools
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.5-3.20200421.git67f4838
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Apr 22 2020 Dave Airlie <airlied@redhat.cvom> - 2019.5-2
+- git snapshot for newer glslang/validation layers
 
 * Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 2019.5-1
-- update to latest upstream
-
-* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 2019.4-2
-- rebuild for 8.2.0
+- git snapshot for newer glslang/validation layers
 
 * Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 2019.4-1
-- latest upstream snapshot
+- git snapshot for newer glslang/validation layers
 
-* Sun Aug 04 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
-- Update to latest upstream for glslang
-- drop spirv-stats as per upstream.
+* Thu Aug 01 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
+- git snapshot to let newer vulkan validation layers build
+- stats removed upstream
 
-* Thu Mar 07 2019 Dave Airlie <airlied@redhat.com> - 2019.1-1
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 10 13:46:33 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2019.3-1
+- Release 2019.3
+
+* Thu Mar 07 2019 Dave Airlie <airlied@redhat.com> - 2019.1-2
+- Add patch to let vulkan-validation-layers build
+
+* Mon Feb 04 2019 Dave Airlie <airlied@redhat.com> - 2019.1-1
 - Update to 2019.1 release
 
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jul 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.4-1
 - Update to 2018.4 release