add upstream patch for failure to load wav situation (bug #406739)

Package-Manager: portage-2.1.10.44/cvs/Linux i686

4 files changed, 49 insertions, 4 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index fb74010b7fd9..2fcc20677d88 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.87 2012/02/08 18:41:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.88 2012/03/04 05:51:05 mr_bones_ Exp $
+
+  04 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> sdl-mixer-1.2.12.ebuild,
+  +files/sdl-mixer-1.2.12-wav.patch:
+  add upstream patch for failure to load wav situation (bug #406739)
 
   08 Feb 2012; Michael Sterrett <mr_bones_@gentoo.org> sdl-mixer-1.2.12.ebuild:
   correct modplug configure option (bug #402735)
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 8a1e041f85b5..90f1301a42fc 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,9 +1,10 @@
 AUX sdl-mixer-1.2.11-midi.patch 779 RMD160 aaeeb0e11e002f5648f6079943c2969cd668436a SHA1 8c2cf4d016781f317c328526ac6edff41b18d06f SHA256 267535c82e1e97f4407b02cf7a21c98a1f89fdd431a8698cffa69afacdd44ef5
 AUX sdl-mixer-1.2.11-multilib.patch 1247 RMD160 76f4d4c32bcfd1367dda5e82816d5adc7ff9c1f4 SHA1 05fc2f40e177fd92c27f67a7661f273efca53169 SHA256 76ab56747d29bdae932394f8e501ce22f470096268e0b8cc63ea4335c837976c
+AUX sdl-mixer-1.2.12-wav.patch 796 RMD160 ea730d60020bcb237b7cb3e4474c0147f3958e41 SHA1 f2ba6fa45376d1f68172be2592ccd537d3741021 SHA256 7d455c08d79c4a957a8ae25e83f7253c5ff307a7fdc2c4d433b482dc3b7d70b9
 DIST SDL_mixer-1.2.11.tar.gz 2690654 RMD160 559355116a1c380edf71879da0dbcf5359f05476 SHA1 ef5d45160babeb51eafa7e4019cec38324ee1a5d SHA256 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
 DIST SDL_mixer-1.2.12.tar.gz 3707781 RMD160 99089725824095398bfb34fd9ccb7c16674192d8 SHA1 a20fa96470ad9e1052f1957b77ffa68fb090b384 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
 EBUILD sdl-mixer-1.2.11-r1.ebuild 1951 RMD160 ed55ecb18b9953302b1a13088539a7a4c5e342a3 SHA1 e2fd96ad1f66c58af006ebbef62850ac8de324c8 SHA256 7b43f2fb558ed816b37da24eb4d62346518ceb791a3eb67dee1c479631f68431
 EBUILD sdl-mixer-1.2.11-r2.ebuild 2001 RMD160 00f8791f2c6db5d1f3758a60028bef62f832762d SHA1 e1ed9b39f3da70fb2be3c757cb5a031414dba5b6 SHA256 abee677cae29900fd4f72b379299367629ba25b4e0f68454c5891f4fb62c2ca8
-EBUILD sdl-mixer-1.2.12.ebuild 2057 RMD160 4d84fd325886b5846e9e8c046dfbf1440b5e8d8c SHA1 bb9408d9275480d681838615820a84d799cdf1c0 SHA256 f3958db236179eb3c691387bc3fe8a1db31ece62ad63233a7c258cdbdb564f8f
-MISC ChangeLog 11729 RMD160 89e1ca357eeadafd9ecce0579e4edb49561bb72d SHA1 abc6c8207cc48efff6d5408a2c8c4b1ec686ca0f SHA256 1bdcae8795f6bb64110cdaccd936c49429af154373bac8c51d5a6e21b1254653
+EBUILD sdl-mixer-1.2.12.ebuild 2128 RMD160 59886848b94d6b2bda4af46c5ef888bb0091b2ee SHA1 2fad973bb14eac25d469189b55c41ba1992d4120 SHA256 d9098640b964fbcd8e5f7f0b42cf03676db5e20f888a957dc367e4310fe9fe4f
+MISC ChangeLog 11916 RMD160 075a0ccd355da2c19b6c14cf719612117bd6c8c0 SHA1 e219221eff729455f21c431ad256c03377fd3cc5 SHA256 d4a9b279e9a20aba4b323478fef9090c38701e1987d144216c0e11e38eb7c899
 MISC metadata.xml 444 RMD160 18310115d9bb10e27fd06a98140761690c0d5d0b SHA1 c664c68d70101827efe3dfbf3b4ba1b455ce1829 SHA256 8d05f3c14ea95b51318a3cc7fb0727d2e69b9eaee8d7e75e3abaf75a47e2ef0a
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch
new file mode 100644
index 000000000000..38914fd77f15
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/show_bug.cgi?id=406739
+Nikos Chantziaras 2012-03-03 03:13:39 EST
+
+There's a bug in the current version of SDL_mixer where failing to load a WAV sample will result in freeing a resource twice, resulting in an application crash.  There is an upstream fix for this:
+
+http://hg.libsdl.org/SDL_mixer/rev/ea53a85853dd
+
+Upstream bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1418
+
+--- a/mixer.c
++++ b/mixer.c
+@@ -610,13 +610,15 @@
+ 			break;
+ 		default:
+ 			SDL_SetError("Unrecognized sound file type");
+-			return(0);			
++			if ( freesrc ) {
++				SDL_RWclose(src);
++			}
++			loaded = NULL;
++			break;
+ 	}
+ 	if ( !loaded ) {
++		/* The individual loaders have closed src if needed */
+ 		SDL_free(chunk);
+-		if ( freesrc ) {
+-			SDL_RWclose(src);
+-		}
+ 		return(NULL);
+ 	}
+ 
+
+
+
+
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
index 5c720e189aa3..c576052903d7 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.3 2012/02/08 18:41:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.4 2012/03/04 05:51:05 mr_bones_ Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P=${P/sdl-/SDL_}
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -27,6 +28,10 @@ DEPEND=">=media-libs/libsdl-1.2.10
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wav.patch
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \