git: c55ba715cb29 - main - math/pffft: update g20210806 → 2022.12.19

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 18 Jan 2025 03:29:38 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c55ba715cb2953b61e0c42b80fcf95e9b3431065

commit c55ba715cb2953b61e0c42b80fcf95e9b3431065
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-01-18 02:15:40 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-01-18 03:29:32 +0000

    math/pffft: update g20210806 → 2022.12.19
---
 math/pffft/Makefile                   |  4 +--
 math/pffft/distinfo                   |  6 ++---
 math/pffft/files/patch-CMakeLists.txt | 47 ++++++++++++++---------------------
 math/pffft/pkg-plist                  |  1 +
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/math/pffft/Makefile b/math/pffft/Makefile
index ad486c97dd63..650d0ce2966d 100644
--- a/math/pffft/Makefile
+++ b/math/pffft/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pffft
-PORTVERSION=	g20210806
+PORTVERSION=	2022.12.19 # use date because this library is unlikely to ever have releases
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,7 +14,7 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	marton78
-GH_TAGNAME=	9603871
+GH_TAGNAME=	e0bf595
 
 CMAKE_ON=	BUILD_SHARED_LIBS INSTALL_PFDSP INSTALL_PFFASTCONV
 
diff --git a/math/pffft/distinfo b/math/pffft/distinfo
index 534c8297e382..1123aaa341e0 100644
--- a/math/pffft/distinfo
+++ b/math/pffft/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643563740
-SHA256 (marton78-pffft-g20210806-9603871_GH0.tar.gz) = 474d929600969d2a55e0f599459e4c2a5e004f059ad2a5a001dd481285257e14
-SIZE (marton78-pffft-g20210806-9603871_GH0.tar.gz) = 143602
+TIMESTAMP = 1737159043
+SHA256 (marton78-pffft-2022.12.19-e0bf595_GH0.tar.gz) = 2bd6fb3df6a65588b6ef4ee36f4930449dabca392125a0e07d74b780fc32a943
+SIZE (marton78-pffft-2022.12.19-e0bf595_GH0.tar.gz) = 158769
diff --git a/math/pffft/files/patch-CMakeLists.txt b/math/pffft/files/patch-CMakeLists.txt
index 4ad2357aa128..b88715ccc1c5 100644
--- a/math/pffft/files/patch-CMakeLists.txt
+++ b/math/pffft/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-08-06 18:28:48 UTC
+--- CMakeLists.txt.orig	2022-12-19 10:24:43 UTC
 +++ CMakeLists.txt
-@@ -144,7 +144,7 @@ endif()
+@@ -170,7 +170,7 @@ endif()
  
  ######################################################
  
@@ -8,35 +8,26 @@
 +add_library(PFFFT ${FLOAT_SOURCES} ${DOUBLE_SOURCES} pffft_common.c pffft_priv_impl.h pffft.hpp )
  set_target_properties(PFFFT PROPERTIES OUTPUT_NAME "pffft")
  target_compile_definitions(PFFFT PRIVATE _USE_MATH_DEFINES)
- if (USE_SCALAR_VECT)
-@@ -173,8 +173,6 @@ if (USE_SIMD AND USE_TYPE_DOUBLE)
-     else()
-       set_property(SOURCE pffft_double.c PROPERTY COMPILE_FLAGS "-mavx")
-     endif()
--  else()
--    set_property(SOURCE pffft_double.c PROPERTY COMPILE_FLAGS "-march=native")
-   endif()
-   if(DISABLE_SIMD_AVX)
-     target_compile_definitions(PFFFT PRIVATE PFFFT_AVX_DISABLE=1)
-@@ -193,7 +191,7 @@ endif()
- 
- if (USE_TYPE_FLOAT)
+ target_activate_c_compiler_warnings(PFFFT)
+@@ -196,7 +196,7 @@ if (PFFFT_USE_TYPE_FLOAT)
+ ######################################################
  
--  add_library(PFDSP STATIC pf_mixer.cpp pf_mixer.h pf_carrier.cpp pf_carrier.h pf_cic.cpp pf_cic.h fmv.h )
-+  add_library(PFDSP pf_mixer.cpp pf_mixer.h pf_carrier.cpp pf_carrier.h pf_cic.cpp pf_cic.h fmv.h )
+ if (PFFFT_USE_TYPE_FLOAT)
+-  add_library(PFDSP STATIC pf_mixer.cpp pf_mixer.h pf_cplx.h pf_carrier.cpp pf_carrier.h pf_cic.cpp pf_cic.h fmv.h )
++  add_library(PFDSP pf_mixer.cpp pf_mixer.h pf_cplx.h pf_carrier.cpp pf_carrier.h pf_cic.cpp pf_cic.h fmv.h )
+   set_property(TARGET PFDSP PROPERTY CXX_STANDARD 11)
+   set_property(TARGET PFDSP PROPERTY CXX_STANDARD_REQUIRED ON)
    set_target_properties(PFDSP PROPERTIES OUTPUT_NAME "pfdsp")
-   target_compile_definitions(PFDSP PRIVATE _USE_MATH_DEFINES)
-   if (USE_DEBUG_ASAN)
-@@ -218,7 +216,7 @@ endif()
- if (USE_FFTPACK)
+@@ -225,7 +225,7 @@ if (PFFFT_USE_FFTPACK)
+ if (PFFFT_USE_FFTPACK)
  
    # float / single precision
 -  add_library(FFTPACK_FLOAT STATIC fftpack.c fftpack.h)
 +  add_library(FFTPACK_FLOAT fftpack.c fftpack.h)
    target_compile_definitions(FFTPACK_FLOAT PRIVATE _USE_MATH_DEFINES)
-   target_compile_options(FFTPACK_FLOAT PRIVATE $<$<C_COMPILER_ID:GNU>:-Wall -Wextra -pedantic>)
+   target_activate_c_compiler_warnings(FFTPACK_FLOAT)
    target_link_libraries( FFTPACK_FLOAT ${MATHLIB} )
-@@ -227,7 +225,7 @@ if (USE_FFTPACK)
+@@ -234,7 +234,7 @@ if (PFFFT_USE_FFTPACK)
    )
  
    # double precision
@@ -44,17 +35,17 @@
 +  add_library(FFTPACK_DOUBLE fftpack.c fftpack.h)
    target_compile_definitions(FFTPACK_DOUBLE PRIVATE _USE_MATH_DEFINES)
    target_compile_definitions(FFTPACK_DOUBLE PUBLIC FFTPACK_DOUBLE_PRECISION)
-   target_compile_options(FFTPACK_DOUBLE PRIVATE $<$<C_COMPILER_ID:GNU>:-Wall -Wextra -pedantic>)
-@@ -251,7 +249,7 @@ endif()
+   target_activate_c_compiler_warnings(FFTPACK_DOUBLE)
+@@ -258,7 +258,7 @@ if (PFFFT_USE_TYPE_FLOAT)
  
- if (USE_TYPE_FLOAT)
+ if (PFFFT_USE_TYPE_FLOAT)
    # only 'float' supported in PFFASTCONV
 -  add_library(PFFASTCONV STATIC pffastconv.c pffastconv.h pffft.h )
 +  add_library(PFFASTCONV pffastconv.c pffastconv.h pffft.h )
    set_target_properties(PFFASTCONV PROPERTIES OUTPUT_NAME "pffastconv")
    target_compile_definitions(PFFASTCONV PRIVATE _USE_MATH_DEFINES)
-   if (USE_DEBUG_ASAN)
-@@ -447,7 +445,9 @@ endif()
+   target_activate_c_compiler_warnings(PFFASTCONV)
+@@ -597,7 +597,9 @@ endif()
  
  ######################################################
  
diff --git a/math/pffft/pkg-plist b/math/pffft/pkg-plist
index e0515d72a96e..4a4fb44f4e6c 100644
--- a/math/pffft/pkg-plist
+++ b/math/pffft/pkg-plist
@@ -1,5 +1,6 @@
 include/pffft/pf_carrier.h
 include/pffft/pf_cic.h
+include/pffft/pf_cplx.h
 include/pffft/pf_mixer.h
 include/pffft/pffastconv.h
 include/pffft/pffft.h