git: 3cbc36947bb2 - main - audio/libfishsound: Update to 1.0.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 19 Feb 2025 11:57:51 UTC
The branch main has been updated by sunpoet:

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

commit 3cbc36947bb20af341ff28de569d2ded655dd246
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-02-19 11:53:39 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-02-19 11:53:39 +0000

    audio/libfishsound: Update to 1.0.1
    
    - Update MASTER_SITES
    - Remove my LOCAL from MASTER_SITES
    - Update WWW
    - Remove DOXYGEN option: it is already built and shipped in the tarball
    - Convert REINPLACE_CMD to patch file
    
    Changes:        https://gitlab.xiph.org/xiph/libfishsound/-/releases
---
 audio/libfishsound/Makefile                        |  21 ++--
 audio/libfishsound/distinfo                        |   5 +-
 audio/libfishsound/files/extra-patch-Makefile.in   |  11 ++
 .../files/patch-src-libfishsound-flac.c            |  22 ----
 audio/libfishsound/pkg-plist                       | 116 +++++++++------------
 5 files changed, 69 insertions(+), 106 deletions(-)

diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index 8f157fb7de3a..5a4483f521c9 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -1,14 +1,12 @@
 PORTNAME=	libfishsound
-PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTVERSION=	1.0.1
 CATEGORIES=	audio
-MASTER_SITES=	https://downloads.xiph.org/releases/libfishsound/ \
-		https://ftp.osuosl.org/pub/xiph/releases/libfishsound/ \
-		LOCAL/sunpoet
+MASTER_SITES=	https://ftp.osuosl.org/pub/xiph/releases/libfishsound/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Programming interface to decode/encode audio data
-WWW=		https://www.xiph.org/fishsound/
+WWW=		https://www.xiph.org/fishsound/ \
+		https://gitlab.xiph.org/xiph/libfishsound
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -19,17 +17,12 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 
 USES=		libtool pathfix pkgconfig
 
+CONFIGURE_ARGS=	ac_cv_prog_HAVE_DOXYGEN=false
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS DOXYGEN
-OPTIONS_SUB=	yes
-DOXYGEN_IMPLIES=DOCS
-
-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
-
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| doc||' ${WRKSRC}/Makefile.in
+OPTIONS_DEFINE=	DOCS
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
 
 .include <bsd.port.mk>
diff --git a/audio/libfishsound/distinfo b/audio/libfishsound/distinfo
index 56734e989889..f7f965b03c08 100644
--- a/audio/libfishsound/distinfo
+++ b/audio/libfishsound/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libfishsound-1.0.0.tar.gz) = 2e0b57ce2fecc9375eef72938ed08ac8c8f6c5238e1cae24458f0b0e8dade7c7
-SIZE (libfishsound-1.0.0.tar.gz) = 444980
+TIMESTAMP = 1739930136
+SHA256 (libfishsound-1.0.1.tar.gz) = 03eb1601e2306adc88c776afdf212217c6547990d2d0f9ca544dad9a8a9dbb8f
+SIZE (libfishsound-1.0.1.tar.gz) = 665239
diff --git a/audio/libfishsound/files/extra-patch-Makefile.in b/audio/libfishsound/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..8d0be82d0b14
--- /dev/null
+++ b/audio/libfishsound/files/extra-patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2025-02-15 07:50:04 UTC
++++ Makefile.in
+@@ -414,7 +414,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+-SUBDIRS = doc include src
++SUBDIRS = include src
+ EXTRA_DIST = fishsound.pc.in README.win32 \
+ 	win32/Makefile \
+ 	win32/libfishsound/libfishsound.def \
diff --git a/audio/libfishsound/files/patch-src-libfishsound-flac.c b/audio/libfishsound/files/patch-src-libfishsound-flac.c
deleted file mode 100644
index dfea5e263cfa..000000000000
--- a/audio/libfishsound/files/patch-src-libfishsound-flac.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libfishsound/flac.c.orig	2010-02-03 13:34:02 UTC
-+++ src/libfishsound/flac.c
-@@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void
- #if FS_DECODE
- static FLAC__StreamDecoderReadStatus
- fs_flac_read_callback(const FLAC__StreamDecoder *decoder,
--                      FLAC__byte buffer[], unsigned int *bytes,
-+                      FLAC__byte buffer[], size_t *bytes,
-                       void *client_data)
- {
-   FishSound* fsound = (FishSound*)client_data;
-@@ -346,8 +346,8 @@ dec_err:
- #if FS_ENCODE
- static FLAC__StreamEncoderWriteStatus
- fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,
--                           const FLAC__byte buffer[], unsigned bytes,
--                           unsigned samples, unsigned current_frame,
-+                           const FLAC__byte buffer[], size_t bytes,
-+                           uint32_t samples, uint32_t current_frame,
-                            void *client_data)
- {
-   FishSound* fsound = (FishSound*)client_data;
diff --git a/audio/libfishsound/pkg-plist b/audio/libfishsound/pkg-plist
index 439eb953ef4e..bf8ff2d0f4c6 100644
--- a/audio/libfishsound/pkg-plist
+++ b/audio/libfishsound/pkg-plist
@@ -7,52 +7,43 @@ include/fishsound/fishsound.h
 lib/libfishsound.a
 lib/libfishsound.so
 lib/libfishsound.so.1
-lib/libfishsound.so.1.3.0
+lib/libfishsound.so.1.3.1
 libdata/pkgconfig/fishsound.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/bc_sd.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png
 %%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/comments_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/comments_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/comments_8h.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/comments_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/constants_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/constants_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/constants_8h.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/constants_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/decode_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/decode_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/decode_8h.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/decode_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/deprecated_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/deprecated_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/deprecated_8h.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/deprecated_8h_source.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/dir_7930a221d9c88f7293645f0ecf989605.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/dir_e931c1a3f0014e624d0645a271726ad2.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/doc.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/docd.png
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_7930a221d9c88f7293645f0ecf989605.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_e931c1a3f0014e624d0645a271726ad2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.svg
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/dynsections.js
-%%PORTDOCS%%%%DOCSDIR%%/html/encode_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.svg
+%%PORTDOCS%%%%DOCSDIR%%/html/dynsections.js
+%%PORTDOCS%%%%DOCSDIR%%/html/encode_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/encode_8h.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/encode_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fishsound_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fishsound_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fishsound_8h.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/fishsound_8h_source.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/folderclosed.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/folderopen.png
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/group__about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/group__building.html
 %%PORTDOCS%%%%DOCSDIR%%/html/group__configuration.html
@@ -61,54 +52,42 @@ libdata/pkgconfig/fishsound.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/group__install.html
 %%PORTDOCS%%%%DOCSDIR%%/html/group__win32.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/menu.js
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/menudata.js
+%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/menu.js
+%%PORTDOCS%%%%DOCSDIR%%/html/menudata.js
 %%PORTDOCS%%%%DOCSDIR%%/html/modules.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/nav_fd.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/nav_g.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/nav_hd.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/open.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/splitbar.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/splitbard.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/structFS__DecEnc.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/structFS__EncDec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/html/splitbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/structFishSoundComment.html
 %%PORTDOCS%%%%DOCSDIR%%/html/structFishSoundFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/structFishSoundInfo.html
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/sync_on.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_ad.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.gif
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_bd.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_hd.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/html/tab_sd.png
+%%PORTDOCS%%%%DOCSDIR%%/html/structFS__DecEnc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/structFS__EncDec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%NO_DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/FreeSans.ttf
-%%PORTDOCS%%%%DOCSDIR%%/latex/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/latex/annotated.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/comments_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/comments_8h.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/comments_8h_source.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/constants_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/constants_8h.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/constants_8h_source.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/decode_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/decode_8h.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/decode_8h_source.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/deprecated_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/deprecated_8h.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/deprecated_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/doxygen.sty
+%%PORTDOCS%%%%DOCSDIR%%/latex/encode_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/encode_8h.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/encode_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/files.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/fishsound_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/fishsound_8h.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/fishsound_8h_source.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/group__about.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/group__building.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/group__configuration.tex
@@ -117,12 +96,13 @@ libdata/pkgconfig/fishsound.pc
 %%PORTDOCS%%%%DOCSDIR%%/latex/group__install.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/group__win32.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/index.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/longtable_doxygen.sty
+%%PORTDOCS%%%%DOCSDIR%%/latex/longtable_doxygen.sty
+%%PORTDOCS%%%%DOCSDIR%%/latex/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/latex/modules.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/refman.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/structFS__DecEnc.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/structFS__EncDec.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/structFishSoundComment.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/structFishSoundFormat.tex
 %%PORTDOCS%%%%DOCSDIR%%/latex/structFishSoundInfo.tex
-%%DOXYGEN%%%%PORTDOCS%%%%DOCSDIR%%/latex/tabu_doxygen.sty
+%%PORTDOCS%%%%DOCSDIR%%/latex/structFS__DecEnc.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/structFS__EncDec.tex
+%%PORTDOCS%%%%DOCSDIR%%/latex/tabu_doxygen.sty