From caad29ab1c88e82409f6524559261e73968b933a Mon Sep 17 00:00:00 2001 From: juanfra Date: Sat, 9 Jul 2022 21:37:57 +0000 Subject: [PATCH] Update to wavpack 5.5.0. --- audio/wavpack/Makefile | 11 ++++------- audio/wavpack/distinfo | 4 ++-- audio/wavpack/patches/patch-cli_dsdiff_c | 20 -------------------- audio/wavpack/patches/patch-cli_dsf_c | 15 --------------- audio/wavpack/pkg/PLIST | 1 + 5 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 audio/wavpack/patches/patch-cli_dsdiff_c delete mode 100644 audio/wavpack/patches/patch-cli_dsf_c diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile index 33e90590484..87dc0e299cd 100644 --- a/audio/wavpack/Makefile +++ b/audio/wavpack/Makefile @@ -1,7 +1,6 @@ COMMENT = audio codec for lossless, lossy and hybrid compression -VERSION = 5.4.0 -REVISION = 0 +VERSION = 5.5.0 DISTNAME = wavpack-${VERSION} CATEGORIES = audio @@ -19,6 +18,7 @@ WANTLIB = c crypto iconv m MASTER_SITES = https://github.com/dbry/wavpack/releases/download/${VERSION}/ EXTRACT_SUFX = .tar.xz +BUILD_DEPENDS = textproc/docbook-xsl LIB_DEPENDS = converters/libiconv SEPARATE_BUILD = Yes @@ -27,16 +27,13 @@ CONFIGURE_ARGS = --enable-legacy \ --enable-libcrypto \ --enable-tests CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + XSLTPROC=${LOCALBASE}/bin/xsltproc DOCDIR = ${PREFIX}/share/doc/wavpack post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/* ${DOCDIR} - rm ${PREFIX}/bin/wvtest - -do-test: - ${WRKBUILD}/cli/wvtest --default .include diff --git a/audio/wavpack/distinfo b/audio/wavpack/distinfo index 522082a761b..4a6c1cb3fd3 100644 --- a/audio/wavpack/distinfo +++ b/audio/wavpack/distinfo @@ -1,2 +1,2 @@ -SHA256 (wavpack-5.4.0.tar.xz) = S95qayqGYUpr0leeYNzJdOLI+TYI0igREKcXwbPCi3k= -SIZE (wavpack-5.4.0.tar.xz) = 769764 +SHA256 (wavpack-5.5.0.tar.xz) = 73SdmN9GklvCkWmT5gHMfukRTZllPmPg4wTwMbpzuOY= +SIZE (wavpack-5.5.0.tar.xz) = 797996 diff --git a/audio/wavpack/patches/patch-cli_dsdiff_c b/audio/wavpack/patches/patch-cli_dsdiff_c deleted file mode 100644 index bb526e5018a..00000000000 --- a/audio/wavpack/patches/patch-cli_dsdiff_c +++ /dev/null @@ -1,20 +0,0 @@ -"sanitize DSD file types for invalid lengths" - -https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a - -Index: cli/dsdiff.c ---- cli/dsdiff.c.orig -+++ cli/dsdiff.c -@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infil - } - - total_samples = dff_chunk_header.ckDataSize / config->num_channels; -+ -+ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - break; - } - else { // just copy unknown chunks to output file diff --git a/audio/wavpack/patches/patch-cli_dsf_c b/audio/wavpack/patches/patch-cli_dsf_c deleted file mode 100644 index 4a41b06393e..00000000000 --- a/audio/wavpack/patches/patch-cli_dsf_c +++ /dev/null @@ -1,15 +0,0 @@ -"sanitize DSD file types for invalid lengths" - -https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a - -Index: cli/dsf.c ---- cli/dsf.c.orig -+++ cli/dsf.c -@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilena - - if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || - format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || -+ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || - (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || - format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || - format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/audio/wavpack/pkg/PLIST b/audio/wavpack/pkg/PLIST index efc26e1def2..a6851fa7d82 100644 --- a/audio/wavpack/pkg/PLIST +++ b/audio/wavpack/pkg/PLIST @@ -14,6 +14,7 @@ lib/pkgconfig/wavpack.pc @man man/man1/wvunpack.1 share/doc/wavpack/ share/doc/wavpack/ChangeLog +share/doc/wavpack/README.md share/doc/wavpack/WavPack5FileFormat.pdf share/doc/wavpack/WavPack5LibraryDoc.pdf share/doc/wavpack/WavPack5PortingGuide.pdf