vorbis-tools: update to 1.4.2

vorbis-tools 1.4.2 -- 2021-01-21
 * Cleanup of the build system
 * Code cleanup
 * Removed outdated debian/, and vorbis-tools.spec
 * Updated po/ to reflect new code positions
 * ogg123, ogginfo: Added support to decode METADATA_BLOCK_PICTURE
 * ogginfo: Added support for decoding Skeleton

5 files changed, 8 insertions, 135 deletions

diff --git a/audio/vorbis-tools/MESSAGE b/audio/vorbis-tools/MESSAGE
deleted file mode 100644
index 993fdfff671..00000000000
--- a/audio/vorbis-tools/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/11/11 19:50:57 heinz Exp $
-
-By default, ogg123 will decode to the OSS audio device.
-
-Alternatively you can use libao's "sun" (SUN audio/NetBSD
-audio) device.  To setup your personal libao configuration so it
-uses "sun" do:
-
-  echo "default_driver=sun" > ~/.libao
-
-Read the ogg123(1) manual page for further information.
-
-===========================================================================
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 8b1ef4ccf7b..835b001b58a 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.81 2020/05/31 17:37:36 rillig Exp $
+# $NetBSD: Makefile,v 1.82 2021/02/09 20:26:28 nia Exp $
 
-DISTNAME=	vorbis-tools-1.4.0
-PKGREVISION=	23
+DISTNAME=	vorbis-tools-1.4.2
 CATEGORIES=	audio
-MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
+MASTER_SITES=	https://ftp.osuosl.org/pub/xiph/releases/vorbis/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.vorbis.com/
 COMMENT=	Ogg Vorbis encoder and player
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEFS+=	IPV6_READY
-
 CONFLICTS=	vorbis-[0-9]*
 
 USE_TOOLS+=		pkg-config
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index 6bfbae53646..c1c0e2e714a 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.27 2018/07/21 21:26:53 maya Exp $
+$NetBSD: distinfo,v 1.28 2021/02/09 20:26:28 nia Exp $
 
-SHA1 (vorbis-tools-1.4.0.tar.gz) = fc6a820bdb5ad6fcac074721fab5c3f96eaf6562
-RMD160 (vorbis-tools-1.4.0.tar.gz) = ff21e5c9456ac0a82b8eda4e53931db8522a2ccd
-SHA512 (vorbis-tools-1.4.0.tar.gz) = d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
-Size (vorbis-tools-1.4.0.tar.gz) = 1346532 bytes
+SHA1 (vorbis-tools-1.4.2.tar.gz) = c7012dc104da4f35a5d5d46e902cd49214377f5b
+RMD160 (vorbis-tools-1.4.2.tar.gz) = f0f4f859b3a280dfe7ea9a13dc4c39ed3ed37c80
+SHA512 (vorbis-tools-1.4.2.tar.gz) = 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
+Size (vorbis-tools-1.4.2.tar.gz) = 1389947 bytes
 SHA1 (patch-aa) = ea37946fb3a227d91eeb3ea94a9a7c9f8a3ef021
 SHA1 (patch-ab) = 00c0a5a9388baf79fd944e12cda1da65e2e8676c
-SHA1 (patch-ac) = 781ad97014c81f9fd40166cc29112247ef4acd6d
 SHA1 (patch-ae) = 60ca36c35325e4228ea7f7f5b3a60cd57b56b0cd
 SHA1 (patch-configure) = ede9f755ae5d125325da50948d54367ae6c30d7b
-SHA1 (patch-oggenc_audio.c) = 358aa58c2da15ce96db5163eec914df6fda2d9b2
diff --git a/audio/vorbis-tools/patches/patch-ac b/audio/vorbis-tools/patches/patch-ac
deleted file mode 100644
index 11971b408ab..00000000000
--- a/audio/vorbis-tools/patches/patch-ac
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2015/03/21 19:06:54 bsiegert Exp $
-
-https://trac.xiph.org/changeset/19117
-oggenc: fix crash on raw file close, reported by Hanno in issue #2009. pointer
-to a non-static struct was escaping its scope.
---- oggenc/oggenc.c.orig	2010-03-26 07:07:07.000000000 +0000
-+++ oggenc/oggenc.c
-@@ -97,6 +97,8 @@ int main(int argc, char **argv)
-               .3,-1,
-               0,0,0.f,
-               0, 0, 0, 0, 0};
-+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
-+	N_("RAW file reader")};
- 
-     int i;
- 
-@@ -239,9 +241,6 @@ int main(int argc, char **argv)
- 
-         if(opt.rawmode)
-         {
--            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
--                N_("RAW file reader")};
--
-             enc_opts.rate=opt.raw_samplerate;
-             enc_opts.channels=opt.raw_channels;
-             enc_opts.samplesize=opt.raw_samplesize;
-@@ -779,6 +778,8 @@ static void parse_options(int argc, char
- 
-                 break;
-             case 'a':
-+		if (strlen(optarg) == 0)
-+			break;
-                 opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *));
-                 opt->artist[opt->artist_count - 1] = strdup(optarg);
-                 break;
-@@ -791,10 +792,14 @@ static void parse_options(int argc, char
-                 opt->comments[opt->comment_count - 1] = strdup(optarg);
-                 break;
-             case 'd':
-+		if (strlen(optarg) == 0)
-+			break;
-                 opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *));
-                 opt->dates[opt->date_count - 1] = strdup(optarg);
-                 break;
-             case 'G':
-+		if (strlen(optarg) == 0)
-+			break;
-                 opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *));
-                 opt->genre[opt->genre_count - 1] = strdup(optarg);
-                 break;
-@@ -803,6 +808,8 @@ static void parse_options(int argc, char
-                 exit(0);
-                 break;
-             case 'l':
-+		if (strlen(optarg) == 0)
-+			break;
-                 opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *));
-                 opt->album[opt->album_count - 1] = strdup(optarg);
-                 break;
-@@ -815,6 +822,8 @@ static void parse_options(int argc, char
-                                     opt->fixedserial = 1;
-                 break;
-             case 't':
-+		if (strlen(optarg) == 0)
-+			break;
-                 opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *));
-                 opt->title[opt->title_count - 1] = strdup(optarg);
-                 break;
diff --git a/audio/vorbis-tools/patches/patch-oggenc_audio.c b/audio/vorbis-tools/patches/patch-oggenc_audio.c
deleted file mode 100644
index 6b50e71d264..00000000000
--- a/audio/vorbis-tools/patches/patch-oggenc_audio.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-oggenc_audio.c,v 1.1 2015/12/29 15:12:20 bsiegert Exp $
-
-From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj@gmail.com>
-Date: Sun, 30 Aug 2015 05:54:46 -0700
-Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
-
-Fixes https://trac.xiph.org/ticket/2212
----
- oggenc/audio.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 477da8c..4921fb9 100644
---- oggenc/audio.c
-+++ oggenc/audio.c
-@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len, readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-         return 0; /* Weird common chunk */
-     }
- 
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+       (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;