Fix bug #505330. Thanks to Bob Johnson for the report.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

4 files changed, 46 insertions, 12 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index 707fb1e2475b..33fb1a84fdce 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/aqualung
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.33 2014/01/28 16:33:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.34 2014/03/24 17:33:45 billie Exp $
+
+  24 Mar 2014; Daniel Pielmeier <billie@gentoo.org>
+  aqualung-0.9_beta11-r2.ebuild,
+  +files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch:
+  Fix bug #505330. Thanks to Bob Johnson for the report.
 
   28 Jan 2014; Samuli Suominen <ssuominen@gentoo.org>
   -aqualung-0.9_beta11-r1.ebuild:
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 022d821199c6..60c90a2e7ca3 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -2,22 +2,19 @@
 Hash: SHA256
 
 AUX aqualung-0.9_beta11-automake-1.13.patch 524 SHA256 e256249314c37a1d6347c5ac840bc10d9eaa37bff1aa189c055d622c8ea75441 SHA512 a81f0ee28af7f467a6fbff61a2b5ada5a9ff31344bc0399f2ca6715aeda4012992d1a8f5924e738503418fac8135d8bc9a82f44c858ab122fd3812eaaea5284c WHIRLPOOL cebe36e214a8feb947011a5f097b79c40c3654c706c4ae88d2a39a0824ffceb0e4dfd8d38dfab693826720c9982cb10913ef65e83982f18fd1d337bbab179ed1
+AUX aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch 1078 SHA256 28881367708dc65fe6ef4a9d17a3ab9bf7348dad36cabecb0fdf37a2200f2f5a SHA512 0d5585e865dd38ac63b2b441e8b1936aec3d20333db44440257d20c98550c85fe4cfcccd13a9d1eb64a1510280c09644c1434ef38c43ecd5355c065bf5967ad6 WHIRLPOOL 727b88be12ba4ec4f7cac07330719fdd19ba55f0c11155aa353b844823774dd9eb937734d355706a8139548d26deca01263bfd02aaf364b63181a60090fafd0b
 AUX aqualung-0.9_beta11-ffmpeg.patch 880 SHA256 8f4083e2b2b6a54bb7c0da4eb91e3a1ca96fb17a30907b26f6d2384878fe4377 SHA512 5e1c42c640b87b6dda71743a4215bd77a19da8c359afad94f07c08ea4b162d4ad86ca2ed204c5a551299ca656b9c8c9d6fb862ce742817fdc9dbcacc166fc4d7 WHIRLPOOL 11f5d2c2454dea807f1b546ee176aab2506a9bb4fece3449e258fa566fdb33ca345f205bcfa6e170b333519603e55ad06d4486115c4e65e7b276ee481bce5634
 AUX aqualung-0.9_beta11-libav9.patch 1551 SHA256 24ab6cce415e9251b2261d47947394c5b75fd4d612c5794b0b6ec3201283226d SHA512 746f6e47052b3c08f1bef0a0a87fa0f7fb5e087bc69fa4826af29ce4c13536f9e2e2d6f05e63ff69d996c1bcee5d8dbdbae8f9abadb54ec752d69eb5a4ba4cdd WHIRLPOOL e24470a702ebeb1d8e7c97ed970ae120a703cdf237435c4c0f6d61dcd4f1b7b347c5b8b6745c583931c0ad4f2e7f6a78cb97ada616214e38163251b9cdb6092f
 AUX aqualung-0.9_beta11-libavformat54.patch 1170 SHA256 1e0d189c36e70ba8e9d49afa4051f8417560c1e016fefcf6027a5622d4931d09 SHA512 e2a9f923fd48add6f36740f87eaed363ea627452a8a88db5bd38438aa62a4c29c014f4aa8b3e9f6512efaeaf5dc6dc2b839e8df2a07c8b388e9677f8d6a5bbc6 WHIRLPOOL 3972d343981ebb1b415284134cdf79a46de9470de1cfaee8f992662345214672e6f56b5ca33233b935cf32505a17c04af7f7726f9b0be6294daf04a919d4eaa9
 AUX aqualung-0.9_beta11-use_lrdf_cflags.patch 1190 SHA256 1bd61fae33bbd2bc36e551dac73757258765de28b17cefa33f70474947197e66 SHA512 611ec971e00226a32d9d402fffab26bb65bec2353d186875ffe9dcc074cca67854c80d86f31c7cccc32df3320dba5427ec4b3b4782f43922cb5294eee9c92631 WHIRLPOOL 1858a5c5c76175c92abd598e164d5bea0563dfb98973b961d5c4efa2c1a0acf8acb1ecfa1dd1fdf26a93fe88400ac62926f6eca2e6d8d33d6a09cfa956740711
 DIST aqualung-0.9beta11.tar.gz 1584700 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd SHA512 b5b7b8b8f10f0ac4bd332d7644e0f22003edc30c24aaac04b21ebe14b2a451ab3b06c6996e77b795a0fa600090a5bd42a8f993a28269dd8ec905c37b2debf399 WHIRLPOOL fc1c3516b55818979ae14080cae9ce9ed7ad8b57cf113fb90c66dec51ae75c9c176a32ad1be02cadac2a96799281d800e283a70743f876319f25e457fa6d672d
-EBUILD aqualung-0.9_beta11-r2.ebuild 2764 SHA256 a5dd01bbaadd32fedb7f111b8025207f0b3ad62ab063e86fe34fac6982d74718 SHA512 9a94246eada8eeb6b6bc3570a80aae148020cf6efc44294be8fae71a04c68ae4298f88071c487811b0bf8c3f1b11ca45809ca74e626c442e12a6cd2d28858ef8 WHIRLPOOL 6daf23787bd4356a32ef496c65a5c605ab269fa98a849f7fe0c286fe979f11a92034001daf194f9d255eb3ee457c5bacfb6ff5082ff40d7bae0444e47c284678
-MISC ChangeLog 6042 SHA256 3331f57030b6136e8142f7c5c98153f93c7a7b49c722adb463763c6045c2bb7c SHA512 c69322e92c9be51c45c1ab5378762a3be8e6035c2b63173f2c70716655159b5d203b7b2eb5e77b792d990bb476366dda9999702a103690af38811b5ccf0e9da4 WHIRLPOOL e452ddcf273ba03b33d98611b3ec28329e7fea5376f6e378b131841f658e369efd16d9cd7a71d17454714c81bba345d57b94031b1a602698104867b33af49c31
+EBUILD aqualung-0.9_beta11-r2.ebuild 2825 SHA256 f918a47f2652e3f2c4acebe2c8bd1a82cb318693d144ea286e32e33ee042c3d1 SHA512 39dff59a1119d6efdfdb632400d4be9b422b5043b9687e95f19613ab18cdba82e7c767230b8b64d3cd0a25379c1f9e4bbc8ad65ed3f917e6ce10bdfc9d01e981 WHIRLPOOL cbbc47de5b6d205049c4fa768f558537122cb18169a2b9dd70fa8ee1c47298983202f27e2367209e5a47f656f86ac2aa8ede8ddfe9255aefc51ef9d47d883d6f
+MISC ChangeLog 6247 SHA256 efc864b5a81fa8b65a01abe630c0c91635a1226dcf9b84e9d3315985122dfc07 SHA512 8ec16295739f1a98ea9af6992ddb7ac3205e4b0bf6c02fe32c086d1690402787fea3a5eb8770374a4875a017fc4d890de464dc32f8b417c0f1d722bcb39041f4 WHIRLPOOL 6c8e14078d92e6de7b051123e2f56193c71e76103ed31d404b4dd60f57be97616ce68b4b9903429716c847cfdcb783264bfaeac7d2b7927e7a8fbac33b68234a
 MISC metadata.xml 663 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575 SHA512 6e91256f59dd584f7b9c09b1c3704e837691c6b09c65401c828c6f3e9a57defdb4984ec531baeb2e0680edf455210f33b8226cbed317090c2c61ab22305ba574 WHIRLPOOL 75d15bcb548a80baf81bdf25f75c4ec2fb50f2aac4596f550d5b0d4e8e9a120524463408b4bde1f545f7e2ff3ac85523d616ecb3479185c1bc532dae9581a789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS59u6AAoJEEdUh39IaPFN1GIIAJY/B6M6qVasxhvQ79tc/6zs
-6YTx5UHG/HwP948fB73lfWv1tdFXrsgH+AGIEumerPuwx7GI0kaplLQ6UUcL89uh
-XzUsjc25WBBgUQEgF1dXrV1HH5LW3rtKkW2NN0yhFCTvYWLz3Df8qQEiinEEYvOW
-T7z0e+ryg5aelbNOsmE7kbTFzEYyxsGkUUU3LByCVFpk/z/MpJ73cDuuZCtideqp
-KLnDWpQVVs2GQIDlttQQjJCPopKkVB/vwBabA999LyP7L36/0zORXBYOFXPjY4bQ
-ZvmnhAdGDyWksY0oEFQ32UJMcfClaElTwxEBudybQKwHWq7SOZwXpVRetExx9xA=
-=VIIo
+iEYEAREIAAYFAlMwbHoACgkQlcuUeyFa0U3XFQCg19esCOgfe1XDWRLKX+Cso8e1
+aGkAn00SHAISEdSkIHyVBovyP3bS55I4
+=LK3V
 -----END PGP SIGNATURE-----
diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
index 4dd924c1ee7c..260f6445b73b 100644
--- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.6 2014/01/26 10:59:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.7 2014/03/24 17:33:45 billie Exp $
 
 EAPI=5
 
@@ -53,7 +53,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ffmpeg.patch \
 		"${FILESDIR}"/${P}-libavformat54.patch \
 		"${FILESDIR}"/${P}-automake-1.13.patch \
-		"${FILESDIR}"/${P}-libav9.patch
+		"${FILESDIR}"/${P}-libav9.patch \
+		"${FILESDIR}"/${P}-avcodec_max_audio_frame_size.patch
 	sed -i \
 		-e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \
 		doc/Makefile.am || die
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch
new file mode 100644
index 000000000000..bc216d5c14ec
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch
@@ -0,0 +1,31 @@
+Index: src/decoder/dec_lavc.c
+===================================================================
+--- src/decoder/dec_lavc.c	(revision 1272)
++++ src/decoder/dec_lavc.c	(revision 1273)
+@@ -84,9 +84,9 @@
+         file_decoder_t * fdec = dec->fdec;
+ 
+ 	AVPacket packet;
+-        int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+-        float fsamples[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+-        int n_bytes = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++        int16_t samples[MAX_AUDIO_FRAME_SIZE];
++        float fsamples[MAX_AUDIO_FRAME_SIZE];
++        int n_bytes = MAX_AUDIO_FRAME_SIZE;
+ 
+ 	if (av_read_frame(pd->avFormatCtx, &packet) < 0)
+ 		return 1;
+Index: src/decoder/dec_lavc.h
+===================================================================
+--- src/decoder/dec_lavc.h	(revision 1272)
++++ src/decoder/dec_lavc.h	(revision 1273)
+@@ -29,7 +29,8 @@
+ #include "file_decoder.h"
+ 
+ 
+-#define RB_LAVC_SIZE (3*AVCODEC_MAX_AUDIO_FRAME_SIZE)
++#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#define RB_LAVC_SIZE (3*MAX_AUDIO_FRAME_SIZE)
+ 
+ 
+ typedef struct _lavc_pdata_t {