diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-25 23:28:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-25 23:28:27 +0000 |
| commit | 18084927416810a6a86898cec1eb2dba29a9b1c2 (patch) | |
| tree | 3fb472ed461107fb5d491e432b0b75edbd7b4474 /games-emulation/advancemenu | |
| parent | #99426: fixed hardcoded pointer size (diff) | |
| download | historical-18084927416810a6a86898cec1eb2dba29a9b1c2.tar.gz historical-18084927416810a6a86898cec1eb2dba29a9b1c2.tar.bz2 historical-18084927416810a6a86898cec1eb2dba29a9b1c2.zip | |
Fix building with alsa and static #97628 by Mr. Anderson.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'games-emulation/advancemenu')
4 files changed, 66 insertions, 5 deletions
diff --git a/games-emulation/advancemenu/ChangeLog b/games-emulation/advancemenu/ChangeLog index 82c71c0223df..be662d62005e 100644 --- a/games-emulation/advancemenu/ChangeLog +++ b/games-emulation/advancemenu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/advancemenu -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.18 2005/07/20 16:38:27 mr_bones_ Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.19 2005/07/25 23:28:27 vapier Exp $ + + 25 Jul 2005; Mike Frysinger <vapier@gentoo.org> + +files/advancemenu-2.4.10-alsa-pkg-config.patch, + advancemenu-2.4.10.ebuild: + Fix building with alsa and static #97628 by Mr. Anderson. *advancemenu-2.4.10 (20 Jul 2005) diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest index 8343294da910..1c0160282e3c 100644 --- a/games-emulation/advancemenu/Manifest +++ b/games-emulation/advancemenu/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 1bc121e688a1c18c73a4e8ed3b54ab8f advancemenu-2.4.10.ebuild 2480 -MD5 e4afd47b80ca1733ae0dbb29b2451d1a ChangeLog 2746 +MD5 5d6134093187a104087e1d813150e094 advancemenu-2.4.10.ebuild 2526 +MD5 aa4a480d153c0c3d87a2fa8afa0b2532 ChangeLog 2934 +MD5 fceeb76637a021f26b3d0ddefd9f12d3 files/advancemenu-2.4.10-alsa-pkg-config.patch 1041 MD5 d6f9ec5617c3b3e0fdf5947df18af24e files/digest-advancemenu-2.4.10 71 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFC5XWugIKl8Uu19MoRAngAAJ9mKVITRnbjVMfj35ROKkLwf9ToOgCfQwmU +7cF3KLvre3I4md6uAsD5tJQ= +=nQfO +-----END PGP SIGNATURE----- diff --git a/games-emulation/advancemenu/advancemenu-2.4.10.ebuild b/games-emulation/advancemenu/advancemenu-2.4.10.ebuild index 8e5afaf6a774..6f8eadf2c738 100644 --- a/games-emulation/advancemenu/advancemenu-2.4.10.ebuild +++ b/games-emulation/advancemenu/advancemenu-2.4.10.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/games-emulation/advancemenu/advancemenu-2.4.10.ebuild,v 1.1 2005/07/20 16:38:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.4.10.ebuild,v 1.2 2005/07/25 23:28:27 vapier Exp $ inherit eutils games @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-alsa-pkg-config.patch use x86 && ln -s $(which nasm) "${T}/${CHOST}-nasm" use sdl && ln -s $(which sdl-config) "${T}/${CHOST}-sdl-config" use truetype && ln -s $(which freetype-config) "${T}/${CHOST}-freetype-config" diff --git a/games-emulation/advancemenu/files/advancemenu-2.4.10-alsa-pkg-config.patch b/games-emulation/advancemenu/files/advancemenu-2.4.10-alsa-pkg-config.patch new file mode 100644 index 000000000000..de0af21f2fc0 --- /dev/null +++ b/games-emulation/advancemenu/files/advancemenu-2.4.10-alsa-pkg-config.patch @@ -0,0 +1,44 @@ +Make sure we ask alsa what libraries it needs rather than assuming. + +http://bugs.gentoo.org/97628 + +Changes for configure.ac: + -------------------------------------- + [snd_pcm_open], + [ac_lib_alsa=yes], + [ac_lib_alsa=no], + - [-lm] + + [`pkg-config alsa --libs`] + ) + if test $ac_lib_alsa = yes; then + AC_MSG_CHECKING([for ALSA]) + -------------------------------------- + [snd_pcm_open], + [], + [AC_MSG_ERROR([the ALSA library is missing])], + - [-lm] + + [`pkg-config alsa --libs`] + ) + AC_MSG_CHECKING([for ALSA version]) + AC_TRY_COMPILE([ + +--- configure ++++ configure +@@ -8298,7 +8298,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lasound -lm ++LIBS="-lasound `pkg-config alsa --libs` + $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -8428,7 +8428,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lasound -lm ++LIBS="-lasound `pkg-config alsa --libs` + $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ |