GCC 4 compat update, closes bug #80759.

Package-Manager: portage-2.0.51-r15

4 files changed, 65 insertions, 16 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 3b772ac4c058..219769e11f8f 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.101 2005/02/03 21:37:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.102 2005/02/11 22:18:15 chainsaw Exp $
+
+  11 Feb 2005; Tony Vroon <chainsaw@gentoo.org> alsa-lib-1.0.8.ebuild:
+  GCC 4 compatability fix by gim <gentoo@gim.name>, closes bug #80759.
 
   03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-lib-1.0.8.ebuild:
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 869a240a51ca..68ca4d55d874 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d110f8ca9c5ebc09bc49713d05fd0aad ChangeLog 15116
+MD5 9f71fd6d9092e8ef70ba72cde7b94670 alsa-lib-1.0.8_rc1.ebuild 1607
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 5659184e067dbf68af9e9251837332c5 alsa-lib-0.9.8.ebuild 1584
-MD5 c840b6d57683f228d3db41a4091e78a5 alsa-lib-1.0.2.ebuild 1609
+MD5 6e63abaabf4bd9c1f937623cf53618e8 ChangeLog 15257
 MD5 6f25a91cdae08f1cd6cd2cb121506a49 alsa-lib-1.0.5-r3.ebuild 1766
 MD5 6357a1ba435460e8bd79caaa887cf2e5 alsa-lib-1.0.5.ebuild 1734
+MD5 652f3fd3402aa153284c53a61090051f alsa-lib-1.0.8.ebuild 1562
+MD5 c840b6d57683f228d3db41a4091e78a5 alsa-lib-1.0.2.ebuild 1609
 MD5 ac0499313adb253d4e050427ffa2ee88 alsa-lib-1.0.6.ebuild 1911
 MD5 f76db95757c8e6fac22dd074d1da8b92 alsa-lib-1.0.7.ebuild 2056
-MD5 9f71fd6d9092e8ef70ba72cde7b94670 alsa-lib-1.0.8_rc1.ebuild 1607
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 68048a156e2ed22811b9d8ee81ab58bf alsa-lib-1.0.8.ebuild 1488
+MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r3 67
+MD5 8ba7bd0bfd177d142b304ad90dc8b75b files/digest-alsa-lib-1.0.8_rc1 70
+MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
 MD5 ff6b3f2ba9f419d2e31c55f93da0e170 files/alsa-lib-1.0.7-pcm_wait.patch 342
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
-MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
+MD5 46a389b403bc763310e942cc9fc6d7b1 files/digest-alsa-lib-1.0.8 67
 MD5 ebf9199686eb993db91c807d7fd90dcb files/digest-alsa-lib-1.0.2 67
+MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5 67
-MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r3 67
+MD5 d832d735aa8fa9959ff66276eb648cef files/alsa-lib-1.0.8-gcc4.patch 1656
 MD5 5d0f60405a57450fdd98ceb5d4398056 files/digest-alsa-lib-1.0.6 67
-MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
-MD5 8ba7bd0bfd177d142b304ad90dc8b75b files/digest-alsa-lib-1.0.8_rc1 70
-MD5 46a389b403bc763310e942cc9fc6d7b1 files/digest-alsa-lib-1.0.8 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.0-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFCApq6ArHZZzCEUG0RAlKyAJ9Qmu0h4Tsd5d8z2weuPbDy0Ia3xwCfWW6Z
-S5NNsuEIZ3wj8vd9H76KeXk=
-=MOpT
+iD8DBQFCDS+Gp5vW4rUFj5oRAkuKAJ9FcGYs6OcPY55iLcASUFNGApsDJwCeMWdQ
+ND7/GwoXMBii4yAXTytsJlw=
+=oSk+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
index f35ceebe2d14..35fba77594aa 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.8.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/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild,v 1.2 2005/02/03 21:37:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild,v 1.3 2005/02/11 22:18:15 chainsaw Exp $
 
 IUSE="jack doc"
 
@@ -25,6 +25,12 @@ DEPEND="${RDEPEND}
 
 PDEPEND="jack? ( =media-plugins/alsa-jack-${PV}* )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_compile() {
 	local myconf=""
 
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.8-gcc4.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.8-gcc4.patch
new file mode 100644
index 000000000000..f5694531f8a3
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.8-gcc4.patch
@@ -0,0 +1,39 @@
+--- src/pcm/pcm_dmix.c~	2005-01-11 18:42:49.000000000 +0100
++++ src/pcm/pcm_dmix.c	2005-01-23 13:06:51.000000000 +0100
+@@ -56,9 +56,9 @@
+ /*
+  *  sum ring buffer shared memory area 
+  */
++static int shm_sum_discard(snd_pcm_direct_t *dmix);
+ static int shm_sum_create_or_connect(snd_pcm_direct_t *dmix)
+ {
+-	static int shm_sum_discard(snd_pcm_direct_t *dmix);
+ 	struct shmid_ds buf;
+ 	int tmpid, err;
+ 	size_t size;
+--- src/conf.c~	2004-10-05 17:33:04.000000000 +0200
++++ src/conf.c	2005-01-23 13:11:51.000000000 +0100
+@@ -2494,9 +2494,9 @@
+  *               specified by \p result.
+  * \return Zero if successful, otherwise a negative error code.
+  */
++static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data);
+ int snd_config_search_hooks(snd_config_t *config, const char *key, snd_config_t **result)
+ {
+-	static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data);
+ 	SND_CONFIG_SEARCH(config, key, result, \
+ 					err = snd_config_hooks(config, NULL); \
+ 					if (err < 0) \
+--- src/conf.c~	2005-01-23 13:11:51.000000000 +0100
++++ src/conf.c	2005-01-23 13:18:19.000000000 +0100
+@@ -2514,9 +2514,9 @@
+  *               specified by \p result.
+  * \return Zero if successful, otherwise a negative error code.
+  */
++static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data);
+ int snd_config_searcha_hooks(snd_config_t *root, snd_config_t *config, const char *key, snd_config_t **result)
+ {
+-	static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data);
+ 	SND_CONFIG_SEARCHA(root, config, key, result,
+ 					snd_config_searcha_hooks,
+ 					err = snd_config_hooks(config, NULL); \