Add patch to fix compilation with gcc-4.1. Thanks to Damien THEBAULT <damien DOT thebault AT laposte DOT net>; bug #127674

(Portage version: 2.1_pre7-r5)

4 files changed, 46 insertions, 7 deletions

diff --git a/media-sound/meterbridge/ChangeLog b/media-sound/meterbridge/ChangeLog
index 8731a678b488..4d466ea4db83 100644
--- a/media-sound/meterbridge/ChangeLog
+++ b/media-sound/meterbridge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/meterbridge
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.12 2005/04/24 10:17:19 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.13 2006/04/14 05:57:23 halcy0n Exp $
+
+  14 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/meterbridge-0.9.2-gcc41.patch, meterbridge-0.9.2.ebuild:
+  Add patch to fix compilation with gcc-4.1. Thanks to Damien THEBAULT <damien
+  DOT thebault AT laposte DOT net>; bug #127674
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   meterbridge-0.9.2.ebuild:
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index 31150941671d..b138db27b290 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -1,6 +1,21 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 bd9fc81e611531471bf14a09a15863ba ChangeLog 1348
-MD5 2985bdd294112beb7a2073b0f141c74f meterbridge-0.9.2.ebuild 621
-MD5 e133c0604d65895e1c861d93b96f5ac2 meterbridge-0.9.0.ebuild 646
+RMD160 27b95e522d6523198f153006bb79495717242694 ChangeLog 1348
+SHA256 6937c4d0f20e85784169094493afe82db90988af812fe9a2d2d6ea8d6b2ff54f ChangeLog 1348
 MD5 c50f792290721fb1e38d3eb3f55be86e files/digest-meterbridge-0.9.0 69
+RMD160 091d23b134685af2f9d7c7dd40fd60a5635fbb72 files/digest-meterbridge-0.9.0 69
+SHA256 02271db8cb70c39f637b3b18abd046ca6afd227abd7632622fbcb3e3aa3925cf files/digest-meterbridge-0.9.0 69
 MD5 5cb258c131d546109669030240fc59ab files/digest-meterbridge-0.9.2 69
+RMD160 9e7647921181c6a3c2bb8c4c9eec2802fab2b0f0 files/digest-meterbridge-0.9.2 69
+SHA256 6b32394ee097e3668b08cc0e5eed4914a6e37d8512c22271b3e3bb78f3f1bb6f files/digest-meterbridge-0.9.2 69
+MD5 942ad2cb8a56466050eef28787b71d11 files/meterbridge-0.9.2-gcc41.patch 490
+RMD160 a7202e0730986f3d7a20fc2cb1678f329dd85aeb files/meterbridge-0.9.2-gcc41.patch 490
+SHA256 3c112824a5eea44fae1e6607f9aad2efeab37e8cbffccd1c180fe968ed078190 files/meterbridge-0.9.2-gcc41.patch 490
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 e133c0604d65895e1c861d93b96f5ac2 meterbridge-0.9.0.ebuild 646
+RMD160 4e51e0e089e6e93810c68e64edf78c74117dee4b meterbridge-0.9.0.ebuild 646
+SHA256 c799e9ba9a31180eca67d6ad5dba7963c31ee44434b741ef4dd8b58aa889d172 meterbridge-0.9.0.ebuild 646
+MD5 3514349458c2005e503f4ad69700a9e9 meterbridge-0.9.2.ebuild 707
+RMD160 fed10bd02b929e4b9bde6d1f59daf1f1068d5160 meterbridge-0.9.2.ebuild 707
+SHA256 699ddae9752147f539d6de5e169e1ee7e545394fce80c15a35f60dff3f65067c meterbridge-0.9.2.ebuild 707
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.2-gcc41.patch b/media-sound/meterbridge/files/meterbridge-0.9.2-gcc41.patch
new file mode 100644
index 000000000000..c6268ef21ccd
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.2-gcc41.patch
@@ -0,0 +1,12 @@
+diff -urN ../tmp-orig/meterbridge-0.9.2/src/main.h ./src/main.h
+--- ../tmp-orig/meterbridge-0.9.2/src/main.h	2003-06-05 11:42:41.000000000 +0200
++++ ./src/main.h	2004-12-29 10:27:24.160912488 +0100
+@@ -8,7 +8,7 @@
+ 
+ extern SDL_Surface *screen;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
++extern SDL_Rect win, dest[MAX_METERS];
+ 
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];
diff --git a/media-sound/meterbridge/meterbridge-0.9.2.ebuild b/media-sound/meterbridge/meterbridge-0.9.2.ebuild
index e9ed022d9eaa..9d39bae11820 100644
--- a/media-sound/meterbridge/meterbridge-0.9.2.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.11 2005/04/24 10:17:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.12 2006/04/14 05:57:23 halcy0n Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -15,6 +17,11 @@ KEYWORDS="amd64 ppc sparc x86"
 DEPEND="media-sound/jack-audio-connection-kit
 	media-libs/sdl-image"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog