[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-135-g8977b2e
Lennart Poettering
gitmailer-noreply at 0pointer.de
Tue Dec 16 05:25:46 PST 2008
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from f826ded33d079ea7aead78c811f742cee98214e8 (commit)
- Log -----------------------------------------------------------------
8977b2e... libtool 2.2 updates
7013849... Check if environ is actually set before we use it
2ee9276... Merge commit 'flameeyes/libtool-2.2'
f8197cf... Update code to use libtool 2.2. Use convenience recursive libltdl.
2da79d5... Create an m4 directory for common macros and use it.
f4e9b7d... Remove gettext macros from configure.ac, intltool is used.
4a51e1c... Bump autoconf requirement to 2.62 (latest released version).
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
bootstrap.sh | 2 +-
configure.ac | 34 ++++++------------------
src/daemon/ltdl-bind-now.c | 57 -----------------------------------------
src/pulsecore/proplist-util.c | 35 +++++++++++++++----------
5 files changed, 31 insertions(+), 99 deletions(-)
-----------------------------------------------------------------------
commit 4a51e1cb9f59fd2313d9bd1c93e6be40348a4fc0
Author: Diego 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Aug 7 19:09:23 2008 +0200
Bump autoconf requirement to 2.62 (latest released version).
diff --git a/configure.ac b/configure.ac
index 25a86a8..f149864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-AC_PREREQ(2.60)
+AC_PREREQ(2.62)
m4_define(PA_MAJOR, [0])
m4_define(PA_MINOR, [9])
commit f4e9b7d778c252f514b4b457305ba310394b4060
Author: Diego 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Fri Aug 8 12:15:26 2008 +0200
Remove gettext macros from configure.ac, intltool is used.
When using intltool there is no need to _also_ use gettext, so remove
gettext macros so that autoreconf does not copy them over.
diff --git a/configure.ac b/configure.ac
index f149864..6618907 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,8 +440,6 @@ AC_CHECK_FUNCS([open64])
AM_ICONV
-AM_GNU_GETTEXT([external])
-
IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=pulseaudio
AC_SUBST([GETTEXT_PACKAGE])
commit 2da79d5ade92c476326e3167d0a56986a9d96200
Author: Diego 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Fri Aug 8 12:18:53 2008 +0200
Create an m4 directory for common macros and use it.
Split acinclude.m4 in multiple macro files.
Let it be known to autoconf and aclocal to use the m4 directory.
Ignore macro files copied or linked by libtool and intltool.
diff --git a/Makefile.am b/Makefile.am
index 63c04ee..facce0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-ACLOCAL_AMFLAGS = -I common
+ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
SUBDIRS=src doxygen man po
diff --git a/bootstrap.sh b/bootstrap.sh
index 6f060c8..e5f1ac5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -58,7 +58,7 @@ else
intltoolize --copy --force --automake
"$LIBTOOLIZE" -c --force --ltdl
- run_versioned aclocal "$VERSION" -I common
+ run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.59 -Wall
run_versioned autoheader 2.59
run_versioned automake "$VERSION" --copy --foreign --add-missing
diff --git a/configure.ac b/configure.ac
index 6618907..4fa171f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ m4_define(PA_MICRO, [11])
AC_INIT([pulseaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzchyfrnhqvb (at) 0pointer (dot) net])
AC_CONFIG_SRCDIR([src/daemon/main.c])
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.10 -Wall])
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..ac5d140
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,8 @@
+argz.m4
+intltool.m4
+libtool.m4
+ltdl.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
diff --git a/m4/acx_libwrap.m4 b/m4/acx_libwrap.m4
new file mode 100644
index 0000000..e160214
--- /dev/null
+++ b/m4/acx_libwrap.m4
@@ -0,0 +1,19 @@
+AC_DEFUN([ACX_LIBWRAP], [
+LIBWRAP_LIBS=
+saved_LIBS="$LIBS"
+LIBS="$LIBS -lwrap"
+AC_MSG_CHECKING([for tcpwrap library and headers])
+AC_LINK_IFELSE(
+AC_LANG_PROGRAM(
+[#include <tcpd.h>
+#include <syslog.h>
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;],
+[struct request_info *req;
+return hosts_access (req);]),
+[AC_DEFINE(HAVE_LIBWRAP, [], [Have tcpwrap?])
+LIBWRAP_LIBS="-lwrap"
+AC_MSG_RESULT(yes)],
+[AC_MSG_RESULT(no)])
+LIBS="$saved_LIBS"
+])
diff --git a/m4/acx_lirc.m4 b/m4/acx_lirc.m4
new file mode 100644
index 0000000..d3f8ea7
--- /dev/null
+++ b/m4/acx_lirc.m4
@@ -0,0 +1,6 @@
+AC_DEFUN([ACX_LIRC], [
+LIRC_CFLAGS=
+LIRC_LIBS=
+AC_CHECK_HEADER(lirc/lirc_client.h,[AC_CHECK_LIB(lirc_client,lirc_init,[HAVE_LIRC=1
+LIRC_LIBS=-llirc_client],HAVE_LIRC=0)],HAVE_LIRC=0)
+])
diff --git a/acinclude.m4 b/m4/acx_pthread.m4
similarity index 92%
rename from acinclude.m4
rename to m4/acx_pthread.m4
index 02c0518..cbd6bfa 100644
--- a/acinclude.m4
+++ b/m4/acx_pthread.m4
@@ -346,43 +346,3 @@ else
fi
AC_LANG_RESTORE
])dnl ACX_PTHREAD
-AC_DEFUN([AC_CHECK_DEFINE],[
-AS_VAR_PUSHDEF([ac_var],[ac_cv_defined_$1_$2])dnl
-AC_CACHE_CHECK([for $1 in $2], ac_var,
-AC_TRY_COMPILE([#include <$2>],[
- #ifdef $1
- int ok;
- #else
- choke me
- #endif
-],AS_VAR_SET(ac_var, yes),AS_VAR_SET(ac_var, no)))
-AS_IF([test AS_VAR_GET(ac_var) != "no"], [$3], [$4])dnl
-AS_VAR_POPDEF([ac_var])dnl
-])
-
-AC_DEFUN([ACX_LIBWRAP], [
-LIBWRAP_LIBS=
-saved_LIBS="$LIBS"
-LIBS="$LIBS -lwrap"
-AC_MSG_CHECKING([for tcpwrap library and headers])
-AC_LINK_IFELSE(
-AC_LANG_PROGRAM(
-[#include <tcpd.h>
-#include <syslog.h>
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;],
-[struct request_info *req;
-return hosts_access (req);]),
-[AC_DEFINE(HAVE_LIBWRAP, [], [Have tcpwrap?])
-LIBWRAP_LIBS="-lwrap"
-AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)])
-LIBS="$saved_LIBS"
-])
-
-AC_DEFUN([ACX_LIRC], [
-LIRC_CFLAGS=
-LIRC_LIBS=
-AC_CHECK_HEADER(lirc/lirc_client.h,[AC_CHECK_LIB(lirc_client,lirc_init,[HAVE_LIRC=1
-LIRC_LIBS=-llirc_client],HAVE_LIRC=0)],HAVE_LIRC=0)
-])
diff --git a/m4/check_define.m4 b/m4/check_define.m4
new file mode 100644
index 0000000..43edc78
--- /dev/null
+++ b/m4/check_define.m4
@@ -0,0 +1,13 @@
+AC_DEFUN([AC_CHECK_DEFINE],[
+AS_VAR_PUSHDEF([ac_var],[ac_cv_defined_$1_$2])dnl
+AC_CACHE_CHECK([for $1 in $2], ac_var,
+AC_TRY_COMPILE([#include <$2>],[
+ #ifdef $1
+ int ok;
+ #else
+ choke me
+ #endif
+],AS_VAR_SET(ac_var, yes),AS_VAR_SET(ac_var, no)))
+AS_IF([test AS_VAR_GET(ac_var) != "no"], [$3], [$4])dnl
+AS_VAR_POPDEF([ac_var])dnl
+])
commit f8197cfc4c88a16933de036544f02f31ac26b78e
Author: Diego 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Fri Aug 8 12:24:57 2008 +0200
Update code to use libtool 2.2. Use convenience recursive libltdl.
Also remove the code for older libtool from the daemon.
diff --git a/Makefile.am b/Makefile.am
index facce0d..b5e638b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS=src doxygen man po
+SUBDIRS=src doxygen man po libltdl
MAINTAINERCLEANFILES =
noinst_DATA =
diff --git a/configure.ac b/configure.ac
index 4fa171f..8bb3f8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,29 +244,9 @@ else
fi
#### libtool stuff ####
-
-AC_LTDL_ENABLE_INSTALL
-AC_LIBLTDL_INSTALLABLE
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_SUBST(LTDLINCL)
-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([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([[
-
- *** Cannot find the libltdl development files.
- *** Maybe you need to install the libltdl-dev package.
- ]])
-fi
+LT_CONFIG_LTDL_DIR([libltdl])
+LT_INIT([dlopen win32-dll])
+LTDL_INIT([convenience recursive])
#### Determine build environment ####
@@ -1129,6 +1109,7 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"])
AC_CONFIG_FILES([
Makefile
+libltdl/Makefile
src/Makefile
man/Makefile
libpulse.pc
diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 4007724..6821aac 100644
--- a/src/daemon/ltdl-bind-now.c
+++ b/src/daemon/ltdl-bind-now.c
@@ -53,30 +53,6 @@
#undef PA_BIND_NOW
#endif
-#ifdef HAVE_LT_DLMUTEX_REGISTER
-
-static pa_mutex *libtool_mutex = NULL;
-
-PA_STATIC_TLS_DECLARE_NO_FREE(libtool_tls);
-
-static void libtool_lock(void) {
- pa_mutex_lock(libtool_mutex);
-}
-
-static void libtool_unlock(void) {
- pa_mutex_unlock(libtool_mutex);
-}
-
-static void libtool_set_error(const char *error) {
- PA_STATIC_TLS_SET(libtool_tls, (char*) error);
-}
-
-static const char *libtool_get_error(void) {
- return PA_STATIC_TLS_GET(libtool_tls);
-}
-
-#endif
-
#ifdef PA_BIND_NOW
/*
@@ -91,11 +67,7 @@ static const char *libtool_get_error(void) {
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;
@@ -140,36 +112,13 @@ static lt_ptr bind_now_find_sym(lt_user_data d, lt_module m, const char *symbol)
void pa_ltdl_init(void) {
#ifdef PA_BIND_NOW
-# ifdef HAVE_STRUCT_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);
-#ifdef HAVE_LT_DLMUTEX_REGISTER
- pa_assert_se(libtool_mutex = pa_mutex_new(TRUE, FALSE));
- pa_assert_se(lt_dlmutex_register(libtool_lock, libtool_unlock, libtool_set_error, libtool_get_error) == 0);
-#endif
-
#ifdef PA_BIND_NOW
-# ifdef HAVE_STRUCT_LT_USER_DLLOADER
-
- if (!(place = lt_dlloader_find("dlopen")))
- place = lt_dlloader_next(NULL);
-
- /* 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)
return;
@@ -189,15 +138,9 @@ void pa_ltdl_init(void) {
/* 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
}
void pa_ltdl_done(void) {
pa_assert_se(lt_dlexit() == 0);
-
-#ifdef HAVE_LT_DLMUTEX_REGISTER
- pa_mutex_free(libtool_mutex);
- libtool_mutex = NULL;
-#endif
}
commit 2ee9276d97f15ea965fb8a88f2aa184355b9903a
Merge: f826ded... f8197cf...
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Dec 16 13:55:06 2008 +0100
Merge commit 'flameeyes/libtool-2.2'
diff --cc configure.ac
index c5930c0,8bb3f8a..95ac9c2
--- a/configure.ac
+++ b/configure.ac
@@@ -194,44 -219,34 +194,24 @@@ els
esac
fi
-AC_MSG_CHECKING([whether $CC knows __thread])
-AC_LANG_CONFTEST([static __thread int a = 6; int main() { a = 5; }])
-$CC conftest.c $CFLAGS -o conftest > /dev/null 2> /dev/null
-ret=$?
-rm -f conftest.o conftest
-if test $ret -eq 0 ; then
- AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
+CC_CHECK_TLS
+
+AC_CACHE_CHECK([whether $CC knows _Bool],
+ pulseaudio_cv__Bool,
+ [AC_COMPILE_IFELSE(
+ AC_LANG_PROGRAM([], [[_Bool b;]]),
+ [pulseaudio_cv__Bool=yes],
+ [pulseaudio_cv__Bool=no])
+ ])
-AC_MSG_CHECKING([whether $CC knows _Bool])
-AC_LANG_CONFTEST([int main() { _Bool b; }])
-$CC conftest.c $CFLAGS -o conftest > /dev/null 2> /dev/null
-ret=$?
-rm -f conftest.o conftest
-if test $ret -eq 0 ; then
+AS_IF([test "$pulseaudio_cv__Bool" = "yes"], [
AC_DEFINE([HAVE_STD_BOOL], 1, [Have _Bool.])
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
+ ])
#### libtool stuff ####
-
- AC_LTDL_ENABLE_INSTALL
- AC_LIBLTDL_INSTALLABLE
- AC_LIBTOOL_DLOPEN
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- AC_SUBST(LTDLINCL)
- 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([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([[
-
- *** Cannot find the libltdl development files.
- *** Maybe you need to install the libltdl-dev package.
- ]])
- fi
+ LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen win32-dll])
+ LTDL_INIT([convenience recursive])
#### Determine build environment ####
commit 701384935446a5705cb77a9da2f896b086a392be
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Dec 16 14:03:40 2008 +0100
Check if environ is actually set before we use it
Some applications seem to set **environ to NULL for various reasons.
Before we iterate through it we thus need to make sure it is actually
set to make sure we don't segfault.
Closes rhbz #473080
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index 4d505f5..35c9985 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -44,27 +44,34 @@ void pa_init_proplist(pa_proplist *p) {
pa_assert(p);
- for (e = environ; *e; e++) {
+ if (environ) {
- if (pa_startswith(*e, "PULSE_PROP_")) {
- size_t kl = strcspn(*e+11, "=");
- char *k;
+ /* Some applications seem to reset environ to NULL for various
+ * reasons, hence we need to check for this explicitly. See
+ * rhbz #473080 */
- if ((*e)[11+kl] != '=')
- continue;
+ for (e = environ; *e; e++) {
- if (!pa_utf8_valid(*e+11+kl+1))
- continue;
+ if (pa_startswith(*e, "PULSE_PROP_")) {
+ size_t kl = strcspn(*e+11, "=");
+ char *k;
- k = pa_xstrndup(*e+11, kl);
+ if ((*e)[11+kl] != '=')
+ continue;
- if (pa_proplist_contains(p, k)) {
+ if (!pa_utf8_valid(*e+11+kl+1))
+ continue;
+
+ k = pa_xstrndup(*e+11, kl);
+
+ if (pa_proplist_contains(p, k)) {
+ pa_xfree(k);
+ continue;
+ }
+
+ pa_proplist_sets(p, k, *e+11+kl+1);
pa_xfree(k);
- continue;
}
-
- pa_proplist_sets(p, k, *e+11+kl+1);
- pa_xfree(k);
}
}
commit 8977b2e61dc2bf58c22d5b7e655a58b0c7ac1375
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Dec 16 14:25:31 2008 +0100
libtool 2.2 updates
diff --git a/bootstrap.sh b/bootstrap.sh
index 5dfcdf2..4eacc5a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -57,7 +57,7 @@ else
test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
intltoolize --copy --force --automake
- "$LIBTOOLIZE" -c --force --ltdl
+ "$LIBTOOLIZE" -c --force --ltdl --recursive
run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.62 -Wall
run_versioned autoheader 2.62
diff --git a/configure.ac b/configure.ac
index 95ac9c2..b36fec3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-AC_PREREQ(2.62)
+AC_PREREQ(2.63)
m4_define(PA_MAJOR, [0])
m4_define(PA_MINOR, [9])
@@ -209,8 +209,9 @@ AS_IF([test "$pulseaudio_cv__Bool" = "yes"], [
])
#### libtool stuff ####
+LT_PREREQ(2.2)
LT_CONFIG_LTDL_DIR([libltdl])
-LT_INIT([dlopen win32-dll])
+LT_INIT([dlopen win32-dll disable-static])
LTDL_INIT([convenience recursive])
#### Determine build environment ####
@@ -284,7 +285,7 @@ AC_TYPE_SIZE_T
AC_CHECK_TYPES(ssize_t, , [AC_DEFINE([ssize_t], [signed long],
[Define ssize_t if it is not done by the standard libs.])])
AC_TYPE_OFF_T
-AC_TYPE_SIGNAL
+
AC_TYPE_UID_T
AC_CHECK_DECLS(environ)
@@ -980,7 +981,7 @@ AM_CONDITIONAL([HAVE_POLKIT], [test "x$HAVE_POLKIT" = x1])
#### OpenSSL support (optional) ####
AC_ARG_ENABLE([openssl],
- AC_HELP_STRING([--disable-openssl], [Disable OpenSSL support (used for Airtunes/RAOP)]),
+ AS_HELP_STRING([--disable-openssl],[Disable OpenSSL support (used for Airtunes/RAOP)]),
[
case "${enableval}" in
yes) openssl=yes ;;
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list