mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
* Fix encoding of raw files.
Obtained from: Xiph CVS * Re-enable assert()s now that we use GNU iconv.
This commit is contained in:
parent
92d41c4a42
commit
f2107e4728
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=56669
3 changed files with 14 additions and 30 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
PORTNAME= vorbis-tools
|
PORTNAME= vorbis-tools
|
||||||
PORTVERSION= 1.0.r3
|
PORTVERSION= 1.0.r3
|
||||||
PORTREVISION= 3
|
PORTREVISION= 4
|
||||||
PORTEPOCH= 2
|
PORTEPOCH= 2
|
||||||
CATEGORIES= audio
|
CATEGORIES= audio
|
||||||
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
|
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
|
||||||
|
|
13
audio/vorbis-tools/files/patch-oggenc::audio.c
Normal file
13
audio/vorbis-tools/files/patch-oggenc::audio.c
Normal file
|
@ -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;
|
|
@ -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);
|
|
Loading…
Add table
Reference in a new issue