Accepting request 851836 from home:mnhauke:sdr-devel

- Update to version 2.4.0
  Documentation
  * Update README to be more verbose and to improve usefulness.
  CMake
  * Enable to not install volk_modtool.
  * Remove "find_package_handle_standard_args" warning.
  cpu_features
  * Use cpu_features v0.6.0 as a private submodule to detect
    available CPU features.
  * Fix incorrect feature detection for newer AVX versions.
  * Circumvent platform specific feature detection.
  * Enable more architecture specific kernels on more platforms.
  Kernels
  * Disable slow and broken SSE4.1 kernel in
    volk_32fc_x2_dot_prod_32fc.
  * Adjust min/max for 32f_s32f_convert_8i kernel
  * Use INT8_* instead of CHAR_*
- Upstream tarball does not have the cpu_features included so use
  a service file to generate the tarball.
- Add patch:
  * volk-fix-cpu_features-compilation-error.patch

OBS-URL: https://build.opensuse.org/request/show/851836
OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/volk?expand=0&rev=9

_service

@@ -0,0 +1,14 @@
+<services>
+        <service name="tar_scm" mode="disabled">
+                <param name="scm">git</param>
+                <param name="url">https://github.com/gnuradio/volk.git</param>
+                <param name="revision">v2.4.0</param>
+                <param name="versionformat">2.4.0</param>
+        </service>
+        <service name="recompress" mode="disabled">
+                <param name="file">*.tar</param>
+                <param name="compression">xz</param>
+        </service>
+        <service name="set_version" mode="disabled"/>
+</services>
+

volk-2.3.0.tar.gz

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

volk-2.4.0.tar.xz

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

volk-fix-cpu_features-compilation-error.patch

@@ -0,0 +1,12 @@
+diff --git a/cpu_features/src/utils/list_cpu_features.c b/cpu_features/src/utils/list_cpu_features.c
+index c80ffc5..82a8e72 100644
+--- a/cpu_features/src/utils/list_cpu_features.c
++++ b/cpu_features/src/utils/list_cpu_features.c
+@@ -340,6 +340,7 @@ static Node* GetCacheTypeString(CacheType cache_type) {
+     case CPU_FEATURE_CACHE_PREFETCH:
+       return CreateConstantString("prefetch");
+   }
++  return 0;
+ }
+ 
+ static void AddCacheInfo(Node* root, const CacheInfo* cache_info) {

volk.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Nov 30 11:31:35 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 2.4.0
+  Documentation
+  * Update README to be more verbose and to improve usefulness.
+  CMake
+  * Enable to not install volk_modtool.
+  * Remove "find_package_handle_standard_args" warning.
+  cpu_features
+  * Use cpu_features v0.6.0 as a private submodule to detect
+    available CPU features.
+  * Fix incorrect feature detection for newer AVX versions.
+  * Circumvent platform specific feature detection.
+  * Enable more architecture specific kernels on more platforms.
+  Kernels
+  * Disable slow and broken SSE4.1 kernel in
+    volk_32fc_x2_dot_prod_32fc.
+  * Adjust min/max for 32f_s32f_convert_8i kernel
+  * Use INT8_* instead of CHAR_*
+- Upstream tarball does not have the cpu_features included so use
+  a service file to generate the tarball.
+- Add patch:
+  * volk-fix-cpu_features-compilation-error.patch
+
 -------------------------------------------------------------------
 Sat May  9 12:09:27 UTC 2020 - Martin Hauke <mardnh@gmx.de>
 

volk.spec

@@ -17,16 +17,16 @@
 
 
 %global sonum 2
-%global soname 2_3
-
+%global soname 2_4
 Name:           volk
-Version:        2.3.0
+Version:        2.4.0
 Release:        0
 Summary:        Vector-Optimized Library of Kernels
 License:        GPL-3.0-only
 Group:          Development/Libraries/C and C++
-URL:            http://libvolk.org/
-Source:         https://github.com/gnuradio/volk/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL:            https://libvolk.org/
+Source:         %{name}-%{version}.tar.xz
+Patch0:         volk-fix-cpu_features-compilation-error.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -35,6 +35,7 @@ BuildRequires:  libboost_system-devel
 BuildRequires:  orc
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-Mako
+Provides:       bundled(cpu_features) = 0.6.0
 
 %description
 VOLK provides a library of vector-optimized kernels. It is a subproject
@@ -45,9 +46,9 @@ Summary:        Development files for VOLK
 # Formerly part of gnuradio 3.7.x.y
 Group:          Development/Libraries/C and C++
 Requires:       libvolk%{soname} = %{version}
+Recommends:     volk_modtool
 Conflicts:      gnuradio-devel < 3.8.0.0
 Provides:       gnuradio-devel:%{_libdir}/pkgconfig/volk.pc
-Recommends:     volk_modtool
 
 %description devel
 This package provides the the development files for VOLK.
@@ -70,6 +71,7 @@ VOLK kernels.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %cmake
@@ -77,10 +79,15 @@ VOLK kernels.
 
 %install
 %cmake_install
-
 chmod -x %{buildroot}%{python3_sitearch}/volk_modtool/*py
 sed -i -e '1 { \@.*/bin/env.*python.*@ d }' %{buildroot}%{python3_sitearch}/volk_modtool/*py
 
+# remove stuff from bundled cpu_features
+rm %{buildroot}%{_bindir}/list_cpu_features
+rm -R %{buildroot}%{_includedir}/cpu_features
+rm -R %{buildroot}%{_libdir}/cmake/CpuFeatures
+rm %{buildroot}%{_libdir}/libcpu_features.a
+
 %fdupes %{buildroot}
 
 %post -n libvolk%{soname} -p /sbin/ldconfig