From nobody Fri Jun 14 15:43:47 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W13Tw2Z0qz5P4TB; Fri, 14 Jun 2024 15:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W13Tw0d8cz4mmx; Fri, 14 Jun 2024 15:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718379828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GQGDy4XoYL/YV00mbhXzlvpBv6wdmlt9kEBf5nzuTU=; b=TU8wl7lv/mUiE4CxzFhmiS+PiFD4KpsXUX8Q8HPiXSMdYXkN16GeWi4ON/CUhZh7RZAR1y TenNgtf+GZpA81t9ZC+WZSbdXe86cTq5Tw7erhGmP9y/riIqymp3SAzqdx/pHCepXELmTZ tI/ufvl6u3HOpeYZb2nJijbJPc2kfrgkq0aQw4aeTyLmolzvXjEkv9QNFI5M2T0SboiRCh hQ+028qHIlc5iyQWB+yV4pteAjKxCRtxkzUG+PfQ6wF71+sTNxb8Om20d/URtfv1PLwb6R m95zLA3vyChlqf5jTL4LXl1FkOUzQuoi6Kl/2JDUFOjPY6qRSjp3nqJMJ4WSkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718379828; a=rsa-sha256; cv=none; b=tGu4X1ZbnpQRjXxRnjZa+0g3/TAytsAFy7BONFcH0BKOhZIx4Os+FP5U9xjLnhm0fEqg4V mhWwey+UyhOUt7PZf+jDLKcRMjmMzYzTqayTKgM5pIftZiQwoUXMxImFldMy1q/b2qyZmV S/udX+pRRICjcNUlNEf6JYwQri3GPLko2A3KfQQmBXfQsx8A67OHKEHsJycZmRsE+FnwCi S0cnBMIHO3/j2cywE7nFGFDW/sMSw5+MA8VnXrpQziH/RloTnILk4H2Ng8yj1pmhWqkQfM 1j9jOKzI8iRVMvbKhbIIagK3IEzCTXBZ78sWU0J1eb6XvPwidDr04oO3xP/FsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718379828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GQGDy4XoYL/YV00mbhXzlvpBv6wdmlt9kEBf5nzuTU=; b=dLxgjvdEvBLjokwi2Tt4pVnUX4EY1+CXUBl699DkYb4VCwCWog79VmxlY/U+kn9Bn3zZx6 hfECzINFwPmC7cS/mIhJ1f9pHnLnnZsWkeqSGHmLgf8ipLj/jGvqawoRRZvd/ejgIy0h4b ObyOan3/IGF5DJGwhVVFVRx2wyF+SMLvNc0NLdSlYzO7E8QaUAv3LajopPOhQZejvS/HR6 XFV/c99eWeaktQ15KXXxr+CNGmJsEaF0U1KZ2wJU7/m2exx/26eU08onq+mT5U9IVmMbJ9 8SbzlygWdUY28S0MnYEvp5xBdGWo7Ws+6ok9VheAhab/YSVjDOHb/kYf/gMhDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W13Tw0DnszRD9; Fri, 14 Jun 2024 15:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45EFhlbl013976; Fri, 14 Jun 2024 15:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EFhl15013973; Fri, 14 Jun 2024 15:43:47 GMT (envelope-from git) Date: Fri, 14 Jun 2024 15:43:47 GMT Message-Id: <202406141543.45EFhl15013973@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: fa0a3efe9111 - main - comms/liquid-dsp: Update 1.3.2 -> 1.6.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa0a3efe9111f6669fd7335c088c7abc2969d35e Auto-Submitted: auto-generated The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa0a3efe9111f6669fd7335c088c7abc2969d35e commit fa0a3efe9111f6669fd7335c088c7abc2969d35e Author: Michael Reifenberger AuthorDate: 2024-06-14 15:41:48 +0000 Commit: Michael Reifenberger CommitDate: 2024-06-14 15:41:48 +0000 comms/liquid-dsp: Update 1.3.2 -> 1.6.0 PR: 264644 Reported by: Andrey Korobkov --- comms/liquid-dsp/Makefile | 8 ++--- comms/liquid-dsp/distinfo | 6 ++-- comms/liquid-dsp/files/patch-configure.ac | 11 ------ .../files/patch-src_dotprod_src_dotprod__crcf.av.c | 39 ---------------------- .../files/patch-src_dotprod_src_dotprod__rrrf.av.c | 39 ---------------------- comms/liquid-dsp/pkg-plist | 2 ++ 6 files changed, 8 insertions(+), 97 deletions(-) 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,7 +1,6 @@ PORTNAME= liquid-dsp DISTVERSIONPREFIX= v -DISTVERSION= 1.3.2 -PORTREVISION= 1 +DISTVERSION= 1.6.0 CATEGORIES= comms MAINTAINER= mr@FreeBSD.org @@ -11,10 +10,9 @@ 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 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