diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-03-09 12:57:24 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-03-09 12:57:24 +0000 |
| commit | 7dcddb6ecee8b0bee73019a02f1eaeed9fee6fc2 (patch) | |
| tree | 341e2a4b4b96c0ed63b5b0c9d425b63922f09c49 /media-sound/pulseaudio | |
| parent | x86 stable, security bug #212731 (diff) | |
| download | gentoo-2-7dcddb6ecee8b0bee73019a02f1eaeed9fee6fc2.tar.gz gentoo-2-7dcddb6ecee8b0bee73019a02f1eaeed9fee6fc2.tar.bz2 gentoo-2-7dcddb6ecee8b0bee73019a02f1eaeed9fee6fc2.zip | |
Fix path so that it build with both 2.2 and 1.5. Closes bug #212800.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-sound/pulseaudio')
| -rw-r--r-- | media-sound/pulseaudio/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index 502513cbf2c8..e111ae8470cc 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.101 2008/03/08 23:34:01 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.102 2008/03/09 12:57:23 flameeyes Exp $ + + 09 Mar 2008; Diego Pettenò <flameeyes@gentoo.org> + files/pulseaudio-0.9.9+ltdl-2.2.patch: + Fix path so that it build with both 2.2 and 1.5. Closes bug #212800. *pulseaudio-0.9.9-r53 (08 Mar 2008) *pulseaudio-0.9.9-r3 (08 Mar 2008) diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch index c140a7b9bfc9..a466e2cc188b 100644 --- a/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch +++ b/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch @@ -6,7 +6,7 @@ Index: src/daemon/ltdl-bind-now.c #include <sys/dl.h> #endif -+#ifndef HAVE_LT_USER_DLLOADER ++#ifndef HAVE_STRUCT_LT_USER_DLLOADER +/* Only used with ltdl 2.2 */ +#include <string.h> +#endif @@ -30,7 +30,7 @@ Index: src/daemon/ltdl-bind-now.c void pa_ltdl_init(void) { #ifdef PA_BIND_NOW -+# ifdef HAVE_LT_USER_DLLOADER ++# ifdef HAVE_STRUCT_LT_USER_DLLOADER lt_dlloader *place; static const struct lt_user_dlloader loader = { .module_open = bind_now_open, @@ -50,7 +50,7 @@ Index: src/daemon/ltdl-bind-now.c +#endif #ifdef PA_BIND_NOW -+# ifdef HAVE_LT_USER_DLLOADER ++# ifdef HAVE_STRUCT_LT_USER_DLLOADER if (!(place = lt_dlloader_find("dlopen"))) place = lt_dlloader_next(NULL); @@ -93,7 +93,7 @@ Index: configure.ac +LIBS="$LIBS $LIBLTDL" +AC_CHECK_FUNCS([lt_dlmutex_register]) +LIBS=$old_LIBS -+AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) ++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then AC_MSG_ERROR([[ |