aboutsummaryrefslogtreecommitdiffstats
path: root/audio/vorbis-tools
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2002-03-26 10:49:06 +0800
committernaddy <naddy@FreeBSD.org>2002-03-26 10:49:06 +0800
commitf59434648c0e7046b7151d2e184567af98f147e1 (patch)
treeed406dbfb12d0ec0f22deb2cfcd6884198f30007 /audio/vorbis-tools
parente6ae0fda3bffab03f45834a5700576efb8e93256 (diff)
downloadfreebsd-ports-graphics-f59434648c0e7046b7151d2e184567af98f147e1.tar.gz
freebsd-ports-graphics-f59434648c0e7046b7151d2e184567af98f147e1.tar.zst
freebsd-ports-graphics-f59434648c0e7046b7151d2e184567af98f147e1.zip
* Fix encoding of raw files.
Obtained from: Xiph CVS * Re-enable assert()s now that we use GNU iconv.
Diffstat (limited to 'audio/vorbis-tools')
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--audio/vorbis-tools/files/patch-oggenc::audio.c13
-rw-r--r--audio/vorbis-tools/files/patch-share::iconvert.c29
3 files changed, 14 insertions, 30 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 37bd122d8b3..5abdb96c68b 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vorbis-tools
PORTVERSION= 1.0.r3
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= audio
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
diff --git a/audio/vorbis-tools/files/patch-oggenc::audio.c b/audio/vorbis-tools/files/patch-oggenc::audio.c
new file mode 100644
index 00000000000..997207d3b7f
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-oggenc::audio.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- oggenc/audio.c.orig Sat Dec 8 03:23:01 2001
++++ oggenc/audio.c Tue Mar 26 03:32:57 2002
+@@ -570,6 +570,7 @@
+ wav->bigendian = 0;
+ wav->channels = format.channels;
+ wav->samplesize = opt->samplesize;
++ wav->totalsamples = 0;
+
+ opt->read_samples = wav_read;
+ opt->readdata = (void *)wav;
diff --git a/audio/vorbis-tools/files/patch-share::iconvert.c b/audio/vorbis-tools/files/patch-share::iconvert.c
deleted file mode 100644
index 407ea9d47a9..00000000000
--- a/audio/vorbis-tools/files/patch-share::iconvert.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- share/iconvert.c.orig Wed Dec 19 03:57:31 2001
-+++ share/iconvert.c Thu Feb 14 16:52:41 2002
-@@ -105,10 +105,12 @@
- obl = utflen;
- for (;;) {
- k = iconv(cd1, &ib, &ibl, &ob, &obl);
-+#if 0 /* mistaken assumptions */
- assert((!k && !ibl) ||
- (k == (size_t)(-1) && errno == E2BIG && ibl && obl < 6) ||
- (k == (size_t)(-1) &&
- (errno == EILSEQ || errno == EINVAL) && ibl));
-+#endif
- if (!ibl)
- break;
- if (obl < 6) {
-@@ -216,8 +218,10 @@
- }
- }
- k = iconv(cd2, 0, 0, &ob, &obl);
-+#if 0
- assert(!k);
- assert(!obl);
-+#endif
- *ob = '\0';
-
- free(utfbuf);