<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/322474693c94b14f17c6dea6d177c84647434cec">https://github.com/macports/macports-ports/commit/322474693c94b14f17c6dea6d177c84647434cec</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 322474693c9 dspl: update to 2024.06.05
</span>322474693c9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 322474693c94b14f17c6dea6d177c84647434cec
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Jun 21 17:00:00 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> dspl: update to 2024.06.05
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ryan Carsten Schmidt <ryandesign@macports.org>
</span>---
science/dspl/Portfile | 22 +++++---
science/dspl/files/0001-Fixes-for-Macports.patch | 67 +++++++++++-------------
2 files changed, 44 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/dspl/Portfile b/science/dspl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c5603bb946d..376c3be6423 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/dspl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/dspl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,19 +7,25 @@ PortGroup github 1.0
</span> PortGroup linear_algebra 1.0
PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Dsplib libdspl-2.0 945a7fd417dab398a950ebc2557b3dcae109c7df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Dsplib libdspl-2.0 83f8106416ddbd2380560e631163cb4de3553a39
</span> name dspl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2021.12.29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2024.06.05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science math
license LGPL-3
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Opensource cross-platform digital signal processing algorithm library, written in C.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Opensource cross-platform digital signal processing algorithm library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}, written in C.
</span> homepage http://en.dsplib.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ba5a22d87d9c2dfd345ca8412da504b20d303502 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4285e9edbf0a592ebf2300a1a285b7eead2aae450665f48ca03fb12488b6135e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5753296
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 430f7960db73d2e0788186384d854f9da4546e8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b7fbe64d7f2e27bf60bbbcf21e6f8882bd71c6389c6585f28d0cfad173138c49 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5960186
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DOS to UNIX line endings so we can patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/dspl/src/dft "s|\r||g" fft_cmplx.c ifft_cmplx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
patchfiles 0001-Fixes-for-Macports.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/dspl/files/0001-Fixes-for-Macports.patch b/science/dspl/files/0001-Fixes-for-Macports.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0291a041a90..ad692e3fae6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/dspl/files/0001-Fixes-for-Macports.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/dspl/files/0001-Fixes-for-Macports.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d8334dbd3f9aaac696054b808b9bc1cf5f3bda57 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 11 Jan 2023 05:55:51 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fixes for Macports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> 1. Do not build internal LAPACK, since linking to it fails: https://github.com/Dsplib/libdspl-2.0/issues/5
2. Use the right compiler.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-3. Add missing header.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3. Add missing headers: https://github.com/Dsplib/libdspl-2.0/issues/8
</span> 4. Do not link to libquadmath on PPC, it is not there.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/dspl/Makefile b/dspl/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2113580..e71b119 100644
</span> --- dspl/Makefile
+++ dspl/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,8 +16,8 @@ all: $(RELEASE_DIR)/$(LIB_NAME)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,8 +67,8 @@
</span> $(RELEASE_DIR)/dspl.h
#Build libdspl.dll or libdspl.so
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +13,9 @@ index 2113580..e71b119 100644
</span> +$(RELEASE_DIR)/$(LIB_NAME): $(DSPL_OBJ_FILES)
+ $(CC) -shared -o $(RELEASE_DIR)/$(LIB_NAME) $(DSPL_OBJ_FILES) -lm -L@PREFIX@/lib -llapack -lblas $(EXTRAFLIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #Compile libdspl obj files from c sources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(DSPL_OBJ_DIR)/%.o:$(DSPL_SRC_DIR)/%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,18 +35,6 @@ $(PERFORMANCE_BIN_DIR)/$(LIB_NAME):$(RELEASE_DIR)/$(LIB_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,18 +119,6 @@
</span> $(VERIFICATION_BIN_DIR)/$(LIB_NAME):$(RELEASE_DIR)/$(LIB_NAME)
cp $(RELEASE_DIR)/$(LIB_NAME) $(VERIFICATION_BIN_DIR)/$(LIB_NAME)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,28 +34,36 @@ index 2113580..e71b119 100644
</span> #Copy dspl.c source to the release folder
$(RELEASE_DIR)/dspl.c:
cp $(INC_DIR)/dspl.c $(RELEASE_DIR)/dspl.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/dspl/src/gnuplot.c b/dspl/src/gnuplot.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e131269..82acb27 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dspl/src/gnuplot.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dspl/src/gnuplot.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dspl/src/dft/fft_cmplx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dspl/src/dft/fft_cmplx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <float.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dspl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "dft.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef DOXYGEN_ENGLISH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dspl/src/dft/ifft_cmplx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dspl/src/dft/ifft_cmplx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <float.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dspl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "dft.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef DOXYGEN_ENGLISH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dspl/src/gnuplot/gnuplot_create.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dspl/src/gnuplot/gnuplot_create.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * along with Foobar. If not, see <http://www.gnu.org/licenses/>.
</span> */
#include <stdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span> +#include <string.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span> #include "dspl.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GNUPLOT_NO 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -489,7 +490,3 @@ int DSPL_API gnuplot_open(void** hplot)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ERROR_GNUPLOT_CREATE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return RES_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/make.inc b/make.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6f4cdac..13cc35d 100644
</span> --- make.inc
+++ make.inc
@@ -1,28 +1,11 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,10 +122,3 @@ index 6f4cdac..13cc35d 100644
</span> endif
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,4 +50,4 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else ifeq ($(UNAME_S),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAKE = make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span></pre><pre style='margin:0'>
</pre>