* [gentoo-commits] gentoo-x86 commit in media-sound/pulseaudio/files: pulseaudio-0.9.9+ltdl-2.2.patch
@ 2008-03-08 23:34 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-03-08 23:34 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/03/08 23:34:03
Added: pulseaudio-0.9.9+ltdl-2.2.patch
Log:
Add new revisions that work with libtool 2.2. Note that from now on I'll keep the experimental revisions with a value 50+x in line with the old-style ones.
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch?rev=1.1&content-type=text/plain
Index: pulseaudio-0.9.9+ltdl-2.2.patch
===================================================================
Index: src/daemon/ltdl-bind-now.c
===================================================================
--- src/daemon/ltdl-bind-now.c (revision 2112)
+++ src/daemon/ltdl-bind-now.c (working copy)
@@ -34,6 +34,11 @@
#include <sys/dl.h>
#endif
+#ifndef HAVE_LT_USER_DLLOADER
+/* Only used with ltdl 2.2 */
+#include <string.h>
+#endif
+
#include <ltdl.h>
#include <pulsecore/macro.h>
@@ -85,7 +90,11 @@
to set $LT_BIND_NOW before starting the pulsaudio binary.
*/
+#ifndef HAVE_LT_DLADVISE
static lt_module bind_now_open(lt_user_data d, const char *fname) {
+#else
+ static lt_module bind_now_open(lt_user_data d, const char *fname, lt_dladvise advise) {
+#endif
lt_module m;
pa_assert(fname);
@@ -129,19 +138,27 @@
void pa_ltdl_init(void) {
#ifdef PA_BIND_NOW
+# ifdef HAVE_LT_USER_DLLOADER
lt_dlloader *place;
static const struct lt_user_dlloader loader = {
.module_open = bind_now_open,
.module_close = bind_now_close,
.find_sym = bind_now_find_sym
};
+# else
+ static const lt_dlvtable *dlopen_loader;
+ static lt_dlvtable bindnow_loader;
+# endif
#endif
pa_assert_se(lt_dlinit() == 0);
pa_assert_se(libtool_mutex = pa_mutex_new(TRUE, FALSE));
+#ifdef HAVE_LT_DLMUTEX_REGISTER
pa_assert_se(lt_dlmutex_register(libtool_lock, libtool_unlock, libtool_set_error, libtool_get_error) == 0);
+#endif
#ifdef PA_BIND_NOW
+# ifdef HAVE_LT_USER_DLLOADER
if (!(place = lt_dlloader_find("dlopen")))
place = lt_dlloader_next(NULL);
@@ -149,6 +166,26 @@
/* Add our BIND_NOW loader as the default module loader. */
if (lt_dlloader_add(place, &loader, "bind-now-loader") != 0)
pa_log_warn("Failed to add bind-now-loader.");
+# else
+ /* Already initialised */
+ if ( dlopen_loader != NULL ) return;
+
+ if (!(dlopen_loader = lt_dlloader_find("dlopen"))) {
+ pa_log_warn("Failed to find original dlopen loader.");
+ return;
+ }
+
+ memcpy(&bindnow_loader, dlopen_loader, sizeof(bindnow_loader));
+ bindnow_loader.name = "bind-now-loader";
+ bindnow_loader.module_open = bind_now_open;
+ bindnow_loader.module_close = bind_now_close;
+ bindnow_loader.find_sym = bind_now_find_sym;
+ bindnow_loader.priority = LT_DLLOADER_PREPEND;
+
+ /* Add our BIND_NOW loader as the default module loader. */
+ if (lt_dlloader_add(&bindnow_loader) != 0)
+ pa_log_warn("Failed to add bind-now-loader.");
+# endif
#endif
}
Index: configure.ac
===================================================================
--- configure.ac (revision 2112)
+++ configure.ac (working copy)
@@ -172,6 +172,12 @@
AC_SUBST(LIBLTDL)
AC_CONFIG_SUBDIRS(libltdl)
+old_LIBS=$LIBS
+LIBS="$LIBS $LIBLTDL"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$old_LIBS
+AC_CHECK_TYPES([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([[
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/pulseaudio/files: pulseaudio-0.9.9+ltdl-2.2.patch
@ 2008-03-09 12:57 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-03-09 12:57 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/03/09 12:57:25
Modified: pulseaudio-0.9.9+ltdl-2.2.patch
Log:
Fix path so that it build with both 2.2 and 1.5. Closes bug #212800.
(Portage version: 2.1.4.4)
Revision Changes Path
1.2 media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch?r1=1.1&r2=1.2
Index: pulseaudio-0.9.9+ltdl-2.2.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio-0.9.9+ltdl-2.2.patch 8 Mar 2008 23:34:02 -0000 1.1
+++ pulseaudio-0.9.9+ltdl-2.2.patch 9 Mar 2008 12:57:24 -0000 1.2
@@ -6,7 +6,7 @@
#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 @@
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 @@
+#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 @@
+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([[
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/pulseaudio/files: pulseaudio-0.9.9+ltdl-2.2.patch
@ 2008-03-31 14:54 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-03-31 14:54 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/03/31 14:54:01
Removed: pulseaudio-0.9.9+ltdl-2.2.patch
Log:
Bump to latest version, remove old versions and unneeded patches.
(Portage version: 2.1.4.4)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-31 14:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-09 12:57 [gentoo-commits] gentoo-x86 commit in media-sound/pulseaudio/files: pulseaudio-0.9.9+ltdl-2.2.patch Diego Petteno (flameeyes)
-- strict thread matches above, loose matches on Subject: below --
2008-03-31 14:54 Diego Petteno (flameeyes)
2008-03-08 23:34 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox