Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/advancemenu/files: advancemenu-2.5.0-pic.patch advancemenu-2.5.0-alsa-pkg-config.patch
Date: Wed, 05 Aug 2009 23:51:33
Message-Id: E1MYqGZ-0006vg-Qd@stork.gentoo.org
1 mr_bones_ 09/08/05 23:51:31
2
3 Added: advancemenu-2.5.0-pic.patch
4 advancemenu-2.5.0-alsa-pkg-config.patch
5 Log:
6 version bump (bug #280044)
7 (Portage version: 2.1.6.13/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-emulation/advancemenu/files/advancemenu-2.5.0-pic.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/advancemenu/files/advancemenu-2.5.0-pic.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/advancemenu/files/advancemenu-2.5.0-pic.patch?rev=1.1&content-type=text/plain
14
15 Index: advancemenu-2.5.0-pic.patch
16 ===================================================================
17 --- ./advance/blit/blit.c.orig 2004-12-19 01:01:46.039956536 -0500
18 +++ ./advance/blit/blit.c 2004-12-19 01:01:19.566981040 -0500
19 @@ -28,6 +28,10 @@
20 * do so, delete this exception statement from your version.
21 */
22
23 +#if defined(USE_ASM_INLINE) && defined(__PIC__)
24 +# undef USE_ASM_INLINE
25 +#endif
26 +
27 #include "portable.h"
28
29 #include "blit.h"
30
31
32
33 1.1 games-emulation/advancemenu/files/advancemenu-2.5.0-alsa-pkg-config.patch
34
35 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/advancemenu/files/advancemenu-2.5.0-alsa-pkg-config.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/advancemenu/files/advancemenu-2.5.0-alsa-pkg-config.patch?rev=1.1&content-type=text/plain
37
38 Index: advancemenu-2.5.0-alsa-pkg-config.patch
39 ===================================================================
40 Make sure we ask alsa what libraries it needs rather than assuming.
41
42 http://bugs.gentoo.org/97628
43
44 Changes for configure.ac:
45 --------------------------------------
46 [snd_pcm_open],
47 [ac_lib_alsa=yes],
48 [ac_lib_alsa=no],
49 - [-lm]
50 + [`pkg-config alsa --libs`]
51 )
52 if test $ac_lib_alsa = yes; then
53 AC_MSG_CHECKING([for ALSA])
54 --------------------------------------
55 [snd_pcm_open],
56 [],
57 [AC_MSG_ERROR([the ALSA library is missing])],
58 - [-lm]
59 + [`pkg-config alsa --libs`]
60 )
61 AC_MSG_CHECKING([for ALSA version])
62 AC_TRY_COMPILE([
63
64 --- configure
65 +++ configure
66 @@ -8298,7 +8298,7 @@
67 echo $ECHO_N "(cached) $ECHO_C" >&6
68 else
69 ac_check_lib_save_LIBS=$LIBS
70 -LIBS="-lasound -lm
71 +LIBS="-lasound `pkg-config alsa --libs`
72 $LIBS"
73 cat >conftest.$ac_ext <<_ACEOF
74 /* confdefs.h. */
75 @@ -8428,7 +8428,7 @@
76 echo $ECHO_N "(cached) $ECHO_C" >&6
77 else
78 ac_check_lib_save_LIBS=$LIBS
79 -LIBS="-lasound -lm
80 +LIBS="-lasound `pkg-config alsa --libs`
81 $LIBS"
82 cat >conftest.$ac_ext <<_ACEOF
83 /* confdefs.h. */