Changes 1.4.0:

* Implement corrected channel mappings for all input and playback file types
* Correct an possible infinite loop in WAV input reading code when header is
  corrupt
* Implement disable_coupling option for oggenc
* Fix Ctrl-C lockup bug in ogg123
* ogg123 playback in sorted order
* Add WAVEFORMATEXTENSIBLE support
* More translations
* Add '-' as stdin/out filename in vcut
* Add -lnetwork check for socket in configure
* Remove 'extra' F parameter from ogg123 remote output

8 files changed, 38 insertions, 53 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 4b946e6e777..1423ed81f95 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2010/05/19 18:25:19 drochner Exp $
+# $NetBSD: Makefile,v 1.54 2010/11/09 13:13:03 adam Exp $
 
-DISTNAME=	vorbis-tools-1.2.0
-PKGREVISION=	4
+DISTNAME=	vorbis-tools-1.4.0
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
@@ -15,15 +14,14 @@ BUILD_DEFS+=	IPV6_READY
 
 CONFLICTS=	vorbis-[0-9]*
 
+USE_TOOLS+=		pkg-config
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_PREFIX.libogg}	\
-			--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
-			--with-ao-prefix=${BUILDLINK_PREFIX.libao} \
-			--enable-vcut
+CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_PREFIX.libogg}
+CONFIGURE_ARGS+=	--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
 
-PLIST_SUBST+=	DISTNAME=${DISTNAME:Q}
+PLIST_SUBST+=	DISTNAME=${DISTNAME}
 
 PTHREAD_OPTS+=	require
 
diff --git a/audio/vorbis-tools/PLIST b/audio/vorbis-tools/PLIST
index 797555bcba8..5b00454e2f8 100644
--- a/audio/vorbis-tools/PLIST
+++ b/audio/vorbis-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:32:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/11/09 13:13:03 adam Exp $
 bin/ogg123
 bin/oggdec
 bin/oggenc
@@ -15,12 +15,17 @@ share/doc/${DISTNAME}/ogg123rc-example
 share/locale/be/LC_MESSAGES/vorbis-tools.mo
 share/locale/cs/LC_MESSAGES/vorbis-tools.mo
 share/locale/da/LC_MESSAGES/vorbis-tools.mo
+share/locale/en_GB/LC_MESSAGES/vorbis-tools.mo
+share/locale/eo/LC_MESSAGES/vorbis-tools.mo
 share/locale/es/LC_MESSAGES/vorbis-tools.mo
 share/locale/fr/LC_MESSAGES/vorbis-tools.mo
 share/locale/hr/LC_MESSAGES/vorbis-tools.mo
 share/locale/hu/LC_MESSAGES/vorbis-tools.mo
 share/locale/nl/LC_MESSAGES/vorbis-tools.mo
+share/locale/pl/LC_MESSAGES/vorbis-tools.mo
 share/locale/ro/LC_MESSAGES/vorbis-tools.mo
 share/locale/ru/LC_MESSAGES/vorbis-tools.mo
+share/locale/sk/LC_MESSAGES/vorbis-tools.mo
 share/locale/sv/LC_MESSAGES/vorbis-tools.mo
 share/locale/uk/LC_MESSAGES/vorbis-tools.mo
+share/locale/vi/LC_MESSAGES/vorbis-tools.mo
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index c0555558934..e8d7e20f268 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.22 2010/05/19 18:25:19 drochner Exp $
+$NetBSD: distinfo,v 1.23 2010/11/09 13:13:03 adam Exp $
 
-SHA1 (vorbis-tools-1.2.0.tar.gz) = c5c5ee4637ab8c9fc953d203663b7264432f874a
-RMD160 (vorbis-tools-1.2.0.tar.gz) = 8cb6925c6e4e69373b6c91ff20d7ed8d75153b7c
-Size (vorbis-tools-1.2.0.tar.gz) = 1076814 bytes
-SHA1 (patch-aa) = a9fe36760479678df09f840671c515e0d9f37796
-SHA1 (patch-ab) = b706ae0bc9e13c5ccff689aa1451efc782e340e9
-SHA1 (patch-ac) = 53065c4db39f7e975712c2cba51ff5542cf5a77f
-SHA1 (patch-ad) = 6fe04631cd098fc64bf0914f1fd4ef654c0089b0
-SHA1 (patch-ae) = 3984d1b7b7207afe70cee29db072a304b69db194
+SHA1 (vorbis-tools-1.4.0.tar.gz) = fc6a820bdb5ad6fcac074721fab5c3f96eaf6562
+RMD160 (vorbis-tools-1.4.0.tar.gz) = ff21e5c9456ac0a82b8eda4e53931db8522a2ccd
+Size (vorbis-tools-1.4.0.tar.gz) = 1346532 bytes
+SHA1 (patch-aa) = ea37946fb3a227d91eeb3ea94a9a7c9f8a3ef021
+SHA1 (patch-ab) = 00c0a5a9388baf79fd944e12cda1da65e2e8676c
+SHA1 (patch-ac) = 43f270b53044c54cf682ee084fa29592cf2b0eeb
+SHA1 (patch-ae) = 60ca36c35325e4228ea7f7f5b3a60cd57b56b0cd
diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa
index 002aac2dbc7..8600aad96ee 100644
--- a/audio/vorbis-tools/patches/patch-aa
+++ b/audio/vorbis-tools/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2008/03/14 18:55:54 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2010/11/09 13:13:03 adam Exp $
 
---- ogg123/buffer.c.orig	2008-03-03 05:37:26.000000000 +0000
+--- ogg123/buffer.c.orig	2010-03-24 08:10:47.000000000 +0000
 +++ ogg123/buffer.c
-@@ -419,7 +419,9 @@ void buffer_reset (buf_t *buf)
+@@ -429,7 +429,9 @@ void buffer_reset (buf_t *buf)
  
    /* Cleanup pthread variables */
    pthread_mutex_destroy(&buf->mutex);
diff --git a/audio/vorbis-tools/patches/patch-ab b/audio/vorbis-tools/patches/patch-ab
index cee43285ede..f03c6875f31 100644
--- a/audio/vorbis-tools/patches/patch-ab
+++ b/audio/vorbis-tools/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.7 2007/01/13 15:35:52 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2010/11/09 13:13:03 adam Exp $
 
---- ogg123/ogg123.c.orig	2005-06-03 10:15:09.000000000 +0000
+--- ogg123/ogg123.c.orig	2010-03-24 08:11:11.000000000 +0000
 +++ ogg123/ogg123.c
-@@ -610,7 +610,13 @@ void play (char *source_string)
-   
+@@ -743,7 +743,13 @@ void play (char *source_string)
+ 
    format->cleanup(decoder);
    transport->close(source);
 +#if 0
@@ -15,4 +15,4 @@ $NetBSD: patch-ab,v 1.7 2007/01/13 15:35:52 wiz Exp $
 +#endif
  
    status_message(1, _("Done."));
-   
+ 
diff --git a/audio/vorbis-tools/patches/patch-ac b/audio/vorbis-tools/patches/patch-ac
index 100caaa2427..b287c548d0a 100644
--- a/audio/vorbis-tools/patches/patch-ac
+++ b/audio/vorbis-tools/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2010/11/09 13:13:03 adam Exp $
 
---- oggenc/oggenc.c.orig	2008-03-03 05:37:27.000000000 +0000
+--- oggenc/oggenc.c.orig	2010-03-26 07:07:07.000000000 +0000
 +++ oggenc/oggenc.c
-@@ -676,6 +676,8 @@ static void parse_options(int argc, char
+@@ -779,6 +779,8 @@ static void parse_options(int argc, char
  
                  break;
              case 'a':
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $
                  opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *));
                  opt->artist[opt->artist_count - 1] = strdup(optarg);
                  break;
-@@ -688,10 +690,14 @@ static void parse_options(int argc, char
+@@ -791,10 +793,14 @@ static void parse_options(int argc, char
                  opt->comments[opt->comment_count - 1] = strdup(optarg);
                  break;
              case 'd':
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $
                  opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *));
                  opt->genre[opt->genre_count - 1] = strdup(optarg);
                  break;
-@@ -700,6 +706,8 @@ static void parse_options(int argc, char
+@@ -803,6 +809,8 @@ static void parse_options(int argc, char
                  exit(0);
                  break;
              case 'l':
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $
                  opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *));
                  opt->album[opt->album_count - 1] = strdup(optarg);
                  break;
-@@ -712,6 +720,8 @@ static void parse_options(int argc, char
+@@ -815,6 +823,8 @@ static void parse_options(int argc, char
                                      opt->fixedserial = 1;
                  break;
              case 't':
diff --git a/audio/vorbis-tools/patches/patch-ad b/audio/vorbis-tools/patches/patch-ad
deleted file mode 100644
index 41c36d4d3be..00000000000
--- a/audio/vorbis-tools/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2008/04/29 05:51:10 wiz Exp $
-
-https://trac.xiph.org/attachment/ticket/1347/vorbis-tools-1.2.0-sec.patch
-for
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1686
-
---- ogg123/speex_format.c.orig	2008-03-03 06:37:26.000000000 +0100
-+++ ogg123/speex_format.c
-@@ -475,7 +475,7 @@ void *process_header(ogg_packet *op, int
-            cb->printf_error(callback_arg, ERROR, _("Cannot read header"));
-      return NULL;
-    }
--   if ((*header)->mode >= SPEEX_NB_MODES) {
-+   if ((*header)->mode >= SPEEX_NB_MODES || (*header)->mode < 0) {
-      cb->printf_error(callback_arg, ERROR, 
- 		      _("Mode number %d does not (any longer) exist in this version"),
- 	      (*header)->mode);
diff --git a/audio/vorbis-tools/patches/patch-ae b/audio/vorbis-tools/patches/patch-ae
index d204062bb18..5bb926dcd1e 100644
--- a/audio/vorbis-tools/patches/patch-ae
+++ b/audio/vorbis-tools/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.3 2010/05/19 18:25:20 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2010/11/09 13:13:03 adam Exp $
 
---- ogg123/callbacks.c.orig	2010-05-19 16:23:11.000000000 +0000
+--- ogg123/callbacks.c.orig	2010-01-27 04:14:11.000000000 +0000
 +++ ogg123/callbacks.c
 @@ -48,6 +48,7 @@ void audio_reopen_action (buf_t *buf, vo
  
    close_audio_devices (reopen_arg->devices);
-   
+ 
 +  memset(&format, 0, sizeof(format));
    /* Record audio device settings and open the devices */
    format.rate = reopen_arg->format->rate;