pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/vorbis-tools Update to 1.2.0:
details: https://anonhg.NetBSD.org/pkgsrc/rev/05ec188948a2
branches: trunk
changeset: 539844:05ec188948a2
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Mar 14 18:55:54 2008 +0000
description:
Update to 1.2.0:
vorbis-tools 1.2.0 -- 2008-02-21
* FLAC support now relies on libFLAC
* Support for large files
* Fixed acinclude.m4 to properly support --no switches
* ogg123: added remote control support
* ogg123: fixed a bug in esd when pressing CTRL + C
* ogg123: fixed a type mismatch in option parsing for 64 bit systems
* ogg123: configuration no longer hardcoded to /etc
* oggdec: limited support for chained Ogg bitstreams
* ogg123: compiles with older versions of libcurl
* oggdec: support decoding of multiple files into a single one
* oggenc: -k, switch for Skeleton bitstream encoding
* oggenc: fixed issues with Skeleton on big endian systems
* oggenc: proper 5.1 channel mapping support
* oggenc: FLAC module does not confuse every Ogg file as its own
* oggenc: compiles with older versions of libvorbis
* ogginfo: recognizes Skeleton, Dirac, FLAC and Kate bitstreams
* vcut: solved issues described in ticket #1313
* vorbiscomment: support for creation of long comments
* vorbiscomment: support for multiplexed Vorbis
* Several minor bug fixes
diffstat:
audio/vorbis-tools/Makefile | 5 +-
audio/vorbis-tools/distinfo | 24 +---
audio/vorbis-tools/patches/patch-aa | 8 +-
audio/vorbis-tools/patches/patch-ac | 78 ++++++------
audio/vorbis-tools/patches/patch-ad | 12 --
audio/vorbis-tools/patches/patch-ae | 23 ---
audio/vorbis-tools/patches/patch-af | 12 --
audio/vorbis-tools/patches/patch-ag | 19 ---
audio/vorbis-tools/patches/patch-ah | 12 --
audio/vorbis-tools/patches/patch-ai | 208 ------------------------------------
audio/vorbis-tools/patches/patch-aj | 171 -----------------------------
audio/vorbis-tools/patches/patch-ak | 26 ----
audio/vorbis-tools/patches/patch-an | 83 --------------
audio/vorbis-tools/patches/patch-ao | 15 --
audio/vorbis-tools/patches/patch-ap | 12 --
audio/vorbis-tools/patches/patch-aq | 13 --
16 files changed, 51 insertions(+), 670 deletions(-)
diffs (truncated from 808 to 300 lines):
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/Makefile
--- a/audio/vorbis-tools/Makefile Fri Mar 14 17:22:49 2008 +0000
+++ b/audio/vorbis-tools/Makefile Fri Mar 14 18:55:54 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2008/01/18 05:06:21 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2008/03/14 18:55:54 wiz Exp $
-DISTNAME= vorbis-tools-1.1.1
-PKGREVISION= 6
+DISTNAME= vorbis-tools-1.2.0
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/distinfo
--- a/audio/vorbis-tools/distinfo Fri Mar 14 17:22:49 2008 +0000
+++ b/audio/vorbis-tools/distinfo Fri Mar 14 18:55:54 2008 +0000
@@ -1,20 +1,8 @@
-$NetBSD: distinfo,v 1.19 2007/01/13 15:35:52 wiz Exp $
+$NetBSD: distinfo,v 1.20 2008/03/14 18:55:54 wiz Exp $
-SHA1 (vorbis-tools-1.1.1.tar.gz) = a1394b39905b389d72f12c2a9f0c86a33d07a487
-RMD160 (vorbis-tools-1.1.1.tar.gz) = ed38929b8a81f833f726e489e55e9f62d5ed69ec
-Size (vorbis-tools-1.1.1.tar.gz) = 948837 bytes
-SHA1 (patch-aa) = 2adc912765d58b19c1285c12ac0935b860b7da34
+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) = 65e07de0f0e4de30b6fed374146535adebba5ed6
-SHA1 (patch-ad) = 729ca84168ee781335429840ee54a2b894b82f54
-SHA1 (patch-ae) = 67bda1581c18dec0e43846f4c39aba35a7b2223e
-SHA1 (patch-af) = eafb75d8b9aade62b9862e3df1380f15eba80f47
-SHA1 (patch-ag) = af25e010e1eb350a8614398d312dd0842a207060
-SHA1 (patch-ah) = fa01e42b339fe2cbd5d98c150e0bb618b43fd4a1
-SHA1 (patch-ai) = c44c9b0bec99b0e8a3883c0ef388f6d0856fa11a
-SHA1 (patch-aj) = 8cfa93518f71feb1e85f4db784d5e5c158dcf11e
-SHA1 (patch-ak) = fb0e11d1aff4753fbb3ee9088e6faeb5bcd58ef1
-SHA1 (patch-an) = a6a1aa59f2bf87b2217e827e6309233515d162c2
-SHA1 (patch-ao) = f509dde919b93ddfba0105189cb645c2667ba0e4
-SHA1 (patch-ap) = 4da7c1a2b92dad4a05322b05451a1ac4c34ce2fb
-SHA1 (patch-aq) = 237bbcb6c4d895dcd01f42cae5a48f11d2a695b1
+SHA1 (patch-ac) = 53065c4db39f7e975712c2cba51ff5542cf5a77f
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-aa
--- a/audio/vorbis-tools/patches/patch-aa Fri Mar 14 17:22:49 2008 +0000
+++ b/audio/vorbis-tools/patches/patch-aa Fri Mar 14 18:55:54 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/12/08 14:43:48 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2008/03/14 18:55:54 wiz Exp $
---- ogg123/buffer.c.orig Mon Sep 1 22:15:19 2003
+--- ogg123/buffer.c.orig 2008-03-03 05:37:26.000000000 +0000
+++ ogg123/buffer.c
-@@ -412,7 +412,9 @@ void buffer_reset (buf_t *buf)
+@@ -419,7 +419,9 @@ void buffer_reset (buf_t *buf)
/* Cleanup pthread variables */
pthread_mutex_destroy(&buf->mutex);
@@ -10,5 +10,5 @@
pthread_cond_destroy(&buf->write_cond);
+ COND_SIGNAL(buf->playback_cond);
pthread_cond_destroy(&buf->playback_cond);
-
+
/* Reinit pthread variables */
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-ac
--- a/audio/vorbis-tools/patches/patch-ac Fri Mar 14 17:22:49 2008 +0000
+++ b/audio/vorbis-tools/patches/patch-ac Fri Mar 14 18:55:54 2008 +0000
@@ -1,46 +1,46 @@
-$NetBSD: patch-ac,v 1.7 2007/01/13 15:35:52 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $
---- oggenc/oggenc.c.orig 2005-06-03 10:15:10.000000000 +0000
+--- oggenc/oggenc.c.orig 2008-03-03 05:37:27.000000000 +0000
+++ oggenc/oggenc.c
-@@ -659,6 +659,8 @@ static void parse_options(int argc, char
+@@ -676,6 +676,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;
-@@ -671,10 +673,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;
+ 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;
+@@ -688,10 +690,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;
++ if (strlen(optarg) == 0)
++ break;
opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *));
opt->genre[opt->genre_count - 1] = strdup(optarg);
break;
-@@ -683,6 +689,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;
-@@ -693,6 +701,8 @@ static void parse_options(int argc, char
- opt->serial = 0; /* Failed, so just set to zero */
- 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;
+@@ -700,6 +706,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;
+@@ -712,6 +720,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 -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-ad
--- a/audio/vorbis-tools/patches/patch-ad Fri Mar 14 17:22:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/03 15:59:13 joerg Exp $
-
---- ogg123/playlist.c.orig 2005-08-17 20:03:15.000000000 +0000
-+++ ogg123/playlist.c
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-ae
--- a/audio/vorbis-tools/patches/patch-ae Fri Mar 14 17:22:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/20 20:08:59 rillig Exp $
-
-ISO-C90 fix.
-
---- oggenc/encode.c.orig Fri Jun 3 12:15:10 2005
-+++ oggenc/encode.c Thu Oct 20 22:06:18 2005
-@@ -160,6 +160,8 @@ int oe_encode(oe_enc_opt *opt)
- /* do we have optional hard bitrate restrictions? */
- if(opt->max_bitrate > 0 || opt->min_bitrate > 0){
- struct ovectl_ratemanage2_arg ai;
-+ long bitrate;
-+
- vorbis_encode_ctl(&vi, OV_ECTL_RATEMANAGE2_GET, &ai);
-
- /* libvorbis 1.1 (and current svn) doesn't actually fill this in,
-@@ -173,7 +175,6 @@ int oe_encode(oe_enc_opt *opt)
- Also, note that this won't work correctly unless you have a very
- recent (2005/03/04 or later) version of libvorbis from svn).
- */
-- long bitrate;
-
- {
- vorbis_info vi2;
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-af
--- a/audio/vorbis-tools/patches/patch-af Fri Mar 14 17:22:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/11/02 07:57:56 wiz Exp $
-
---- ogg123/http_transport.c.orig 2005-06-13 13:11:44.000000000 +0000
-+++ ogg123/http_transport.c
-@@ -116,7 +116,6 @@ void set_curl_opts (http_private_t *priv
- if (inputOpts.ProxyTunnel)
- curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
- */
-- curl_easy_setopt(handle, CURLOPT_MUTE, 1);
- curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
- curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
- curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-ag
--- a/audio/vorbis-tools/patches/patch-ag Fri Mar 14 17:22:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- configure.ac.orig 2005-06-27 09:25:51.000000000 +0000
-+++ configure.ac
-@@ -171,13 +171,8 @@ FLAC_LIBS=""
- if test "x$build_flac" = xyes; then
- AC_CHECK_LIB(m,log,FLAC_LIBS="-lm")
- AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
-- [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
-+ [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS"],
- AC_MSG_WARN([libFLAC missing])
-- have_libFLAC=no, [$FLAC_LIBS]
-- )
-- AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
-- [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
-- AC_MSG_WARN([libOggFLAC missing])
- have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
- )
- AC_CHECK_HEADER(FLAC/stream_decoder.h,,
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-ah
--- a/audio/vorbis-tools/patches/patch-ah Fri Mar 14 17:22:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/Makefile.am.orig 2005-06-13 13:11:44.000000000 +0000
-+++ ogg123/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- if HAVE_LIBFLAC
--flac_sources = flac_format.c easyflac.c easyflac.h
-+flac_sources = flac_format.c
- else
- flac_sources =
- endif
diff -r c0411f7e89ad -r 05ec188948a2 audio/vorbis-tools/patches/patch-ai
--- a/audio/vorbis-tools/patches/patch-ai Fri Mar 14 17:22:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/flac_format.c.orig 2005-06-03 10:15:09.000000000 +0000
-+++ ogg123/flac_format.c
-@@ -25,13 +25,23 @@
- #include "audio.h"
- #include "format.h"
- #include "i18n.h"
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
- #include "easyflac.h"
-+#else
-+#include <FLAC/stream_decoder.h>
-+#endif
- #include "vorbis_comments.h"
-
--#define DEFAULT_FLAC_FRAME_SIZE 4608
--
- typedef struct {
-+#if NEED_EASYFLAC
- EasyFLAC__StreamDecoder *decoder;
-+#else
-+ FLAC__StreamDecoder *decoder;
-+ int is_oggflac;
-+#endif
- short channels;
- int rate;
- int bits_per_sample;
-@@ -67,10 +77,18 @@ format_t oggflac_format;
-
-
- /* Private functions declarations */
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
Home |
Main Index |
Thread Index |
Old Index