summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-09-24 20:59:10 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-09-24 20:59:10 +0000
commit4063871433f6a2b0fa810552bd2ae792660623dc (patch)
tree033a20e5a4d8f6ef718432c3c9b467f0d28b1725 /media-video
parentAdded 2pass patch. closes #25829 (diff)
downloadgentoo-2-4063871433f6a2b0fa810552bd2ae792660623dc.tar.gz
gentoo-2-4063871433f6a2b0fa810552bd2ae792660623dc.tar.bz2
gentoo-2-4063871433f6a2b0fa810552bd2ae792660623dc.zip
Added soxfunc patch. Closes #26940
Diffstat (limited to 'media-video')
-rw-r--r--media-video/transcode/ChangeLog6
-rw-r--r--media-video/transcode/Manifest5
-rw-r--r--media-video/transcode/files/transcode-0.6.8-soxfunc.patch34
-rw-r--r--media-video/transcode/transcode-0.6.8.ebuild4
4 files changed, 45 insertions, 4 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 978da827065b..38a7661527f5 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/transcode
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.48 2003/09/24 20:46:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.49 2003/09/24 20:58:56 mholzer Exp $
+
+ 25 Sep 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.8.ebuild,
+ files/transcode-0.6.8-soxfunc.patch:
+ Added soxfunc patch. Closes #26940
25 Sep 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.6.ebuild:
Added 2pass patch. closes #25829
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index eb8cbd55db1a..f00ca5556de1 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,8 +1,8 @@
-MD5 d97bd62dd3e070494da1c12fa7b8e454 ChangeLog 9705
+MD5 9cca125d7e8f4f1c74024a91d328db51 ChangeLog 9856
MD5 9bb698a6ef1870268dc9a8e7dbf4a285 transcode-0.6.3.ebuild 3049
MD5 4a54801c033dca53b937e3f793f5d4be transcode-0.6.6.ebuild 3348
MD5 1ea4f41a1198c9baa644bbc9bdfc3203 transcode-0.6.7.ebuild 3375
-MD5 9d9c922108721f4d8aeff0304c1564cd transcode-0.6.8.ebuild 3330
+MD5 8d488aa2e686df62805758758c893be2 transcode-0.6.8.ebuild 3405
MD5 bb865c02f4152b7492bdbdf2042389e5 transcode-0.6.9.ebuild 3698
MD5 225a843999c440c3060e96b9fe6fca35 files/digest-transcode-0.6.3 68
MD5 2e179af41bdf16c1de0a976eb914a141 files/digest-transcode-0.6.6 68
@@ -12,3 +12,4 @@ MD5 2b19613dfc575babca14ae8f3878cf9f files/digest-transcode-0.6.9 68
MD5 14479296c3af00baa49396d77c35d01e files/transcode-0.6.7-clone_close.diff 597
MD5 32c936c145faf596052a5cdbc95376cf files/transcode-0.6.9-makefile.patch 969
MD5 17ed099139bdf45b65fa1f217b9bb42b files/transcode-0.6.6-2pass.patch 2005
+MD5 b2692b9cf4622fb1b35ae9464bb4d0d0 files/transcode-0.6.8-soxfunc.patch 1278
diff --git a/media-video/transcode/files/transcode-0.6.8-soxfunc.patch b/media-video/transcode/files/transcode-0.6.8-soxfunc.patch
new file mode 100644
index 000000000000..6d84c0175981
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.8-soxfunc.patch
@@ -0,0 +1,34 @@
+--- avilib/avilib.c.orig 2003-09-25 22:51:48.000000000 +0000
++++ avilib/avilib.c 2003-09-25 22:56:51.000000000 +0000
+@@ -863,15 +863,28 @@
+
+ //if (AVI->track[j].a_chans && AVI->track[j].audio_bytes)
+ {
+- unsigned long nBlockAlign;
++ unsigned long nBlockAlign = 0;
++ unsigned long avgbsec = 0;
++ unsigned long scalerate = 0;
+
+ sampsize = avi_sampsize(AVI, j);
+
+ nBlockAlign = (AVI->track[j].a_rate<32000)?576:1152;
+ /*
+- printf("XXX sampsize (%d) block (%ld) rate (%ld) audio_bytes (%ld) chunks(%ld)\n",
+- sampsize, nBlockAlign, AVI->track[j].a_rate, AVI->track[j].audio_bytes, AVI->track[j].audio_chunks );
++ printf("XXX sampsize (%d) block (%ld) rate (%ld) audio_bytes (%ld) mp3rate(%ld,%ld)\n",
++ sampsize, nBlockAlign, AVI->track[j].a_rate,
++ (long int)AVI->track[j].audio_bytes,
++ 1000*AVI->track[j].mp3rate/8, AVI->track[j].mp3rate);
+ */
++
++ if (AVI->track[j].a_fmt==0x1) {
++ sampsize = (AVI->track[j].a_chans<2)?sampsize/2:sampsize;
++ avgbsec = AVI->track[j].a_rate*sampsize/4;
++ scalerate = AVI->track[j].a_rate*sampsize/4;
++ } else {
++ avgbsec = 1000*AVI->track[j].mp3rate/8;
++ scalerate = 1000*AVI->track[j].mp3rate/8;
++ }
+
+ OUT4CC ("LIST");
+ OUTLONG(0); /* Length of list in bytes, don't know yet */
diff --git a/media-video/transcode/transcode-0.6.8.ebuild b/media-video/transcode/transcode-0.6.8.ebuild
index 83314c3a94e0..48376d70b748 100644
--- a/media-video/transcode/transcode-0.6.8.ebuild
+++ b/media-video/transcode/transcode-0.6.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.8.ebuild,v 1.5 2003/09/07 00:08:13 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.8.ebuild,v 1.6 2003/09/24 20:58:56 mholzer Exp $
inherit libtool flag-o-matic eutils
@@ -41,6 +41,8 @@ DEPEND=">=media-libs/a52dec-0.7.3
src_unpack() {
unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-soxfunc.patch || die "soxfunc patch died"
if has_version '>=media-libs/netpbm-9.13'
then