tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Partial update for pulseaudio-0.9.15: libtool-2.x needed
Hi!
I tried updating pulseaudio to 0.9.15, but it insists on libtool-2.x
(in particular, libltdl-2.x), which stops it in the configure
step. I'm not ready to do that libtool update, so I stopped after
making all the patches apply...
Thomas
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 4 May 2009 16:20:48 -0000 1.22
+++ Makefile 17 May 2009 20:47:18 -0000
@@ -3,8 +3,7 @@
# NOTE: Please send a copy of any patches that are not pkgsrc-specific
# to <pulseaudio-discuss%mail.0pointer.de@localhost>
-DISTNAME= pulseaudio-0.9.14
-PKGREVISION= 2
+DISTNAME= pulseaudio-0.9.15
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
@@ -15,6 +14,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
+# XXX: insists on libtool-2.x
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \
autoconf automake autoreconf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo 5 Feb 2009 21:05:07 -0000 1.14
+++ distinfo 17 May 2009 20:47:18 -0000
@@ -1,21 +1,9 @@
$NetBSD: distinfo,v 1.14 2009/02/05 21:05:07 tron Exp $
-SHA1 (pulseaudio-0.9.14.tar.gz) = a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4
-RMD160 (pulseaudio-0.9.14.tar.gz) = c7722d0d0240555edf917391989ad2e1cd4eb6b1
-Size (pulseaudio-0.9.14.tar.gz) = 1303077 bytes
+SHA1 (pulseaudio-0.9.15.tar.gz) = 56fb71e4e88c901d9941d85bfe142612c30e5c8e
+RMD160 (pulseaudio-0.9.15.tar.gz) = 7cab0d9ab44180b6440ae7f151a6cbb91928b321
+Size (pulseaudio-0.9.15.tar.gz) = 1704374 bytes
SHA1 (patch-aa) = 49ef2b68ef5ffd861e1339e792ab43205b7b1ed2
-SHA1 (patch-ab) = b894cf1797a2f02e8131be8abc8250774bfec1ec
-SHA1 (patch-ac) = 877f1dd615129aa7396fd3dc142474f2795fa802
-SHA1 (patch-ad) = 60caf8bc41504fc035a7264ff3c32a4b19da0645
-SHA1 (patch-ae) = 1cd31d18c133fdd5e8db59be319ba5b7a45fe0fe
+SHA1 (patch-ad) = 9ce543192aecf4bb28f761ddc1d13c13e50e2185
SHA1 (patch-af) = 31b8564cb91aabb5de5490659e77de984fd1920b
-SHA1 (patch-ag) = 67e3330c52c605e1eec505166e4ceed1a1277b11
-SHA1 (patch-ah) = 13cee1dc10be17f51978208843048ba9db7d9a3f
-SHA1 (patch-ai) = b8e9e2dee9d1c5d9de488cfa0d06440eedacb7c6
-SHA1 (patch-aj) = 50edf909d5d7cc35e925685cdf0831e73d06f6ec
-SHA1 (patch-ak) = 2a2f80a2ab4b30f2daaebdb1ad0bcb54345743cd
-SHA1 (patch-al) = 26999d41484421c0995282045783e3c9df36d4d4
-SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34
-SHA1 (patch-ba) = da9742d49ecb409cd13bee4468e64f982c03cffe
-SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a
SHA1 (patch-ca) = 75eef8955fa368a144b9e55258389332a177ed6c
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab 18 Dec 2008 14:42:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/18 14:42:56 jmcneill Exp $
-
---- src/daemon/main.c.orig 2008-10-03 15:16:52.000000000 -0400
-+++ src/daemon/main.c
-@@ -302,7 +302,9 @@ static void set_all_rlimits(const pa_dae
- #ifdef RLIMIT_MEMLOCK
- set_one_rlimit(&conf->rlimit_memlock, RLIMIT_MEMLOCK, "RLIMIT_MEMLOCK");
- #endif
-+#ifdef RLIMIT_AS
- set_one_rlimit(&conf->rlimit_as, RLIMIT_AS, "RLIMIT_AS");
-+#endif
- #ifdef RLIMIT_LOCKS
- set_one_rlimit(&conf->rlimit_locks, RLIMIT_LOCKS, "RLIMIT_LOCKS");
- #endif
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac 24 Dec 2008 04:11:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/12/24 04:11:17 dsainty Exp $
-
---- src/tests/rtstutter.c.orig 2008-08-19 17:25:05.000000000 -0400
-+++ src/tests/rtstutter.c 2008-12-23 13:25:08.000000000 -0500
-@@ -42,6 +42,7 @@ static int msec_lower, msec_upper;
- static void* work(void *p) PA_GCC_NORETURN;
-
- static void* work(void *p) {
-+#if 0
- cpu_set_t mask;
- struct sched_param param;
-
-@@ -83,10 +84,11 @@ static void* work(void *p) {
- } while (now.tv_sec < end.tv_sec ||
- (now.tv_sec == end.tv_sec && now.tv_nsec < end.tv_nsec));
- }
-+#endif
- }
-
- int main(int argc, char*argv[]) {
-- int n;
-+ int n, ncpus;
-
- srand((unsigned) time(NULL));
-
-@@ -106,7 +108,12 @@ int main(int argc, char*argv[]) {
-
- pa_log_notice("Creating random latencies in the range of %ims to %ims.",
msec_lower, msec_upper);
-
-- for (n = 1; n < sysconf(_SC_NPROCESSORS_CONF); n++) {
-+#ifdef _SC_NPROCESSORS_CONF
-+ ncpus = sysconf(_SC_NPROCESSORS_CONF);
-+#else
-+ ncpus = 1;
-+#endif
-+ for (n = 1; n < ncpus; n++) {
- pthread_t t;
- pa_assert_se(pthread_create(&t, NULL, work, PA_INT_TO_PTR(n)) == 0);
- }
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/patches/patch-ad,v
retrieving revision 1.3
diff -u -r1.3 patch-ad
--- patches/patch-ad 25 Dec 2008 21:53:30 -0000 1.3
+++ patches/patch-ad 17 May 2009 20:47:18 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $
---- src/Makefile.am.orig 2008-12-20 11:45:28.000000000 -0500
-+++ src/Makefile.am 2008-12-20 11:47:47.000000000 -0500
+--- src/Makefile.am.orig 2009-03-30 22:31:35.000000000 +0000
++++ src/Makefile.am
@@ -26,9 +26,9 @@
pulseincludedir=$(includedir)/pulse
@@ -14,7 +14,7 @@
###################################
# Defines #
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ PA_BINARY=$(bindir)/pulseaudio$(EXEEXT)
if OS_IS_WIN32
PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT%
else
@@ -23,12 +23,12 @@
endif
###################################
-@@ -1396,7 +1396,7 @@
+@@ -1306,7 +1306,7 @@ module_x11_cork_request_la_LIBADD = $(AM
# OSS
- liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
+ liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h
-liboss_util_la_LDFLAGS = -avoid-version
-+liboss_util_la_LDFLAGS = -avoid-version $(LIBOSSAUDIO)
- liboss_util_la_LIBADD = libpulsecore.la
++liboss_util_la_LDFLAGS = -avoid-version ${LIBOSSAUDIO}
+ liboss_util_la_LIBADD = libpulsecore-@PA_MAJORMINORMICRO@.la
libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
- module_oss_la_SOURCES = modules/module-oss.c
+ module_oss_la_SOURCES = modules/oss/module-oss.c
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- patches/patch-ae 18 Dec 2008 14:42:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/12/18 14:42:56 jmcneill Exp $
-
---- src/pulsecore/socket-util.c.orig 2008-12-18 00:53:11.000000000 -0500
-+++ src/pulsecore/socket-util.c
-@@ -202,9 +202,11 @@ void pa_make_udp_socket_low_delay(int fd
- }
-
- int pa_socket_set_rcvbuf(int fd, size_t l) {
-+ int bufsz = (int)l;
-+
- pa_assert(fd >= 0);
-
-- if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void*)&l, sizeof(l)) < 0) {
-+ if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void*)&bufsz, sizeof(bufsz)) <
0) {
- pa_log_warn("SO_RCVBUF: %s", pa_cstrerror(errno));
- return -1;
- }
-@@ -213,9 +215,11 @@ int pa_socket_set_rcvbuf(int fd, size_t
- }
-
- int pa_socket_set_sndbuf(int fd, size_t l) {
-+ int bufsz = (int)l;
-+
- pa_assert(fd >= 0);
-
-- if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void*)&l, sizeof(l)) < 0) {
-+ if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void*)&bufsz, sizeof(bufsz)) <
0) {
- pa_log("SO_SNDBUF: %s", pa_cstrerror(errno));
- return -1;
- }
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- patches/patch-ag 23 Dec 2008 02:15:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- ./src/modules/oss-util.c.orig 2008-12-21 22:03:48 +0200
-+++ ./src/modules/oss-util.c 2008-12-21 22:04:31 +0200
-@@ -298,7 +298,11 @@ static int get_device_number(const char
- int r;
-
- if (!(p = rp = pa_readlink(dev))) {
-+#ifdef ENOLINK
- if (errno != EINVAL && errno != ENOLINK) {
-+#else
-+ if (errno != EINVAL) {
-+#endif
- r = -1;
- goto finish;
- }
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
--- patches/patch-ah 23 Dec 2008 02:15:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- src/pulsecore/core-util.c.orig 2008-12-21 23:55:12 +0200
-+++ src/pulsecore/core-util.c 2008-12-22 00:26:22 +0200
-@@ -1026,12 +1026,21 @@ int pa_uid_in_group(uid_t uid, const cha
- char **i;
- int r = -1;
-
-+#ifdef _SC_GETGR_R_SIZE_MAX
- g_n = sysconf(_SC_GETGR_R_SIZE_MAX);
- g_buf = pa_xmalloc((size_t) g_n);
-+#else
-+ g_buf = pa_xmalloc(512);
-+#endif
-
-+#ifdef _SC_GETPW_R_SIZE_MAX
- p_n = sysconf(_SC_GETPW_R_SIZE_MAX);
- p_buf = pa_xmalloc((size_t) p_n);
-+#else
-+ p_buf = pa_xmalloc(512);
-+#endif
-
-+#ifdef HAVE_GETGRNAM_R
- errno = 0;
- if (getgrnam_r(name, &grbuf, g_buf, (size_t) g_n, &gr) != 0 || !gr) {
-
-@@ -1040,14 +1049,28 @@ int pa_uid_in_group(uid_t uid, const cha
-
- goto finish;
- }
-+#else
-+ gr = getgrnam(name);
-+
-+ if (gr == NULL) {
-+ errno = ENOENT;
-+ goto finish;
-+ }
-+#endif
-
- r = 0;
- for (i = gr->gr_mem; *i; i++) {
- struct passwd pwbuf, *pw;
-
-+#ifdef HAVE_GETPWNAM_R
- errno = 0;
- if (getpwnam_r(*i, &pwbuf, p_buf, (size_t) p_n, &pw) != 0 || !pw)
- continue;
-+#else
-+ pw = getpwnam(*i);
-+ if (pw == NULL)
-+ continue;
-+#endif
-
- if (pw->pw_uid == uid) {
- r = 1;
-@@ -1069,9 +1092,14 @@ gid_t pa_get_gid_of_group(const char *na
- long g_n;
- struct group grbuf, *gr;
-
-+#ifdef _SC_GETGR_R_SIZE_MAX
- g_n = sysconf(_SC_GETGR_R_SIZE_MAX);
- g_buf = pa_xmalloc((size_t) g_n);
-+#else
-+ g_buf = pa_xmalloc(512);
-+#endif
-
-+#ifdef HAVE_GETGRNAM_R
- errno = 0;
- if (getgrnam_r(name, &grbuf, g_buf, (size_t) g_n, &gr) != 0 || !gr) {
-
-@@ -1080,6 +1108,14 @@ gid_t pa_get_gid_of_group(const char *na
-
- goto finish;
- }
-+#else
-+ gr = getgrnam(name);
-+
-+ if (gr == NULL) {
-+ errno = ENOENT;
-+ goto finish;
-+ }
-+#endif
-
- ret = gr->gr_gid;
-
Index: patches/patch-ai
===================================================================
RCS file: patches/patch-ai
diff -N patches/patch-ai
--- patches/patch-ai 23 Dec 2008 02:15:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- src/modules/rtp/rtp.c.orig 2008-12-22 00:50:26 +0200
-+++ src/modules/rtp/rtp.c 2008-12-22 00:51:41 +0200
-@@ -35,6 +35,10 @@
- #include <sys/filio.h>
- #endif
-
-+#ifdef HAVE_SYS_UIO_H
-+#include <sys/uio.h>
-+#endif
-+
- #include <pulsecore/core-error.h>
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
Index: patches/patch-aj
===================================================================
RCS file: patches/patch-aj
diff -N patches/patch-aj
--- patches/patch-aj 23 Dec 2008 02:15:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- src/modules/rtp/sap.c.orig 2008-12-22 00:52:17 +0200
-+++ src/modules/rtp/sap.c 2008-12-22 00:52:43 +0200
-@@ -38,6 +38,10 @@
- #include <sys/filio.h>
- #endif
-
-+#ifdef HAVE_SYS_UIO_H
-+#include <sys/uio.h>
-+#endif
-+
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core-error.h>
Index: patches/patch-ak
===================================================================
RCS file: patches/patch-ak
diff -N patches/patch-ak
--- patches/patch-ak 8 Jan 2009 12:11:46 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2009/01/08 12:11:46 dsainty Exp $
-
---- src/modules/module-oss.c.orig 2008-09-04 09:13:43.000000000 +1200
-+++ src/modules/module-oss.c 2009-01-08 20:55:21.000000000 +1300
-@@ -71,6 +71,11 @@
- #include <pulsecore/thread-mq.h>
- #include <pulsecore/rtpoll.h>
-
-+#if defined(__NetBSD__) && !defined(SNDCTL_DSP_GETODELAY)
-+#include <sys/audioio.h>
-+#include <sys/syscall.h>
-+#endif
-+
- #include "oss-util.h"
- #include "module-oss-symdef.h"
-
-@@ -399,13 +404,27 @@
-
- if (u->use_getodelay) {
- int arg;
--
-+#if defined(__NetBSD__) && !defined(SNDCTL_DSP_GETODELAY)
-+#if defined(AUDIO_GETBUFINFO)
-+ struct audio_info info;
-+ if (syscall(SYS_ioctl, u->fd, AUDIO_GETBUFINFO, &info) < 0) {
-+ pa_log_info("Device doesn't support AUDIO_GETBUFINFO: %s",
pa_cstrerror(errno));
-+ u->use_getodelay = 0;
-+ } else {
-+ arg = info.play.seek + info.blocksize / 2;
-+ r = pa_bytes_to_usec((size_t) arg, &u->sink->sample_spec);
-+ }
-+#else
-+ pa_log_info("System doesn't support AUDIO_GETBUFINFO");
-+ u->use_getodelay = 0;
-+#endif
-+#else
- if (ioctl(u->fd, SNDCTL_DSP_GETODELAY, &arg) < 0) {
- pa_log_info("Device doesn't support SNDCTL_DSP_GETODELAY: %s",
pa_cstrerror(errno));
- u->use_getodelay = 0;
- } else
- r = pa_bytes_to_usec((size_t) arg, &u->sink->sample_spec);
--
-+#endif
- }
-
- if (!u->use_getodelay && u->use_getospace) {
Index: patches/patch-al
===================================================================
RCS file: patches/patch-al
diff -N patches/patch-al
--- patches/patch-al 5 Feb 2009 21:05:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1 2009/02/05 21:05:07 tron Exp $
-
---- src/pulsecore/core-util.c.orig 2009-02-05 14:21:35.000000000 +0000
-+++ src/pulsecore/core-util.c 2009-02-05 14:42:02.000000000 +0000
-@@ -105,6 +105,10 @@
- #define MSG_NOSIGNAL 0
- #endif
-
-+#ifdef __APPLE__
-+#include <xlocale.h>
-+#endif
-+
- #ifdef OS_IS_WIN32
-
- #define PULSE_ROOTENV "PULSE_ROOT"
Index: patches/patch-am
===================================================================
RCS file: patches/patch-am
diff -N patches/patch-am
--- patches/patch-am 5 Feb 2009 21:05:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-am,v 1.1 2009/02/05 21:05:07 tron Exp $
-
---- src/pulsecore/proplist-util.c.orig 2009-01-12 23:10:34.000000000 +0000
-+++ src/pulsecore/proplist-util.c 2009-02-05 19:59:17.000000000 +0000
-@@ -35,9 +35,14 @@
-
- #include "proplist-util.h"
-
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- void pa_init_proplist(pa_proplist *p) {
- int a, b;
--#if !HAVE_DECL_ENVIRON
-+#if !HAVE_DECL_ENVIRON && !defined(__APPLE__)
- extern char **environ;
- #endif
- char **e;
Index: patches/patch-ba
===================================================================
RCS file: patches/patch-ba
diff -N patches/patch-ba
--- patches/patch-ba 23 Dec 2008 19:29:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
-
---- configure.ac.orig 2008-10-05 20:39:37.000000000 -0400
-+++ configure.ac 2008-12-23 12:38:28.000000000 -0500
-@@ -125,7 +125,18 @@
- no) ;;
- *) AC_MSG_ERROR(bad value ${enableval} for
--disable-atomic-arm-linux-helpers) ;;
- esac
-- ],)
-+ ],)
-+
-+AC_ARG_ENABLE([netbsd-atomic-ops],
-+ AS_HELP_STRING([--enable-netbsd-atomic-ops],[Use the native NetBSD
atomic_ops implementation]),
-+ [
-+ case "${enableval}" in
-+ yes) atomic_netbsd_helpers=yes ;;
-+ no) atomic_netbsd_helpers=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for
--enable-netbsd-atomic-ops) ;;
-+ esac
-+ ],
-+ [atomic_netbsd_helpers=auto])
-
- AC_MSG_CHECKING([target operating system])
- case $host in
-@@ -133,6 +144,10 @@
- AC_MSG_RESULT([linux])
- pulse_target_os=linux
- ;;
-+ *-*-netbsd*)
-+ AC_MSG_RESULT([netbsd])
-+ pulse_target_os=netbsd
-+ ;;
- *)
- AC_MSG_RESULT([unknown])
- pulse_target_os=unknown
-@@ -193,7 +208,13 @@
- fi
- ;;
- *)
-- AC_MSG_RESULT([unknown])
-+ if test "x$pulse_target_os" = "xnetbsd" && test
"x$atomic_netbsd_helpers" = "xyes"; then
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE_UNQUOTED(NETBSD_ATOMIC_OPS, 1, [netbsd
implementation])
-+ need_libatomic_ops=no
-+ else
-+ AC_MSG_RESULT([unknown])
-+ fi
- ;;
- esac
- fi
-@@ -263,7 +284,7 @@
- AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
- netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
- sys/mman.h sys/resource.h sys/select.h sys/socket.h sys/wait.h \
-- syslog.h sys/dl.h dlfcn.h linux/sockios.h])
-+ sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
- AC_CHECK_HEADERS([netinet/ip.h], [], [],
- [#include <sys/types.h>
- #if HAVE_NETINET_IN_H
-@@ -292,6 +313,9 @@
- # Windows
- AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h])
-
-+# NetBSD
-+AC_CHECK_HEADERS([sys/atomic.h])
-+
- # Other
- AC_CHECK_HEADERS([sys/ioctl.h])
- AC_CHECK_HEADERS([byteswap.h])
-@@ -359,8 +383,8 @@
- AC_FUNC_FORK
- AC_FUNC_GETGROUPS
- AC_FUNC_SELECT_ARGTYPES
--AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r \
-- getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
-+AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \
-+ getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock
nanosleep \
- pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
- sigaction sleep sysconf])
- AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0])
Index: patches/patch-bb
===================================================================
RCS file: patches/patch-bb
diff -N patches/patch-bb
--- patches/patch-bb 23 Dec 2008 19:29:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
-
---- src/pulsecore/atomic.h.orig 2008-09-03 17:13:44.000000000 -0400
-+++ src/pulsecore/atomic.h 2008-12-23 14:13:35.000000000 -0500
-@@ -107,6 +107,85 @@ static inline pa_bool_t pa_atomic_ptr_cm
- return __sync_bool_compare_and_swap(&a->value, (long) old_p, (long)
new_p);
- }
-
-+#elif defined(__NetBSD__) && defined(HAVE_SYS_ATOMIC_H)
-+
-+/* NetBSD 5.0+ atomic_ops(3) implementation */
-+
-+#include <sys/atomic.h>
-+
-+typedef struct pa_atomic {
-+ volatile unsigned int value;
-+} pa_atomic_t;
-+
-+#define PA_ATOMIC_INIT(v) { .value = (unsigned int) (v) }
-+
-+static inline int pa_atomic_load(const pa_atomic_t *a) {
-+ membar_sync();
-+ return (int) a->value;
-+}
-+
-+static inline void pa_atomic_store(pa_atomic_t *a, int i) {
-+ a->value = (unsigned int) i;
-+ membar_sync();
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_add(pa_atomic_t *a, int i) {
-+ int nv = (int)atomic_add_int_nv(&a->value, i);
-+ return nv - i;
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_sub(pa_atomic_t *a, int i) {
-+ int nv = (int)atomic_add_int_nv(&a->value, -i);
-+ return nv + i;
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_inc(pa_atomic_t *a) {
-+ int nv = (int)atomic_inc_uint_nv(&a->value);
-+ return nv - 1;
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_dec(pa_atomic_t *a) {
-+ int nv = (int)atomic_dec_uint_nv(&a->value);
-+ return nv + 1;
-+}
-+
-+/* Returns TRUE when the operation was successful. */
-+static inline pa_bool_t pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int
new_i) {
-+ unsigned int r = atomic_cas_uint(&a->value, (unsigned int) old_i,
(unsigned int) new_i);
-+ if ((int) r == old_i)
-+ return TRUE;
-+ else
-+ return FALSE;
-+}
-+
-+typedef struct pa_atomic_ptr {
-+ volatile void *value;
-+} pa_atomic_ptr_t;
-+
-+#define PA_ATOMIC_PTR_INIT(v) { .value = (v) }
-+
-+static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
-+ membar_sync();
-+ return (void *) a->value;
-+}
-+
-+static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
-+ a->value = p;
-+ membar_sync();
-+}
-+
-+static inline pa_bool_t pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void
*old_p, void* new_p) {
-+ void *r = atomic_cas_ptr(&a->value, old_p, new_p);
-+ if (r == old_p)
-+ return TRUE;
-+ else
-+ return FALSE;
-+}
-+
- #elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
-
- #warn "The native atomic operations implementation for AMD64 has not been
tested thoroughly. libatomic_ops is known to not work properly on AMD64 and
your gcc version is too old for the gcc-builtin atomic ops support. You have
three options now: test the native atomic operations implementation for AMD64,
fix libatomic_ops, or upgrade your GCC."
Home |
Main Index |
Thread Index |
Old Index