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 fixesdiff -r1.48 -r1.49 pkgsrc/audio/vorbis-tools/Makefile
(wiz)
| @@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.48 2008/01/18 05:06:21 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.49 2008/03/14 18:55:54 wiz Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= vorbis-tools-1.1.1 | 3 | DISTNAME= vorbis-tools-1.2.0 | |
| 4 | PKGREVISION= 6 | |||
| 5 | CATEGORIES= audio | 4 | CATEGORIES= audio | |
| 6 | MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ | 5 | MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ | |
| 7 | 6 | |||
| 8 | MAINTAINER= wiz@NetBSD.org | 7 | MAINTAINER= wiz@NetBSD.org | |
| 9 | HOMEPAGE= http://www.vorbis.com/ | 8 | HOMEPAGE= http://www.vorbis.com/ | |
| 10 | COMMENT= Ogg Vorbis encoder and player | 9 | COMMENT= Ogg Vorbis encoder and player | |
| 11 | 10 | |||
| 12 | PKG_DESTDIR_SUPPORT= user-destdir | 11 | PKG_DESTDIR_SUPPORT= user-destdir | |
| 13 | 12 | |||
| 14 | BUILD_DEFS+= IPV6_READY | 13 | BUILD_DEFS+= IPV6_READY | |
| 15 | 14 | |||
| 16 | CONFLICTS= vorbis-[0-9]* | 15 | CONFLICTS= vorbis-[0-9]* | |
| 17 | 16 |
| @@ -1,20 +1,8 @@ | @@ -1,20 +1,8 @@ | |||
| 1 | $NetBSD: distinfo,v 1.19 2007/01/13 15:35:52 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.20 2008/03/14 18:55:54 wiz Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (vorbis-tools-1.1.1.tar.gz) = a1394b39905b389d72f12c2a9f0c86a33d07a487 | 3 | SHA1 (vorbis-tools-1.2.0.tar.gz) = c5c5ee4637ab8c9fc953d203663b7264432f874a | |
| 4 | RMD160 (vorbis-tools-1.1.1.tar.gz) = ed38929b8a81f833f726e489e55e9f62d5ed69ec | 4 | RMD160 (vorbis-tools-1.2.0.tar.gz) = 8cb6925c6e4e69373b6c91ff20d7ed8d75153b7c | |
| 5 | Size (vorbis-tools-1.1.1.tar.gz) = 948837 bytes | 5 | Size (vorbis-tools-1.2.0.tar.gz) = 1076814 bytes | |
| 6 | SHA1 (patch-aa) = 2adc912765d58b19c1285c12ac0935b860b7da34 | 6 | SHA1 (patch-aa) = a9fe36760479678df09f840671c515e0d9f37796 | |
| 7 | SHA1 (patch-ab) = b706ae0bc9e13c5ccff689aa1451efc782e340e9 | 7 | SHA1 (patch-ab) = b706ae0bc9e13c5ccff689aa1451efc782e340e9 | |
| 8 | SHA1 (patch-ac) = 65e07de0f0e4de30b6fed374146535adebba5ed6 | 8 | SHA1 (patch-ac) = 53065c4db39f7e975712c2cba51ff5542cf5a77f | |
| 9 | SHA1 (patch-ad) = 729ca84168ee781335429840ee54a2b894b82f54 | |||
| 10 | SHA1 (patch-ae) = 67bda1581c18dec0e43846f4c39aba35a7b2223e | |||
| 11 | SHA1 (patch-af) = eafb75d8b9aade62b9862e3df1380f15eba80f47 | |||
| 12 | SHA1 (patch-ag) = af25e010e1eb350a8614398d312dd0842a207060 | |||
| 13 | SHA1 (patch-ah) = fa01e42b339fe2cbd5d98c150e0bb618b43fd4a1 | |||
| 14 | SHA1 (patch-ai) = c44c9b0bec99b0e8a3883c0ef388f6d0856fa11a | |||
| 15 | SHA1 (patch-aj) = 8cfa93518f71feb1e85f4db784d5e5c158dcf11e | |||
| 16 | SHA1 (patch-ak) = fb0e11d1aff4753fbb3ee9088e6faeb5bcd58ef1 | |||
| 17 | SHA1 (patch-an) = a6a1aa59f2bf87b2217e827e6309233515d162c2 | |||
| 18 | SHA1 (patch-ao) = f509dde919b93ddfba0105189cb645c2667ba0e4 | |||
| 19 | SHA1 (patch-ap) = 4da7c1a2b92dad4a05322b05451a1ac4c34ce2fb | |||
| 20 | SHA1 (patch-aq) = 237bbcb6c4d895dcd01f42cae5a48f11d2a695b1 |
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | $NetBSD: patch-aa,v 1.9 2003/12/08 14:43:48 wiz Exp $ | 1 | $NetBSD: patch-aa,v 1.10 2008/03/14 18:55:54 wiz Exp $ | |
| 2 | 2 | |||
| 3 | --- ogg123/buffer.c.orig Mon Sep 1 22:15:19 2003 | 3 | --- ogg123/buffer.c.orig 2008-03-03 05:37:26.000000000 +0000 | |
| 4 | +++ ogg123/buffer.c | 4 | +++ ogg123/buffer.c | |
| 5 | @@ -412,7 +412,9 @@ void buffer_reset (buf_t *buf) | 5 | @@ -419,7 +419,9 @@ void buffer_reset (buf_t *buf) | |
| 6 | 6 | |||
| 7 | /* Cleanup pthread variables */ | 7 | /* Cleanup pthread variables */ | |
| 8 | pthread_mutex_destroy(&buf->mutex); | 8 | pthread_mutex_destroy(&buf->mutex); | |
| 9 | + COND_SIGNAL(buf->write_cond); | 9 | + COND_SIGNAL(buf->write_cond); | |
| 10 | pthread_cond_destroy(&buf->write_cond); | 10 | pthread_cond_destroy(&buf->write_cond); | |
| 11 | + COND_SIGNAL(buf->playback_cond); | 11 | + COND_SIGNAL(buf->playback_cond); | |
| 12 | pthread_cond_destroy(&buf->playback_cond); | 12 | pthread_cond_destroy(&buf->playback_cond); | |
| 13 | 13 | |||
| 14 | /* Reinit pthread variables */ | 14 | /* Reinit pthread variables */ |
| @@ -1,46 +1,46 @@ | @@ -1,46 +1,46 @@ | |||
| 1 | $NetBSD: patch-ac,v 1.7 2007/01/13 15:35:52 wiz Exp $ | 1 | $NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $ | |
| 2 | 2 | |||
| 3 | --- oggenc/oggenc.c.orig 2005-06-03 10:15:10.000000000 +0000 | 3 | --- oggenc/oggenc.c.orig 2008-03-03 05:37:27.000000000 +0000 | |
| 4 | +++ oggenc/oggenc.c | 4 | +++ oggenc/oggenc.c | |
| 5 | @@ -659,6 +659,8 @@ static void parse_options(int argc, char | 5 | @@ -676,6 +676,8 @@ static void parse_options(int argc, char | |
| 6 | 6 | |||
| 7 | break; | 7 | break; | |
| 8 | case 'a': | 8 | case 'a': | |
| 9 | + if (strlen(optarg) == 0) | 9 | + if (strlen(optarg) == 0) | |
| 10 | + break; | 10 | + break; | |
| 11 | opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *)); | 11 | opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *)); | |
| 12 | opt->artist[opt->artist_count - 1] = strdup(optarg); | 12 | opt->artist[opt->artist_count - 1] = strdup(optarg); | |
| 13 | break; | 13 | break; | |
| 14 | @@ -671,10 +673,14 @@ static void parse_options(int argc, char | 14 | @@ -688,10 +690,14 @@ static void parse_options(int argc, char | |
| 15 | opt->comments[opt->comment_count - 1] = strdup(optarg); | 15 | opt->comments[opt->comment_count - 1] = strdup(optarg); | |
| 16 | break; | 16 | break; | |
| 17 | case 'd': | 17 | case 'd': | |
| 18 | + if (strlen(optarg) == 0) | 18 | + if (strlen(optarg) == 0) | |
| 19 | + break; | 19 | + break; | |
| 20 | opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *)); | 20 | opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *)); | |
| 21 | opt->dates[opt->date_count - 1] = strdup(optarg); | 21 | opt->dates[opt->date_count - 1] = strdup(optarg); | |
| 22 | break; | 22 | break; | |
| 23 | case 'G': | 23 | case 'G': | |
| 24 | + if (strlen(optarg) == 0) | 24 | + if (strlen(optarg) == 0) | |
| 25 | + break; | 25 | + break; | |
| 26 | opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *)); | 26 | opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *)); | |
| 27 | opt->genre[opt->genre_count - 1] = strdup(optarg); | 27 | opt->genre[opt->genre_count - 1] = strdup(optarg); | |
| 28 | break; | 28 | break; | |
| 29 | @@ -683,6 +689,8 @@ static void parse_options(int argc, char | 29 | @@ -700,6 +706,8 @@ static void parse_options(int argc, char | |
| 30 | exit(0); | 30 | exit(0); | |
| 31 | break; | 31 | break; | |
| 32 | case 'l': | 32 | case 'l': | |
| 33 | + if (strlen(optarg) == 0) | 33 | + if (strlen(optarg) == 0) | |
| 34 | + break; | 34 | + break; | |
| 35 | opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *)); | 35 | opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *)); | |
| 36 | opt->album[opt->album_count - 1] = strdup(optarg); | 36 | opt->album[opt->album_count - 1] = strdup(optarg); | |
| 37 | break; | 37 | break; | |
| 38 | @@ -693,6 +701,8 @@ static void parse_options(int argc, char | 38 | @@ -712,6 +720,8 @@ static void parse_options(int argc, char | |
| 39 | opt->serial = 0; /* Failed, so just set to zero */ | 39 | opt->fixedserial = 1; | |
| 40 | break; | 40 | break; | |
| 41 | case 't': | 41 | case 't': | |
| 42 | + if (strlen(optarg) == 0) | 42 | + if (strlen(optarg) == 0) | |
| 43 | + break; | 43 | + break; | |
| 44 | opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *)); | 44 | opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *)); | |
| 45 | opt->title[opt->title_count - 1] = strdup(optarg); | 45 | opt->title[opt->title_count - 1] = strdup(optarg); | |
| 46 | break; | 46 | break; |