diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2005-02-11 22:18:15 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2005-02-11 22:18:15 +0000 |
| commit | ba42f34ee82eb20f9d9db5472d7f44007f79e63c (patch) | |
| tree | 2ba9c45c6e8c7d2e91bc021eaae1370973cc9036 /media-libs | |
| parent | New release, mostly bugfixes. Arch detection code is now faster thanks to a c... (diff) | |
| download | gentoo-2-ba42f34ee82eb20f9d9db5472d7f44007f79e63c.tar.gz gentoo-2-ba42f34ee82eb20f9d9db5472d7f44007f79e63c.tar.bz2 gentoo-2-ba42f34ee82eb20f9d9db5472d7f44007f79e63c.zip | |
GCC 4 compat update, closes bug #80759.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/alsa-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/alsa-lib/alsa-lib-1.0.8.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/alsa-lib/files/alsa-lib-1.0.8-gcc4.patch | 39 |
3 files changed, 50 insertions, 2 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/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); \ |