diff --git a/comms/liquid-dsp/Makefile b/comms/liquid-dsp/Makefile index e9c3d252d258..400cac7e20a4 100644 --- a/comms/liquid-dsp/Makefile +++ b/comms/liquid-dsp/Makefile @@ -1,31 +1,29 @@ PORTNAME= liquid-dsp DISTVERSIONPREFIX= v -DISTVERSION= 1.3.2 -PORTREVISION= 1 +DISTVERSION= 1.6.0 CATEGORIES= comms MAINTAINER= mr@FreeBSD.org COMMENT= Software-Defined Radio Digital Signal Processing Library WWW= https://liquidsdr.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libfftw3.so:math/fftw3 \ - libfftw3f.so:math/fftw3-float +LIB_DEPENDS= libfftw3f.so:math/fftw3-float -USES= autoreconf gmake iconv:wchar_t libtool localbase +USES= autoreconf gmake libtool localbase USE_GITHUB= yes GH_ACCOUNT= jgaeddert USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKEFILE= makefile TEST_TARGET= check post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libliquid.so .include diff --git a/comms/liquid-dsp/distinfo b/comms/liquid-dsp/distinfo index 8e7e92beed96..bfae55df29b8 100644 --- a/comms/liquid-dsp/distinfo +++ b/comms/liquid-dsp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578927878 -SHA256 (jgaeddert-liquid-dsp-v1.3.2_GH0.tar.gz) = 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 -SIZE (jgaeddert-liquid-dsp-v1.3.2_GH0.tar.gz) = 1119114 +TIMESTAMP = 1713268756 +SHA256 (jgaeddert-liquid-dsp-v1.6.0_GH0.tar.gz) = 6ee6a5dfb48e047b118cf613c0b9f43e34356a5667a77a72a55371d2c8c53bf5 +SIZE (jgaeddert-liquid-dsp-v1.6.0_GH0.tar.gz) = 1243435 diff --git a/comms/liquid-dsp/files/patch-configure.ac b/comms/liquid-dsp/files/patch-configure.ac deleted file mode 100644 index d5571d2b85af..000000000000 --- a/comms/liquid-dsp/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2018-12-04 23:39:19 UTC -+++ configure.ac -@@ -195,7 +195,7 @@ else - src/dotprod/src/dotprod_rrrf.av.o \ - src/dotprod/src/dotprod_crcf.av.o \ - src/dotprod/src/sumsq.o" -- ARCH_OPTION="-fno-common -faltivec";; -+ ARCH_OPTION="-fno-common -maltivec";; - armv1*|armv2*|armv3*|armv4*|armv5*|armv6*) - # assume neon instructions are NOT available - MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \ diff --git a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c deleted file mode 100644 index d5f45ddf1f66..000000000000 --- a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c +++ /dev/null @@ -1,39 +0,0 @@ ---- src/dotprod/src/dotprod_crcf.av.c.orig 2018-12-04 23:40:11 UTC -+++ src/dotprod/src/dotprod_crcf.av.c -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #include "liquid.internal.h" - -@@ -168,8 +169,8 @@ void dotprod_crcf_execute(dotprod_crcf _q, - union { vector float v; float w[4];} s; - unsigned int nblocks; - -- ar = (vector float*)( (int)_x & ~15); -- al = ((int)_x & 15)/sizeof(float); -+ ar = (vector float*)( (uintptr_t)_x & ~15); -+ al = ((uintptr_t)_x & 15)/sizeof(float); - - d = (vector float*)_q->h[al]; - -@@ -179,7 +180,7 @@ void dotprod_crcf_execute(dotprod_crcf _q, - // split into four vectors each with four 32-bit - // partial sums. Effectively each loop iteration - // operates on 16 input samples at a time. -- s0 = s1 = s2 = s3 = (vector float)(0); -+ s0 = s1 = s2 = s3 = (vector float){0,0,0,0}; - while (nblocks >= 4) { - s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0); - s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1); -@@ -200,7 +201,7 @@ void dotprod_crcf_execute(dotprod_crcf _q, - // move the result into the union s (effetively, - // this loads the four 32-bit values in s0 into - // the array w). -- s.v = vec_add(s0,(vector float)(0)); -+ s.v = vec_add(s0,(vector float){0,0,0,0}); - - // sum the resulting array - //*_r = s.w[0] + s.w[1] + s.w[2] + s.w[3]; diff --git a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c deleted file mode 100644 index c293e02b70d6..000000000000 --- a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c +++ /dev/null @@ -1,39 +0,0 @@ ---- src/dotprod/src/dotprod_rrrf.av.c.orig 2018-12-04 23:41:32 UTC -+++ src/dotprod/src/dotprod_rrrf.av.c -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #include "liquid.internal.h" - -@@ -163,8 +164,8 @@ void dotprod_rrrf_execute(dotprod_rrrf _q, - union { vector float v; float w[4];} s; - unsigned int nblocks; - -- ar = (vector float*)( (int)_x & ~15); -- al = ((int)_x & 15)/sizeof(float); -+ ar = (vector float*)( (uintptr_t)_x & ~15); -+ al = ((uintptr_t)_x & 15)/sizeof(float); - - d = (vector float*)_q->h[al]; - -@@ -173,7 +174,7 @@ void dotprod_rrrf_execute(dotprod_rrrf _q, - // split into four vectors each with four 32-bit - // partial sums. Effectively each loop iteration - // operates on 16 input samples at a time. -- s0 = s1 = s2 = s3 = (vector float)(0); -+ s0 = s1 = s2 = s3 = (vector float){0,0,0,0}; - while (nblocks >= 4) { - s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0); - s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1); -@@ -194,7 +195,7 @@ void dotprod_rrrf_execute(dotprod_rrrf _q, - // move the result into the union s (effetively, - // this loads the four 32-bit values in s0 into - // the array w). -- s.v = vec_add(s0,(vector float)(0)); -+ s.v = vec_add(s0,(vector float){0,0,0,0}); - - // sum the resulting array - *_r = s.w[0] + s.w[1] + s.w[2] + s.w[3]; diff --git a/comms/liquid-dsp/pkg-plist b/comms/liquid-dsp/pkg-plist index dabd1f822874..903d195e783a 100644 --- a/comms/liquid-dsp/pkg-plist +++ b/comms/liquid-dsp/pkg-plist @@ -1,3 +1,5 @@ include/liquid/liquid.h lib/libliquid.a lib/libliquid.so +lib/libliquid.so.1 +lib/libliquid.so.1.6