From 6f3075ccfced5a6fb52d8b552ad819609086f6de Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Oct 15 2020 04:22:45 +0000 Subject: new upstream, spec cleanups - Upstream removed the exit() calls https://github.com/jgaeddert/liquid-dsp/issues/134 - invoke autoreconf at build time, as upstream doesn't package what we need - Add BR: fftw-devel - Remove BR: gcovr and --enable-coverage. It was keeping the exit call in the library, and we aren't looking at the coverage results anyhow. --- diff --git a/.gitignore b/.gitignore index 4ccaa4f..259ea46 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /liquid-dsp-9658d81.tar.gz /liquid-dsp-1.3.2.tar.gz +/liquid-dsp-7ad2496.tar.gz diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..2ddfaf6 --- /dev/null +++ b/config.h.in @@ -0,0 +1,232 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + + +#ifndef __LIQUID_CONFIG_H__ +#define __LIQUID_CONFIG_H__ + + +/* Support AVX (Advanced Vector Extensions) instructions */ +#undef HAVE_AVX + +/* Define to 1 if you have the `cargf' function. */ +#undef HAVE_CARGF + +/* Define to 1 if you have the `cexpf' function. */ +#undef HAVE_CEXPF + +/* Define to 1 if you have the `cimagf' function. */ +#undef HAVE_CIMAGF + +/* Define to 1 if you have the header file. */ +#undef HAVE_COMPLEX_H + +/* Define to 1 if you have the `cosf' function. */ +#undef HAVE_COSF + +/* Define to 1 if you have the `crealf' function. */ +#undef HAVE_CREALF + +/* Define to 1 if you have the header file. */ +#undef HAVE_EMMINTRIN_H + +/* Define to 1 if you have the `expf' function. */ +#undef HAVE_EXPF + +/* Define to 1 if you have the header file. */ +#undef HAVE_FEC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FFTW3_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FLOAT_H + +/* Define to 1 if you have the `free' function. */ +#undef HAVE_FREE + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_IMMINTRIN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `c' library (-lc). */ +#undef HAVE_LIBC + +/* Define to 1 if you have the `fec' library (-lfec). */ +#undef HAVE_LIBFEC + +/* Define to 1 if you have the `fftw3f' library (-lfftw3f). */ +#undef HAVE_LIBFFTW3F + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the `malloc' function. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the header file. */ +#undef HAVE_MMINTRIN_H + +/* Support MMX instructions */ +#undef HAVE_MMX + +/* Define to 1 if you have the header file. */ +#undef HAVE_PMMINTRIN_H + +/* Define to 1 if you have the `realloc' function. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the `sinf' function. */ +#undef HAVE_SINF + +/* Define to 1 if you have the header file. */ +#undef HAVE_SMMINTRIN_H + +/* Define to 1 if you have the `sqrtf' function. */ +#undef HAVE_SQRTF + +/* Support SSE (Streaming SIMD Extensions) instructions */ +#undef HAVE_SSE + +/* Support SSE2 (Streaming SIMD Extensions 2) instructions */ +#undef HAVE_SSE2 + +/* Support SSE3 (Streaming SIMD Extensions 3) instructions */ +#undef HAVE_SSE3 + +/* Support SSE4.1 (Streaming SIMD Extensions 4.1) instructions */ +#undef HAVE_SSE41 + +/* Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions */ +#undef HAVE_SSE42 + +/* Support SSSE3 (Supplemental Streaming SIMD Extensions 3) instructions */ +#undef HAVE_SSSE3 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TMMINTRIN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_XMMINTRIN_H + +/* Force internal FFT even if libfftw is available */ +#undef LIQUID_FFTOVERRIDE + +/* Force overriding of SIMD (use portable C code) */ +#undef LIQUID_SIMDOVERRIDE + +/* Enable strict program exit on error */ +#undef LIQUID_STRICT_EXIT + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `long int', as computed by sizeof. */ +#undef SIZEOF_LONG_INT + +/* The size of `long long int', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG_INT + +/* The size of `short int', as computed by sizeof. */ +#undef SIZEOF_SHORT_INT + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT8_T + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + +/* Define to `unsigned int' if does not define. */ +#undef size_t + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +#undef uint8_t + + +#endif // __LIQUID_CONFIG_H__ + diff --git a/liquid-dsp.spec b/liquid-dsp.spec index f5baf94..d413094 100644 --- a/liquid-dsp.spec +++ b/liquid-dsp.spec @@ -1,27 +1,27 @@ -%global commit 4892ebbc04ef57dd6f603d3f4ece253d8c2bd571 +%global commit 7ad249625eb42ab4b9ed9697c2f72aaed551a5f4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20190728 +%global snapshotdate 20201010 %global fedora_soname 2.0 Name: liquid-dsp Version: 1.3.2 -#Release: 1.%{snapshotdate}git%{shortcommit}%{?dist} -Release: 2%{?dist} +Release: 3.%{snapshotdate}git%{shortcommit}%{?dist} Summary: Digital Signal Processing Library for Software-Defined Radios License: MIT URL: http://liquidsdr.org/ -#Source0: https://github.com/jgaeddert/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -Source0: liquid-dsp-1.3.2.tar.gz +Source0: https://github.com/jgaeddert/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +# upstream autotools files not in the tarball +Source1: config.h.in # set soname ourselves as upstream doesn't Patch0: soname-version.patch # Patch configure.ac for ppc64 Patch1: ppc64-configureac.patch -# add autotooling as upstream doesn't -Patch2: autotools.patch # fixes ppc64 altivec, other 64-bit problems. Patch by Dan Horák. # https://github.com/jgaeddert/liquid-dsp/pull/136 Patch3: ppc64.patch -BuildRequires: gcc fftw-libs-single gcovr +BuildRequires: gcc +BuildRequires: fftw-devel fftw-libs-single +BuildRequires: autoconf automake libtool %description Digital signal processing library for software-defined radios @@ -34,10 +34,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Digital signal processing library for software-defined radios %prep -%autosetup -p1 -n %{name}-%{version} -chmod a+x configure +%autosetup -p1 -n %{name}-%{commit} +cp %{SOURCE1} . +autoreconf -f -i %build -%configure --exec_prefix=/ --enable-coverage +%configure --exec_prefix=/ --enable-simdoverride %make_build %check @@ -63,6 +64,13 @@ popd > /dev/null 2>&1 %changelog +* Mon Oct 12 2020 Matt Domsch 1.3.2-3.20201010git7ad2496 +- Upstream removed the exit() calls https://github.com/jgaeddert/liquid-dsp/issues/134 +- invoke autoreconf at build time, as upstream doesn't package what we need +- Add BR: fftw-devel +- Remove BR: gcovr and --enable-coverage. It was keeping the exit call in the library, + and we aren't looking at the coverage results anyhow. + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b9748f8..cc739a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (liquid-dsp-1.3.2.tar.gz) = 1af317512f56078a79396fd3c7a0135c97ef63fd187d52db1b62ddabca683a37fa6b358adafd76d81c3cb06c54f9c7c8fd66f8bb86c0bfebec9e9ef1441ca5d2 +SHA512 (liquid-dsp-7ad2496.tar.gz) = ae6c8bdebafed1d769a7bf969cedc59866fbadfd3baa3748ed6cd2100f41a70a1f04265df63bf5b48543dd42a846253449535b3f3fba51062a57f1593aadecbb