git: 6e4a363607a7 - main - audio/libsonic: Update 0.2.0-51 -> 0.2.0-65

[Yuri Victorovich]

The branch main has been updated by yuri:

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

commit 6e4a363607a7a27b26d6d34c0150912d6f640ef7
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-08-18 01:59:11 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-08-18 02:15:03 +0000

    audio/libsonic: Update 0.2.0-51 -> 0.2.0-65
---
 audio/libsonic/Makefile             | 15 +++++++++++----
 audio/libsonic/distinfo             |  6 +++---
 audio/libsonic/files/patch-Makefile | 28 ----------------------------
 audio/libsonic/files/patch-sonic.h  | 11 -----------
 4 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/audio/libsonic/Makefile b/audio/libsonic/Makefile
index 544314c9c134..ecdb5cb0f679 100644
--- a/audio/libsonic/Makefile
+++ b/audio/libsonic/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libsonic
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	0.2.0-51
-DISTVERSIONSUFFIX=	-ge4a56ec
+DISTVERSION=	0.2.0-65
+DISTVERSIONSUFFIX=	-gba33141
 CATEGORIES=	audio
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -13,18 +13,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		gmake localbase:ldflags
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	waywardgeek
 GH_PROJECT=	sonic
-USE_LDCONFIG=	yes
 
-MAKE_ARGS=	CC=${CC} CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
+MAKE_ARGS=	CC=${CC} CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" USE_SPECTROGRAM=1
 CFLAGS+=	-ansi -fPIC -pthread -Wno-unused-function -DSONIC_SPECTROGRAM
 
 PLIST_FILES=	bin/sonic \
 		include/sonic.h \
+		lib/libsonic.a \
 		lib/libsonic.so \
 		lib/libsonic.so.0 \
 		lib/libsonic.so.0.3.0
 
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/bin/sonic \
+		${STAGEDIR}${PREFIX}/lib/libsonic.so.0.3.0
+
 .include <bsd.port.mk>
diff --git a/audio/libsonic/distinfo b/audio/libsonic/distinfo
index 1a2a3883b39e..86589a006f55 100644
--- a/audio/libsonic/distinfo
+++ b/audio/libsonic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530670250
-SHA256 (waywardgeek-sonic-release-0.2.0-51-ge4a56ec_GH0.tar.gz) = 0e0c74a9722225343f5a69df5f213a43b32ed71113ef8e169a7477681989a669
-SIZE (waywardgeek-sonic-release-0.2.0-51-ge4a56ec_GH0.tar.gz) = 5349382
+TIMESTAMP = 1629249354
+SHA256 (waywardgeek-sonic-release-0.2.0-65-gba33141_GH0.tar.gz) = 6c15b504dcc770c7f4bd846a7e2f45370dcd5279e17c5a26b728bca76eaa43d8
+SIZE (waywardgeek-sonic-release-0.2.0-65-gba33141_GH0.tar.gz) = 5350568
diff --git a/audio/libsonic/files/patch-Makefile b/audio/libsonic/files/patch-Makefile
deleted file mode 100644
index d9115ad5dd5f..000000000000
--- a/audio/libsonic/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	2018-07-03 15:11:47 UTC
-+++ Makefile
-@@ -32,7 +32,7 @@ OBJ=$(SRC:.c=.o)
- all: sonic libsonic.so.$(LIB_TAG) libsonic.a
- 
- sonic: wave.o main.o libsonic.a
--	$(CC) $(CFLAGS) -o sonic wave.o main.o libsonic.a -lm $(FFTLIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o sonic wave.o main.o libsonic.a -lm $(FFTLIB)
- 
- sonic.o: sonic.c sonic.h
- 	$(CC) $(CFLAGS) -c sonic.c
-@@ -47,7 +47,7 @@ spectrogram.o: spectrogram.c sonic.h
- 	$(CC) $(CFLAGS) -c spectrogram.c
- 
- libsonic.so.$(LIB_TAG): $(OBJ)
--	$(CC) $(CFLAGS) -shared -Wl,-$(SONAME),libsonic.so.0 $(OBJ) -o libsonic.so.$(LIB_TAG) $(FFTLIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-$(SONAME),libsonic.so.0 $(OBJ) -o libsonic.so.$(LIB_TAG) $(FFTLIB)
- 	ln -sf libsonic.so.$(LIB_TAG) libsonic.so
- 	ln -sf libsonic.so.$(LIB_TAG) libsonic.so.0
- 
-@@ -59,7 +59,6 @@ install: sonic libsonic.so.$(LIB_TAG) so
- 	install sonic $(DESTDIR)$(PREFIX)/bin
- 	install sonic.h $(DESTDIR)$(PREFIX)/include
- 	install libsonic.so.$(LIB_TAG) $(DESTDIR)$(PREFIX)/lib
--	install libsonic.a $(DESTDIR)$(LIBDIR)
- 	ln -sf libsonic.so.$(LIB_TAG) $(DESTDIR)$(PREFIX)/lib/libsonic.so
- 	ln -sf libsonic.so.$(LIB_TAG) $(DESTDIR)$(PREFIX)/lib/libsonic.so.0
- 
diff --git a/audio/libsonic/files/patch-sonic.h b/audio/libsonic/files/patch-sonic.h
deleted file mode 100644
index 57c2d5b7f826..000000000000
--- a/audio/libsonic/files/patch-sonic.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- sonic.h.orig	2018-10-15 14:25:10 UTC
-+++ sonic.h
-@@ -189,8 +189,6 @@ struct sonicBitmapStruct {
-   int numCols;
- };
- 
--typedef struct sonicBitmapStruct* sonicBitmap;
--
- /* Enable coomputation of a spectrogram on the fly. */
- void sonicComputeSpectrogram(sonicStream stream);
-