Compare commits

..

No commits in common. "rawhide" and "f34" have entirely different histories.

3 changed files with 31 additions and 138 deletions

8
.gitignore vendored
View file

@ -1,10 +1,2 @@
/volk-*.tar.gz
/volk-2.5.0.tar.gz.asc
/volk-2.5.1.tar.gz.asc
/volk-2.5.2.tar.gz.asc
/volk-3.0.0.tar.gz.asc
/volk-3.1.0.tar.gz.asc
/volk-3.1.1.tar.gz.asc
/volk-3.1.2.tar.gz.asc
/volk-3.2.0.tar.gz.asc
/volk-3.3.0.tar.gz.asc

View file

@ -1,2 +1,2 @@
SHA512 (volk-3.3.0.tar.gz) = 6a10a3eb33ecfbf61c87a41ae41013a297d41ec5a5fee3e0a2c4c2a82564aacce24532d32fb90e07b10abb3c2aefdfb8fb48226fc6d16bfe7f93f7f7b8a69e56
SHA512 (volk-3.3.0.tar.gz.asc) = 8f09a655e429ef2fff3fd78fbd6f89363ae6d7c9bd8ec8cbb02604b008d83735d6c8d710248662056b9112f71b27f1d1f3202ba8ee78c15149b12cabb4e603ab
SHA512 (volk-2.5.0.tar.gz) = 2d5d206e008c095d7911cc592cc86ac8cb5dd7cfdb987eb13b24202c1448389e6b6fa5594500c65f7fb6fb3f3a3c109f654bf80292d00d10ae60d0583ff01e2c
SHA512 (volk-2.5.0.tar.gz.asc) = 1033ac23668fb0bde779c2df11384612219ab8618a0e6db30efc28767cd27e257fa32975a90eb8662424ae618730c2bc0af2bd90c481f8e2bf47f5123299526c

157
volk.spec
View file

@ -1,8 +1,8 @@
Name: volk
Version: 3.3.0
Release: 5%{?dist}
Version: 2.5.0
Release: 1%{?dist}
Summary: The Vector Optimized Library of Kernels
License: LGPL-3.0-or-later
License: GPLv3+
URL: https://github.com/gnuradio/%{name}
Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/gnuradio/volk/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
@ -16,11 +16,7 @@ BuildRequires: gcc-c++
BuildRequires: python3-devel
BuildRequires: python3-mako
BuildRequires: orc-devel
BuildRequires: fmt-devel
BuildRequires: sed
%ifnarch s390x
BuildRequires: google-cpu_features-devel
%endif
Conflicts: python3-gnuradio < 3.9.0.0
Conflicts: gnuradio-devel < 3.9.0.0
@ -35,14 +31,10 @@ approaches the problem differently. VOLK is a sub-project of GNU Radio.
%package devel
Summary: Development files for VOLK
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: vulkan-volk-devel
%description devel
%{summary}.
%ifarch s390x
Conflicts: google-cpu_features-devel
%endif
%package doc
@ -65,13 +57,22 @@ sed -i '1 {/#!\s*\/usr\/bin\/env\s\+python/ d}' __init__.py cfg.py
popd
%build
# workaround, the code is not yet compatible with the strict-aliasing
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
%cmake
%cmake_build
%cmake_build -t volk_doc
%check
cd %{__cmake_builddir}
ctest --output-on-failure
# Use make_build for EL8 compat
%make_build -C %{__cmake_builddir} volk_doc
# temporally disabled the testsuite due to https://github.com/gnuradio/volk/issues/442
# gnuradio (and all volk consumers) could coredump on s390x and ppc64le under some
# circumstances, see https://bugzilla.redhat.com/show_bug.cgi?id=1917625#c6
#%%check
#cd %{__cmake_builddir}
#make test
%install
@ -81,9 +82,17 @@ ctest --output-on-failure
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
# drop list_cpu_features, not needed, just some demo binary,
# unavailable on s390x, for details see:
# https://github.com/gnuradio/volk/issues/442#issuecomment-772059840
rm -f %{buildroot}%{_bindir}/list_cpu_features
# drop static objects
rm -f %{buildroot}%{_libdir}/libcpu_features.a
%files
%license COPYING
%doc README.md docs/CHANGELOG.md
%doc README.md CHANGELOG.md
%{_bindir}/volk-config-info
%{_bindir}/volk_modtool
%{_bindir}/volk_profile
@ -93,6 +102,10 @@ cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
%files devel
%{_includedir}/volk
%ifnarch s390x
%{_includedir}/cpu_features
%{_libdir}/cmake/CpuFeatures
%endif
%{_libdir}/libvolk.so
%{_libdir}/cmake/volk
%{_libdir}/pkgconfig/*.pc
@ -103,118 +116,6 @@ cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 3.3.0-5
- Rebuilt for Python 3.15.0b4 ABI change
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 25 2026 František Zatloukal <fzatlouk@redhat.com> - 3.3.0-3
- Rebuilt for fmt/spdlog
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 3.3.0-2
- Rebuilt for Python 3.15
* Mon Feb 09 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.3.0-1
- New version
Resolves: rhbz#2437661
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Sep 26 2025 Antonio Trande <sagitter@fedoraproject.org> - 3.2.0-8
- Rebuild for google-cpu_features-0.10.1
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.2.0-7
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.2.0-6
- Rebuilt for Python 3.14.0rc2 bytecode
* Fri Jul 25 2025 Fedora Release Engineering <marcus_fedora@baseband.digital> - 3.2.0-5
- Enable tests
- Disable rotator2 SSE 4.1 kernels (other implementations available)
- Use default compiler flags (strict aliasing works)
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 3.2.0-3
- Rebuilt for Python 3.14
* Wed Mar 12 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 3.2.0-2
- Fixed license tag
Resolves: rhbz#2346827
* Mon Mar 10 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 3.2.0-1
- New version
Resolves: rhbz#2343664
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.1.2-3
- Rebuilt for Python 3.13
* Fri Mar 29 2024 Zhengyu He <hezhy472013@gmail.com> - 3.1.2-2
- Enable google-cpu_features for riscv64
* Mon Feb 26 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 3.1.2-1
- New version
Resolves: rhbz#2266046
- Converted license tag to SPDX
* Thu Feb 1 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 3.1.1-1
- New version
Resolves: rhbz#2262148
* Wed Jan 31 2024 José Expósito <jexposit@redhat.com> - 3.1.0-3
- Add conflict with vulkan-volk
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 11 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 3.1.0-1
- New version
Resolves: rhbz#2253664
* Thu Oct 19 2023 Marcus Müller <marcus_fedora@baseband.digital> - 3.0.0-4
- Depend on system google-cpu_features-devel instead of using the vendored
- Fixes rhbz#2245047
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.0.0-2
- Rebuilt for Python 3.12
* Thu Jan 19 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.0-1
- New version
Resolves: rhbz#2161009
* Mon Sep 5 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.2-1
- New version
Resolves: rhbz#2124323
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.5.1-2
- Rebuilt for Python 3.11
* Tue Feb 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.1-1
- New version
Resolves: rhbz#2053851
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 11 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.0-1
- New version
Resolves: rhbz#1968142