diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2005-03-30 18:39:02 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2005-03-30 18:39:02 +0000 |
| commit | ab0e57f22c3cbb2c0d09be20186fc21ece4dfc2f (patch) | |
| tree | dbe691ec98107ee24263f19c1e3cf63eb1181054 /net-libs | |
| parent | Marked stable on x86 and removed old ebuilds. (diff) | |
| download | historical-ab0e57f22c3cbb2c0d09be20186fc21ece4dfc2f.tar.gz historical-ab0e57f22c3cbb2c0d09be20186fc21ece4dfc2f.tar.bz2 historical-ab0e57f22c3cbb2c0d09be20186fc21ece4dfc2f.zip | |
fix for >=speex-1.0.3 (#87206)
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/wvstreams/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/wvstreams/Manifest | 11 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch | 24 | ||||
| -rw-r--r-- | net-libs/wvstreams/wvstreams-4.0.2.ebuild | 3 |
4 files changed, 37 insertions, 7 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog index 36866d1537b6..33ff291d967d 100644 --- a/net-libs/wvstreams/ChangeLog +++ b/net-libs/wvstreams/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/wvstreams # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.47 2005/03/29 09:20:10 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.48 2005/03/30 18:39:02 mrness Exp $ + + 30 Mar 2005; Alin Nastac <mrness@gentoo.org> + +files/wvstreams-4.0.2-speex-const.patch, wvstreams-4.0.2.ebuild: + Fix broken compilation on systems with newer media-libs/speex (#87206). *wvstreams-4.0.2 (29 Mar 2005) diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest index a325c5dac942..57972fa417f8 100644 --- a/net-libs/wvstreams/Manifest +++ b/net-libs/wvstreams/Manifest @@ -2,9 +2,9 @@ Hash: SHA1 MD5 cfe93e4d7a16d678b6ea85b453d1c833 wvstreams-4.0.1-r2.ebuild 2162 -MD5 e83d37d5311de954c64148871bca8c3b wvstreams-4.0.2.ebuild 2121 +MD5 a528382013bf5eaec881046eeae17dbe wvstreams-4.0.2.ebuild 2164 MD5 88beb02e20267e4fc08543358e899909 wvstreams-4.0-r1.ebuild 1872 -MD5 4eb9d1ad4217bc71db8c255e98475e0a ChangeLog 7499 +MD5 48dde7ca67ddb199c694ae1ed90da36b ChangeLog 7689 MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235 MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479 MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563 @@ -15,12 +15,13 @@ MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66 MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68 MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822 +MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951 MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022 MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCSR3djiC39V7gKu0RAn7UAKDMAil593EQZozLktBVXgB5ookscgCcD07l -vvdADV1KMhxaP84kp2VMBPw= -=yTvr +iD8DBQFCSvJfjiC39V7gKu0RAsjzAJ0TG8Fal1TiuktE78cjpEmMtob4EwCgvpX0 +AZP+bxQ+3ViR3NN2GlOyjDs= +=suJ2 -----END PGP SIGNATURE----- diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch new file mode 100644 index 000000000000..b20e8d90bb59 --- /dev/null +++ b/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch @@ -0,0 +1,24 @@ +diff -Nru wvstreams-4.0.2.orig/oggspeex/wvoggspeex.cc wvstreams-4.0.2/oggspeex/wvoggspeex.cc +--- wvstreams-4.0.2.orig/oggspeex/wvoggspeex.cc 2005-03-24 04:01:23.000000000 +0200 ++++ wvstreams-4.0.2/oggspeex/wvoggspeex.cc 2005-03-30 21:23:57.357906840 +0300 +@@ -15,6 +15,10 @@ + + #define OGG_SPEEX_DECODER_BUF_SIZE 16384 // at most 16k at once + ++#ifndef MAX_BYTES_PER_FRAME ++#define MAX_BYTES_PER_FRAME 2000 ++#endif ++ + /** Extracts a little endian integer from a buffer. */ + static unsigned long int getint_le(WvBuf &inbuf) + { +@@ -170,8 +174,7 @@ + // generate stream header + ogg_packet header; + SpeexHeader spxheader; +- SpeexMode *spxmode = speex_mode_list[mode()]; +- speex_init_header(&spxheader, samplingrate(), channels(), spxmode); ++ speex_init_header(&spxheader, samplingrate(), channels(), speex_mode_list[mode()]); + spxheader.vbr = vbr(); + spxheader.bitrate = nominalbitrate(); + spxheader.frames_per_packet = 1; diff --git a/net-libs/wvstreams/wvstreams-4.0.2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2.ebuild index c3dc7616820b..aefd5bc4e9a5 100644 --- a/net-libs/wvstreams/wvstreams-4.0.2.ebuild +++ b/net-libs/wvstreams/wvstreams-4.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.1 2005/03/29 09:20:10 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.2 2005/03/30 18:39:02 mrness Exp $ inherit eutils @@ -39,6 +39,7 @@ src_unpack() { unpack ${A} ; cd ${S} epatch ${FILESDIR}/${P}-linux-serial.patch + epatch ${FILESDIR}/${P}-speex-const.patch if useq tcltk; then epatch ${FILESDIR}/${P}-tcl_8_4.patch |