pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pulseaudio-git: Add new package tracking git



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Nov 20 03:31:50 2015 +0100
Changeset:	f85e408ad890209c447a05a79216c334f58e4230

Added Files:
	pulseaudio-git/DESCR
	pulseaudio-git/Makefile
	pulseaudio-git/PLIST
	pulseaudio-git/buildlink3.mk
	pulseaudio-git/distinfo
	pulseaudio-git/options.mk
	pulseaudio-git/patches/CVS/Entries
	pulseaudio-git/patches/CVS/Repository
	pulseaudio-git/patches/CVS/Root
	pulseaudio-git/patches/patch-aa
	pulseaudio-git/patches/patch-configure.ac
	pulseaudio-git/patches/patch-src_Makefile.am
	pulseaudio-git/patches/patch-src_Makefile.in
	pulseaudio-git/patches/patch-src_daemon_caps.c
	pulseaudio-git/patches/patch-src_daemon_main.c
	pulseaudio-git/patches/patch-src_modules_module-detect.c
	pulseaudio-git/patches/patch-src_modules_module-solaris.c
	pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
	pulseaudio-git/patches/patch-src_pulsecore_core-util.c
	pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
	pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
	pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
	pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
	pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
	pulseaudio-git/patches/patch-src_tests_rtpoll-test.c

Log Message:
pulseaudio-git: Add new package tracking git

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f85e408ad890209c447a05a79216c334f58e4230

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pulseaudio-git/DESCR                               |   6 +
 pulseaudio-git/Makefile                            | 124 +++++++++
 pulseaudio-git/PLIST                               | 303 +++++++++++++++++++++
 pulseaudio-git/buildlink3.mk                       |  42 +++
 pulseaudio-git/distinfo                            |  22 ++
 pulseaudio-git/options.mk                          |  31 +++
 pulseaudio-git/patches/CVS/Entries                 |  17 ++
 pulseaudio-git/patches/CVS/Repository              |   1 +
 pulseaudio-git/patches/CVS/Root                    |   1 +
 pulseaudio-git/patches/patch-aa                    | 130 +++++++++
 pulseaudio-git/patches/patch-configure.ac          | 138 ++++++++++
 pulseaudio-git/patches/patch-src_Makefile.am       |  24 ++
 pulseaudio-git/patches/patch-src_Makefile.in       |  28 ++
 pulseaudio-git/patches/patch-src_daemon_caps.c     |  17 ++
 pulseaudio-git/patches/patch-src_daemon_main.c     |  19 ++
 .../patches/patch-src_modules_module-detect.c      |  32 +++
 .../patches/patch-src_modules_module-solaris.c     |  35 +++
 .../patches/patch-src_modules_oss_module-oss.c     |  18 ++
 .../patches/patch-src_pulsecore_core-util.c        |  14 +
 .../patches/patch-src_pulsecore_mix__neon.c        |  23 ++
 .../patches/patch-src_pulsecore_sample-util.h      |  21 ++
 .../patches/patch-src_pulsecore_svolume__mmx.c     |  24 ++
 .../patches/patch-src_pulsecore_svolume__sse.c     |  24 ++
 .../patches/patch-src_tests_mult-s16-test.c        |  21 ++
 .../patches/patch-src_tests_rtpoll-test.c          |  22 ++
 25 files changed, 1137 insertions(+)

diffs:
diff --git a/pulseaudio-git/DESCR b/pulseaudio-git/DESCR
new file mode 100644
index 0000000..2cb3835
--- /dev/null
+++ b/pulseaudio-git/DESCR
@@ -0,0 +1,6 @@
+PulseAudio is a sound server for POSIX and Win32 systems. A sound server is
+basically a proxy for your sound applications. It allows you to do advanced
+operations on your sound data as it passes between your application and your
+hardware. Things like transferring the audio to a different machine, changing
+the sample format or channel count and mixing several sounds into one are
+easily achieved using a sound server.
diff --git a/pulseaudio-git/Makefile b/pulseaudio-git/Makefile
new file mode 100644
index 0000000..ea2a71a
--- /dev/null
+++ b/pulseaudio-git/Makefile
@@ -0,0 +1,124 @@
+# $NetBSD: Makefile,v 1.100 2015/11/02 13:40:41 ryoon Exp $
+
+DISTNAME=	pulseaudio-7.1
+CATEGORIES=	audio
+GIT_REPOSITORIES=	pulse
+GIT_REPO.pulse=		git://github.com/pulseaudio/pulseaudio.git
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://www.freedesktop.org/wiki/Software/PulseAudio
+COMMENT=	Sound server for POSIX and Win32 systems
+LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
+
+LIBTOOL_REQD=	2.4
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	aclocal autoheader autoconf automake gmake gm4 intltool msgfmt pkg-config
+USE_LANGUAGES=	c c++
+
+REPLACE_BASH=	shell-completion/bash/pulseaudio git-version-gen
+
+.include "../../mk/bsd.prefs.mk"
+# Some tests are incompatible for NetBSD at least
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=	--disable-default-build-tests
+.endif
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[45].*)
+# broken test for TLS
+CONFIGURE_ENV+=		ac_cv_tls=none
+.endif
+
+CONFIGURE_ENV+=		DATADIRNAME=${PKGLOCALEDIR}
+USE_PKGLOCALEDIR=	yes
+
+# Wrong sys/capability.h assumptions, incompatible implementation:
+.if ${OPSYS} == "FreeBSD"
+CONFIGURE_ARGS+=       --without-caps
+.endif
+
+CONFIGURE_ENV+=		EGDIR=${EGDIR}
+MAKE_ENV+=		EGDIR=${EGDIR}
+
+MAKE_FLAGS+=		bashcompletiondir=${PREFIX}/share/bash-completion/completions
+
+CONFIGURE_ARGS+=	--enable-samplerate
+CONFIGURE_ARGS+=	--disable-tcpwrap
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+
+# Use native atomic ops on NetBSD >= 5.0, otherwise
+# fallback to libatomic_ops
+.if !(${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h))
+.include "../../devel/libatomic_ops/buildlink3.mk"
+.endif
+
+# Build module-mmkbd-evdev.so under Linux
+.if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h)
+PLIST.evdev=		yes
+.endif
+
+.include "options.mk"
+
+PKGCONFIG_OVERRIDE+=	libpulse-mainloop-glib.pc.in
+PKGCONFIG_OVERRIDE+=	libpulse-simple.pc.in
+PKGCONFIG_OVERRIDE+=	libpulse.pc.in
+
+LIBS.NetBSD+=		${LIBOSSAUDIO}
+
+INSTALLATION_DIRS=	share/examples/pulse
+
+PULSE_USER?=		pulse
+PULSE_GROUP?=		pulse
+PULSE_GROUP_REALTIME?=	pulsert
+PULSE_GROUP_ACCESS?=	pulseacc
+
+BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
+
+PKG_SYSCONFSUBDIR=	pulse
+EGDIR=		${PREFIX}/share/examples/pulseaudio
+CONF_FILES=	${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
+CONF_FILES+=	${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
+CONF_FILES+=	${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
+CONF_FILES+=	${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
+CONF_FILES+=	${EGDIR}/pulseaudio-system.conf \
+		${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
+
+PLIST_VARS+=		bonjour coreaudio evdev oss sun
+
+.if ${OPSYS} == "SunOS"
+PLIST.sun=		yes
+.  if ${OS_VERSION} == "5.11"
+PLIST.oss=		yes
+.  endif
+.elif ${OPSYS} == "Darwin"
+PLIST.bonjour=	yes
+PLIST.coreaudio=	yes
+.else
+PLIST.oss=		yes
+.endif
+
+PKG_GROUPS=		${PULSE_GROUP}
+PKG_GROUPS+=		${PULSE_GROUP_REALTIME}
+PKG_GROUPS+=		${PULSE_GROUP_ACCESS}
+PKG_USERS=		${PULSE_USER}:${PULSE_GROUP}
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; autoheader; automake -a --foreign -i; autoconf
+
+.if ${OPSYS} != "Darwin"
+.include "../../sysutils/consolekit/buildlink3.mk"
+.endif
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/policykit/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pulseaudio-git/PLIST b/pulseaudio-git/PLIST
new file mode 100644
index 0000000..c8a43bb
--- /dev/null
+++ b/pulseaudio-git/PLIST
@@ -0,0 +1,303 @@
+@comment $NetBSD: PLIST,v 1.19 2015/09/25 14:37:27 ryoon Exp $
+bin/esdcompat
+bin/pacat
+bin/pacmd
+bin/pactl
+${PLIST.oss}bin/padsp
+bin/pamon
+bin/paplay
+bin/parec
+bin/parecord
+bin/pasuspender
+${PLIST.x11}bin/pax11publish
+bin/pulseaudio
+${PLIST.x11}bin/start-pulseaudio-x11
+include/pulse/cdecl.h
+include/pulse/channelmap.h
+include/pulse/context.h
+include/pulse/def.h
+include/pulse/direction.h
+include/pulse/error.h
+include/pulse/ext-device-manager.h
+include/pulse/ext-device-restore.h
+include/pulse/ext-stream-restore.h
+include/pulse/format.h
+include/pulse/gccmacro.h
+include/pulse/glib-mainloop.h
+include/pulse/introspect.h
+include/pulse/mainloop-api.h
+include/pulse/mainloop-signal.h
+include/pulse/mainloop.h
+include/pulse/operation.h
+include/pulse/proplist.h
+include/pulse/pulseaudio.h
+include/pulse/rtclock.h
+include/pulse/sample.h
+include/pulse/scache.h
+include/pulse/simple.h
+include/pulse/stream.h
+include/pulse/subscribe.h
+include/pulse/thread-mainloop.h
+include/pulse/timeval.h
+include/pulse/utf8.h
+include/pulse/util.h
+include/pulse/version.h
+include/pulse/volume.h
+include/pulse/xmalloc.h
+lib/cmake/PulseAudio/PulseAudioConfig.cmake
+lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
+lib/libpulse-mainloop-glib.la
+lib/libpulse-simple.la
+lib/libpulse.la
+lib/libpulsecore-6.0.la
+lib/pkgconfig/libpulse-mainloop-glib.pc
+lib/pkgconfig/libpulse-simple.pc
+lib/pkgconfig/libpulse.pc
+${PLIST.avahi}lib/pulse-6.0/modules/libavahi-wrap.a
+${PLIST.avahi}lib/pulse-6.0/modules/libavahi-wrap.so
+lib/pulse-6.0/modules/libcli.a
+lib/pulse-6.0/modules/libcli.so
+${PLIST.oss}lib/pulse-6.0/modules/liboss-util.a
+${PLIST.oss}lib/pulse-6.0/modules/liboss-util.so
+lib/pulse-6.0/modules/libprotocol-cli.a
+lib/pulse-6.0/modules/libprotocol-cli.so
+lib/pulse-6.0/modules/libprotocol-esound.a
+lib/pulse-6.0/modules/libprotocol-esound.so
+lib/pulse-6.0/modules/libprotocol-http.a
+lib/pulse-6.0/modules/libprotocol-http.so
+lib/pulse-6.0/modules/libprotocol-native.a
+lib/pulse-6.0/modules/libprotocol-native.so
+lib/pulse-6.0/modules/libprotocol-simple.a
+lib/pulse-6.0/modules/libprotocol-simple.so
+lib/pulse-6.0/modules/libraop.a
+lib/pulse-6.0/modules/libraop.so
+lib/pulse-6.0/modules/librtp.a
+lib/pulse-6.0/modules/librtp.so
+lib/pulse-6.0/modules/module-always-sink.a
+lib/pulse-6.0/modules/module-always-sink.so
+lib/pulse-6.0/modules/module-augment-properties.a
+lib/pulse-6.0/modules/module-augment-properties.so
+${PLIST.bonjour}lib/pulse-6.0/modules/module-bonjour-publish.a
+${PLIST.bonjour}lib/pulse-6.0/modules/module-bonjour-publish.so
+lib/pulse-6.0/modules/module-card-restore.a
+lib/pulse-6.0/modules/module-card-restore.so
+lib/pulse-6.0/modules/module-cli-protocol-tcp.a
+lib/pulse-6.0/modules/module-cli-protocol-tcp.so
+lib/pulse-6.0/modules/module-cli-protocol-unix.a
+lib/pulse-6.0/modules/module-cli-protocol-unix.so
+lib/pulse-6.0/modules/module-cli.a
+lib/pulse-6.0/modules/module-cli.so
+lib/pulse-6.0/modules/module-combine-sink.a
+lib/pulse-6.0/modules/module-combine-sink.so
+lib/pulse-6.0/modules/module-combine.a
+lib/pulse-6.0/modules/module-combine.so
+lib/pulse-6.0/modules/module-console-kit.a
+lib/pulse-6.0/modules/module-console-kit.so
+${PLIST.coreaudio}lib/pulse-6.0/modules/module-coreaudio-detect.a
+${PLIST.coreaudio}lib/pulse-6.0/modules/module-coreaudio-detect.so
+${PLIST.coreaudio}lib/pulse-6.0/modules/module-coreaudio-device.a
+${PLIST.coreaudio}lib/pulse-6.0/modules/module-coreaudio-device.so
+lib/pulse-6.0/modules/module-dbus-protocol.a
+lib/pulse-6.0/modules/module-dbus-protocol.so
+lib/pulse-6.0/modules/module-default-device-restore.a
+lib/pulse-6.0/modules/module-default-device-restore.so
+lib/pulse-6.0/modules/module-detect.a
+lib/pulse-6.0/modules/module-detect.so
+lib/pulse-6.0/modules/module-device-manager.a
+lib/pulse-6.0/modules/module-device-manager.so
+lib/pulse-6.0/modules/module-device-restore.a
+lib/pulse-6.0/modules/module-device-restore.so
+lib/pulse-6.0/modules/module-echo-cancel.a
+lib/pulse-6.0/modules/module-echo-cancel.so
+lib/pulse-6.0/modules/module-esound-compat-spawnfd.a
+lib/pulse-6.0/modules/module-esound-compat-spawnfd.so
+lib/pulse-6.0/modules/module-esound-compat-spawnpid.a
+lib/pulse-6.0/modules/module-esound-compat-spawnpid.so
+lib/pulse-6.0/modules/module-esound-protocol-tcp.a
+lib/pulse-6.0/modules/module-esound-protocol-tcp.so
+lib/pulse-6.0/modules/module-esound-protocol-unix.a
+lib/pulse-6.0/modules/module-esound-protocol-unix.so
+lib/pulse-6.0/modules/module-esound-sink.a
+lib/pulse-6.0/modules/module-esound-sink.so
+lib/pulse-6.0/modules/module-filter-apply.a
+lib/pulse-6.0/modules/module-filter-apply.so
+lib/pulse-6.0/modules/module-filter-heuristics.a
+lib/pulse-6.0/modules/module-filter-heuristics.so
+lib/pulse-6.0/modules/module-http-protocol-tcp.a
+lib/pulse-6.0/modules/module-http-protocol-tcp.so
+lib/pulse-6.0/modules/module-http-protocol-unix.a
+lib/pulse-6.0/modules/module-http-protocol-unix.so
+lib/pulse-6.0/modules/module-intended-roles.a
+lib/pulse-6.0/modules/module-intended-roles.so
+lib/pulse-6.0/modules/module-ladspa-sink.a
+lib/pulse-6.0/modules/module-ladspa-sink.so
+lib/pulse-6.0/modules/module-loopback.a
+lib/pulse-6.0/modules/module-loopback.so
+lib/pulse-6.0/modules/module-match.a
+lib/pulse-6.0/modules/module-match.so
+${PLIST.evdev}lib/pulse-6.0/modules/module-mmkbd-evdev.a
+${PLIST.evdev}lib/pulse-6.0/modules/module-mmkbd-evdev.so
+lib/pulse-6.0/modules/module-native-protocol-fd.a
+lib/pulse-6.0/modules/module-native-protocol-fd.so
+lib/pulse-6.0/modules/module-native-protocol-tcp.a
+lib/pulse-6.0/modules/module-native-protocol-tcp.so
+lib/pulse-6.0/modules/module-native-protocol-unix.a
+lib/pulse-6.0/modules/module-native-protocol-unix.so
+lib/pulse-6.0/modules/module-null-sink.a
+lib/pulse-6.0/modules/module-null-sink.so
+lib/pulse-6.0/modules/module-null-source.a
+lib/pulse-6.0/modules/module-null-source.so
+${PLIST.oss}lib/pulse-6.0/modules/module-oss.a
+${PLIST.oss}lib/pulse-6.0/modules/module-oss.so
+lib/pulse-6.0/modules/module-pipe-sink.a
+lib/pulse-6.0/modules/module-pipe-sink.so
+lib/pulse-6.0/modules/module-pipe-source.a
+lib/pulse-6.0/modules/module-pipe-source.so
+lib/pulse-6.0/modules/module-position-event-sounds.a
+lib/pulse-6.0/modules/module-position-event-sounds.so
+${PLIST.avahi}lib/pulse-6.0/modules/module-raop-discover.a
+${PLIST.avahi}lib/pulse-6.0/modules/module-raop-discover.so
+lib/pulse-6.0/modules/module-raop-sink.a
+lib/pulse-6.0/modules/module-raop-sink.so
+lib/pulse-6.0/modules/module-remap-sink.a
+lib/pulse-6.0/modules/module-remap-sink.so
+lib/pulse-6.0/modules/module-remap-source.a
+lib/pulse-6.0/modules/module-remap-source.so
+lib/pulse-6.0/modules/module-rescue-streams.a
+lib/pulse-6.0/modules/module-rescue-streams.so
+lib/pulse-6.0/modules/module-role-cork.a
+lib/pulse-6.0/modules/module-role-cork.so
+lib/pulse-6.0/modules/module-role-ducking.a
+lib/pulse-6.0/modules/module-role-ducking.so
+lib/pulse-6.0/modules/module-rtp-recv.a
+lib/pulse-6.0/modules/module-rtp-recv.so
+lib/pulse-6.0/modules/module-rtp-send.a
+lib/pulse-6.0/modules/module-rtp-send.so
+lib/pulse-6.0/modules/module-rygel-media-server.a
+lib/pulse-6.0/modules/module-rygel-media-server.so
+lib/pulse-6.0/modules/module-simple-protocol-tcp.a
+lib/pulse-6.0/modules/module-simple-protocol-tcp.so
+lib/pulse-6.0/modules/module-simple-protocol-unix.a
+lib/pulse-6.0/modules/module-simple-protocol-unix.so
+lib/pulse-6.0/modules/module-sine-source.a
+lib/pulse-6.0/modules/module-sine-source.so
+lib/pulse-6.0/modules/module-sine.a
+lib/pulse-6.0/modules/module-sine.so
+${PLIST.sun}lib/pulse-6.0/modules/module-solaris.a
+${PLIST.sun}lib/pulse-6.0/modules/module-solaris.so
+lib/pulse-6.0/modules/module-stream-restore.a
+lib/pulse-6.0/modules/module-stream-restore.so
+lib/pulse-6.0/modules/module-suspend-on-idle.a
+lib/pulse-6.0/modules/module-suspend-on-idle.so
+lib/pulse-6.0/modules/module-switch-on-connect.a
+lib/pulse-6.0/modules/module-switch-on-connect.so
+lib/pulse-6.0/modules/module-switch-on-port-available.a
+lib/pulse-6.0/modules/module-switch-on-port-available.so
+lib/pulse-6.0/modules/module-tunnel-sink-new.a
+lib/pulse-6.0/modules/module-tunnel-sink-new.so
+lib/pulse-6.0/modules/module-tunnel-sink.a
+lib/pulse-6.0/modules/module-tunnel-sink.so
+lib/pulse-6.0/modules/module-tunnel-source-new.a
+lib/pulse-6.0/modules/module-tunnel-source-new.so
+lib/pulse-6.0/modules/module-tunnel-source.a
+lib/pulse-6.0/modules/module-tunnel-source.so
+lib/pulse-6.0/modules/module-virtual-sink.a
+lib/pulse-6.0/modules/module-virtual-sink.so
+lib/pulse-6.0/modules/module-virtual-source.a
+lib/pulse-6.0/modules/module-virtual-source.so
+lib/pulse-6.0/modules/module-virtual-surround-sink.a
+lib/pulse-6.0/modules/module-virtual-surround-sink.so
+lib/pulse-6.0/modules/module-volume-restore.a
+lib/pulse-6.0/modules/module-volume-restore.so
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-bell.a
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-bell.so
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-cork-request.a
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-cork-request.so
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-publish.a
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-publish.so
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-xsmp.a
+${PLIST.x11}lib/pulse-6.0/modules/module-x11-xsmp.so
+${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-discover.a
+${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-discover.so
+${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-publish.a
+${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-publish.so
+lib/pulseaudio/libpulsecommon-6.0.la
+${PLIST.oss}lib/pulseaudio/libpulsedsp.la
+man/man1/esdcompat.1
+man/man1/pacat.1
+man/man1/pacmd.1
+man/man1/pactl.1
+man/man1/padsp.1
+man/man1/pamon.1
+man/man1/paplay.1
+man/man1/parec.1
+man/man1/parecord.1
+man/man1/pasuspender.1
+man/man1/pax11publish.1
+man/man1/pulseaudio.1
+man/man1/start-pulseaudio-x11.1
+man/man5/default.pa.5
+man/man5/pulse-cli-syntax.5
+man/man5/pulse-client.conf.5
+man/man5/pulse-daemon.conf.5
+share/bash-completion/completions/pacat
+share/bash-completion/completions/pacmd
+share/bash-completion/completions/pactl
+share/bash-completion/completions/padsp
+share/bash-completion/completions/paplay
+share/bash-completion/completions/parec
+share/bash-completion/completions/parecord
+share/bash-completion/completions/pasuspender
+share/bash-completion/completions/pulseaudio
+share/examples/pulseaudio/client.conf
+share/examples/pulseaudio/daemon.conf
+share/examples/pulseaudio/default.pa
+share/examples/pulseaudio/pulseaudio-system.conf
+${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop
+share/examples/pulseaudio/system.pa
+share/locale/as/LC_MESSAGES/pulseaudio.mo
+share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
+share/locale/ca/LC_MESSAGES/pulseaudio.mo
+share/locale/cs/LC_MESSAGES/pulseaudio.mo
+share/locale/de/LC_MESSAGES/pulseaudio.mo
+share/locale/de_CH/LC_MESSAGES/pulseaudio.mo
+share/locale/el/LC_MESSAGES/pulseaudio.mo
+share/locale/es/LC_MESSAGES/pulseaudio.mo
+share/locale/fi/LC_MESSAGES/pulseaudio.mo
+share/locale/fr/LC_MESSAGES/pulseaudio.mo
+share/locale/gu/LC_MESSAGES/pulseaudio.mo
+share/locale/he/LC_MESSAGES/pulseaudio.mo
+share/locale/hi/LC_MESSAGES/pulseaudio.mo
+share/locale/hu/LC_MESSAGES/pulseaudio.mo
+share/locale/id/LC_MESSAGES/pulseaudio.mo
+share/locale/it/LC_MESSAGES/pulseaudio.mo
+share/locale/ja/LC_MESSAGES/pulseaudio.mo
+share/locale/kn/LC_MESSAGES/pulseaudio.mo
+share/locale/ko/LC_MESSAGES/pulseaudio.mo
+share/locale/ml/LC_MESSAGES/pulseaudio.mo
+share/locale/mr/LC_MESSAGES/pulseaudio.mo
+share/locale/nl/LC_MESSAGES/pulseaudio.mo
+share/locale/oc/LC_MESSAGES/pulseaudio.mo
+share/locale/or/LC_MESSAGES/pulseaudio.mo
+share/locale/pa/LC_MESSAGES/pulseaudio.mo
+share/locale/pl/LC_MESSAGES/pulseaudio.mo
+share/locale/pt/LC_MESSAGES/pulseaudio.mo
+share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
+share/locale/ru/LC_MESSAGES/pulseaudio.mo
+share/locale/sk/LC_MESSAGES/pulseaudio.mo
+share/locale/sr/LC_MESSAGES/pulseaudio.mo
+share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
+share/locale/sv/LC_MESSAGES/pulseaudio.mo
+share/locale/ta/LC_MESSAGES/pulseaudio.mo
+share/locale/te/LC_MESSAGES/pulseaudio.mo
+share/locale/tr/LC_MESSAGES/pulseaudio.mo
+share/locale/uk/LC_MESSAGES/pulseaudio.mo
+share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
+share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
+share/vala/vapi/libpulse-mainloop-glib.deps
+share/vala/vapi/libpulse-mainloop-glib.vapi
+share/vala/vapi/libpulse-simple.deps
+share/vala/vapi/libpulse-simple.vapi
+share/vala/vapi/libpulse.deps
+share/vala/vapi/libpulse.vapi
+share/zsh/site-functions/_pulseaudio
diff --git a/pulseaudio-git/buildlink3.mk b/pulseaudio-git/buildlink3.mk
new file mode 100644
index 0000000..8af578d
--- /dev/null
+++ b/pulseaudio-git/buildlink3.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink3.mk,v 1.24 2015/04/19 06:42:02 wiz Exp $
+
+BUILDLINK_TREE+=	pulseaudio
+
+.if !defined(PULSEAUDIO_BUILDLINK3_MK)
+PULSEAUDIO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.pulseaudio+=	pulseaudio>=6.0
+BUILDLINK_ABI_DEPENDS.pulseaudio+=	pulseaudio>=6.0
+BUILDLINK_PKGSRCDIR.pulseaudio?=	../../audio/pulseaudio
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "NetBSD" || !exists(/usr/include/sys/atomic.h)
+.include "../../devel/libatomic_ops/buildlink3.mk"
+.endif
+
+BUILDLINK_LIBDIRS.pulseaudio+=		lib/pulseaudio
+BUILDLINK_RPATHDIRS.pulseaudio+=	lib/pulseaudio
+
+_WRAP_EXTRA_ARGS.LIBTOOL+=	-L${PREFIX}/lib/pulseaudio
+
+pkgbase:= pulseaudio
+.  include "../../mk/pkg-build-options.mk"
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.pulseaudio:Mx11)
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.endif
+
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.endif # PULSEAUDIO_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-pulseaudio
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
new file mode 100644
index 0000000..f9cfc88
--- /dev/null
+++ b/pulseaudio-git/distinfo
@@ -0,0 +1,22 @@
+$NetBSD: distinfo,v 1.54 2015/11/02 13:40:41 ryoon Exp $
+
+SHA1 (pulseaudio-7.1.tar.gz) = e7b8e2d3e3a384379f3d99458f9ff9cff56b709b
+RMD160 (pulseaudio-7.1.tar.gz) = f6138695f1cfddfcb72654e8b204b0731c8a2234
+SHA512 (pulseaudio-7.1.tar.gz) = c2b8946a4dfb4fa2a8c7a504d9375bd51086c0f2f40aa6ddbb56115815a01665f491507d367baa375bc9595e31bb0d88f15208a1c2ad507bfa40e1bde1213091
+Size (pulseaudio-7.1.tar.gz) = 2686090 bytes
+SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b
+SHA1 (patch-configure.ac) = 10f976daa163b985312d4dc29933e87cf2e89c96
+SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
+SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
+SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
+SHA1 (patch-src_daemon_main.c) = 746d520fce6c076d45a6e36730d5345325f19e03
+SHA1 (patch-src_modules_module-detect.c) = 25c803ee2d5addf9dbf522d81bd422dc201d4550
+SHA1 (patch-src_modules_module-solaris.c) = 03ea8912da4bb76294ca23271e47d40a8c9a61a7
+SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
+SHA1 (patch-src_pulsecore_core-util.c) = 186c805ac4083446afe3ce8db5c6157da92871be
+SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
+SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831
+SHA1 (patch-src_pulsecore_svolume__mmx.c) = c34d153e3bfdb812eb7bd70fa330a9ec674c2dc2
+SHA1 (patch-src_pulsecore_svolume__sse.c) = 47c97c1af947133f2a7b330aed38792bb0e7ef09
+SHA1 (patch-src_tests_mult-s16-test.c) = 3a0fbec804ebefbd88688e84b8d45e0aca597b84
+SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
diff --git a/pulseaudio-git/options.mk b/pulseaudio-git/options.mk
new file mode 100644
index 0000000..17f68f3
--- /dev/null
+++ b/pulseaudio-git/options.mk
@@ -0,0 +1,31 @@
+# $NetBSD: options.mk,v 1.5 2013/01/29 15:35:04 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pulseaudio
+PKG_SUPPORTED_OPTIONS=	avahi x11
+PKG_SUGGESTED_OPTIONS=	avahi x11
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+.include "../../mk/bsd.options.mk"
+
+###
+### avahi
+###
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+PLIST.avahi=		yes
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
+###
+### X11
+###
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+PLIST.x11=		yes
+.else
+CONFIGURE_ARGS+=	--disable-x11
+.endif
diff --git a/pulseaudio-git/patches/CVS/Entries b/pulseaudio-git/patches/CVS/Entries
new file mode 100644
index 0000000..14effd4
--- /dev/null
+++ b/pulseaudio-git/patches/CVS/Entries
@@ -0,0 +1,17 @@
+/patch-aa/1.16/Fri Nov 20 02:00:16 2015//
+/patch-configure.ac/1.5/Fri Nov 20 02:00:16 2015//
+/patch-src_Makefile.am/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_Makefile.in/1.4/Fri Nov 20 02:00:16 2015//
+/patch-src_daemon_caps.c/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_daemon_main.c/1.3/Fri Nov 20 02:00:16 2015//
+/patch-src_modules_module-detect.c/1.2/Fri Nov 20 02:00:16 2015//
+/patch-src_modules_module-solaris.c/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_modules_oss_module-oss.c/1.2/Fri Nov 20 02:00:16 2015//
+/patch-src_pulsecore_core-util.c/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_pulsecore_mix__neon.c/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_pulsecore_sample-util.h/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_pulsecore_svolume__mmx.c/1.4/Fri Nov 20 02:00:16 2015//
+/patch-src_pulsecore_svolume__sse.c/1.4/Fri Nov 20 02:00:16 2015//
+/patch-src_tests_mult-s16-test.c/1.1/Fri Nov 20 02:00:16 2015//
+/patch-src_tests_rtpoll-test.c/1.1/Fri Nov 20 02:00:16 2015//
+D
diff --git a/pulseaudio-git/patches/CVS/Repository b/pulseaudio-git/patches/CVS/Repository
new file mode 100644
index 0000000..22fd5f3
--- /dev/null
+++ b/pulseaudio-git/patches/CVS/Repository
@@ -0,0 +1 @@
+pkgsrc/audio/pulseaudio/patches
diff --git a/pulseaudio-git/patches/CVS/Root b/pulseaudio-git/patches/CVS/Root
new file mode 100644
index 0000000..0646755
--- /dev/null
+++ b/pulseaudio-git/patches/CVS/Root
@@ -0,0 +1 @@
+/public/netbsd-rsync
diff --git a/pulseaudio-git/patches/patch-aa b/pulseaudio-git/patches/patch-aa
new file mode 100644
index 0000000..3b5eeb9
--- /dev/null
+++ b/pulseaudio-git/patches/patch-aa
@@ -0,0 +1,130 @@
+$NetBSD: patch-aa,v 1.16 2014/06/16 13:26:25 jperkin Exp $
+
+ioctl() takes u_long argument on NetBSD.
+On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs.
+stat() system call has been versioned, use latest version when dlopen()ing.
+Try more typical device names.
+SOUND_PCM_* is not available on SunOS.
+
+--- src/utils/padsp.c.orig	2014-01-23 18:57:55.000000000 +0000
++++ src/utils/padsp.c
+@@ -49,6 +49,9 @@
+ #ifdef __linux__
+ #include <linux/sockios.h>
+ #endif
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
+ 
+ #include <pulse/pulseaudio.h>
+ #include <pulse/gccmacro.h>
+@@ -115,7 +118,11 @@ static pthread_mutex_t func_mutex = PTHR
+ 
+ static PA_LLIST_HEAD(fd_info, fd_infos) = NULL;
+ 
++#ifdef __NetBSD__
++static int (*_ioctl)(int, u_long, void *) = NULL;
++#else
+ static int (*_ioctl)(int, int, void*) = NULL;
++#endif
+ static int (*_close)(int) = NULL;
+ static int (*_open)(const char *, int, mode_t) = NULL;
+ static int (*___open_2)(const char *, int) = NULL;
+@@ -143,6 +150,15 @@ static inline fnptr dlsym_fn(void *handl
+     return (fnptr) (long) dlsym(handle, symbol);
+ }
+ 
++#ifdef __NetBSD__
++#define LOAD_IOCTL_FUNC() \
++do { \
++    pthread_mutex_lock(&func_mutex); \
++    if (!_ioctl)  \
++       _ioctl = (int (*)(int, u_long, void*)) dlsym_fn(RTLD_NEXT, "ioctl"); \
++    pthread_mutex_unlock(&func_mutex); \
++} while(0)
++#else
+ #define LOAD_IOCTL_FUNC() \
+ do { \
+     pthread_mutex_lock(&func_mutex); \
+@@ -150,6 +166,7 @@ do { \
+         _ioctl = (int (*)(int, int, void*)) dlsym_fn(RTLD_NEXT, "ioctl"); \
+     pthread_mutex_unlock(&func_mutex); \
+ } while(0)
++#endif
+ 
+ #define LOAD_OPEN_FUNC() \
+ do { \
+@@ -199,11 +216,20 @@ do { \
+     pthread_mutex_unlock(&func_mutex); \
+ } while(0)
+ 
++#ifdef __NetBSD__
++#if (__NetBSD_Version__ < 600000000)
++#define STAT_FUNC "__stat30"
++#else
++#define STAT_FUNC "__stat50"
++#endif
++#else
++#define STAT_FUNC "stat"
++#endif
+ #define LOAD_STAT_FUNC() \
+ do { \
+     pthread_mutex_lock(&func_mutex); \
+     if (!_stat) \
+-        _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, "stat"); \
++        _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, STAT_FUNC); \
+     pthread_mutex_unlock(&func_mutex); \
+ } while(0)
+ 
+@@ -2277,6 +2303,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             break;
+         }
+ 
++#ifndef __sun
+         case SOUND_PCM_READ_RATE:
+             debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
+ 
+@@ -2300,6 +2327,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             *(int*) argp = pa_sample_size(&i->sample_spec)*8;
+             pa_threaded_mainloop_unlock(i->mainloop);
+             break;
++#endif
+ 
+         case SNDCTL_DSP_GETOPTR: {
+             count_info *info;
+@@ -2370,21 +2398,35 @@ fail:
+     return ret;
+ }
+ 
++/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 600000000 ||  \
++    (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) )
++# define OLD_NETBSD_IOCTL_CALL
++#endif
++
+ #ifdef sun
+ int ioctl(int fd, int request, ...) {
++#elif defined(OLD_NETBSD_IOCTL_CALL)
++int ioctl(int fd, u_long request, void *_argp) {
+ #else
+ int ioctl(int fd, unsigned long request, ...) {
+ #endif
+     fd_info *i;
++#if !defined(OLD_NETBSD_IOCTL_CALL)
+     va_list args;
++#endif
+     void *argp;
+     int r, _errno = 0;
+ 
+     debug(DEBUG_LEVEL_VERBOSE, __FILE__": ioctl()\n");
+ 
++#if defined(OLD_NETBSD_IOCTL_CALL)
++    argp = _argp;
++#else
+     va_start(args, request);
+     argp = va_arg(args, void *);
+     va_end(args);
++#endif
+ 
+     if (!function_enter()) {
+         LOAD_IOCTL_FUNC();
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
new file mode 100644
index 0000000..98ff656
--- /dev/null
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -0,0 +1,138 @@
+$NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
+
+* Don't assume sys/capability.h is guaranteed present on Linux.
+* Fix NetBSD detection for libatomics_ops check.
+* Fix unportable test(1) construct.
+* Adapt /var-paths for pkgsrc defaults.
+* Install default config files in example directory; pkgsrc config
+  file framework will install them in the right place.
+* Avoid hardcoded SDK paths on Darwin.
+
+--- configure.ac.orig	2015-02-12 14:10:35.000000000 +0000
++++ configure.ac
+@@ -21,7 +21,7 @@
+ 
+ AC_PREREQ(2.63)
+ 
+-AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
++AC_INIT([pulseaudio],[6.0],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
+ AC_CONFIG_SRCDIR([src/daemon/main.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS([config.h])
+@@ -133,7 +133,6 @@ AC_MSG_CHECKING([host operating system])
+ case "$host_os" in
+     linux*)
+         AC_MSG_RESULT([linux])
+-        host_has_caps=1
+         os_is_linux=1
+     ;;
+     freebsd*)
+@@ -260,6 +259,11 @@ else
+     # HW specific atomic ops stuff
+     AC_MSG_CHECKING([architecture for native atomic operations])
+     case $host in
++	*-netbsd*)
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	    need_libatomic_ops=no
++	;;
+         arm*)
+             AC_MSG_RESULT([arm])
+             AC_MSG_CHECKING([whether we can use Linux kernel helpers])
+@@ -295,10 +299,6 @@ else
+                 ])
+             fi
+         ;;
+-        *-netbsdelf5*)
+-            AC_MSG_RESULT([yes])
+-            need_libatomic_ops=no
+-        ;;
+         *-freebsd*)
+             AC_MSG_RESULT([yes])
+             need_libatomic_ops=no
+@@ -488,14 +488,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye
+ #### Thread support ####
+ 
+ AX_TLS
+-AS_IF([test "$ac_cv_tls" == "__thread"],
++AS_IF([test "$ac_cv_tls" = "__thread"],
+     AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports __thread for Thread-Local Storage]))
+ 
+ # Win32 build breaks with win32 pthread installed
+ AS_IF([test "x$os_is_win32" != "x1"],
+   [AX_PTHREAD])
+ 
+-AS_IF([test "x$ax_pthread_ok" == "xyes"],
++AS_IF([test "x$ax_pthread_ok" = "xyes"],
+     AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
+ 
+ 
+@@ -522,15 +522,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+ if test "x$os_is_darwin" = "x1" ; then
+     AC_MSG_CHECKING([looking for Apple CoreService Framework])
+     # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
+-    AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h],
++    AC_CHECK_HEADER([CoreServices/CoreServices.h],
+         [LIBS="$LIBS -framework CoreServices"],
+-        [AC_CHECK_HEADERS([/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h],
+-            [LIBS="$LIBS -framework CoreServices"],
+-            [AC_MSG_ERROR([CoreServices.h header file not found])]
+-        )]
+-    )
+-
+-    AC_MSG_RESULT([ok])
++        [AC_MSG_ERROR([CoreServices.h header file not found])])
+     AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
+     HAVE_BONJOUR=1
+ fi
+@@ -1001,7 +995,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+ 
+ PA_MACHINE_ID="${sysconfdir}/machine-id"
+ AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
+-PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
++PA_MACHINE_ID_FALLBACK="${localstatedir}/db/dbus/machine-id"
+ AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
+ 	      [Fallback machine-id file])
+ 
+@@ -1309,9 +1303,9 @@ fi
+ 
+ PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
+ AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
+-PA_SYSTEM_CONFIG_PATH="${localstatedir}/lib/pulse"
++PA_SYSTEM_CONFIG_PATH="${localstatedir}/db/pulse"
+ AX_DEFINE_DIR(PA_SYSTEM_CONFIG_PATH, PA_SYSTEM_CONFIG_PATH, [System config dir])
+-PA_SYSTEM_STATE_PATH="${localstatedir}/lib/pulse"
++PA_SYSTEM_STATE_PATH="${localstatedir}/db/pulse"
+ AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
+ 
+ PA_BINARY=${bindir}/pulseaudio${EXEEXT}
+@@ -1323,8 +1317,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+ AC_SUBST(PA_SOEXT, [.so])
+ AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
+ 
+-AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
+-AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
++AC_SUBST(pulseconfdirreal, ["${sysconfdir}/pulse"])
++AC_SUBST(pulseconfdir, ["${EGDIR}"])
++AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdirreal, [Location of configuration files])
+ 
+ #### Mac OSX specific stuff #####
+ 
+@@ -1340,17 +1335,6 @@ AC_ARG_WITH(mac-sysroot,
+     AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]),
+     mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk")
+ 
+-if test "x$os_is_darwin" = "x1" ; then
+-    LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
+-    CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
+-
+-    if test "x$enable_mac_universal" = "xyes" ; then
+-        mac_arches="-arch i386 -arch x86_64"
+-        LDFLAGS="$LDFLAGS $mac_arches"
+-        CFLAGS="$CFLAGS $mac_arches"
+-    fi
+-fi
+-
+ AC_ARG_ENABLE([webrtc-aec],
+     AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller]))
+ 
diff --git a/pulseaudio-git/patches/patch-src_Makefile.am b/pulseaudio-git/patches/patch-src_Makefile.am
new file mode 100644
index 0000000..623edae
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_Makefile.am
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2014/06/09 13:08:19 ryoon Exp $
+
+Install files into pkgsrc example paths; will be correctly
+installed by pkgsrc configuration file framework.
+
+--- src/Makefile.am.orig	2014-02-14 13:45:45.000000000 +0000
++++ src/Makefile.am
+@@ -27,14 +27,14 @@ pulseincludedir=$(includedir)/pulse
+ pulsecoreincludedir=$(includedir)/pulsecore
+ pulselibexecdir=$(libexecdir)/pulse
+ if HAVE_X11
+-xdgautostartdir=$(sysconfdir)/xdg/autostart
++xdgautostartdir= ${EGDIR}
+ endif
+ if HAVE_ALSA
+ alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
+ alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
+ endif
+ if HAVE_DBUS
+-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
++dbuspolicydir=${EGDIR}
+ endif
+ 
+ ###################################
diff --git a/pulseaudio-git/patches/patch-src_Makefile.in b/pulseaudio-git/patches/patch-src_Makefile.in
new file mode 100644
index 0000000..055b696
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_Makefile.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_Makefile.in,v 1.4 2014/08/07 07:43:48 spz Exp $
+
+Use pkgsrc infrastructure for config files.
+
+--- src/Makefile.in.orig	2014-03-03 14:37:00.000000000 +0000
++++ src/Makefile.in
+@@ -3342,7 +3342,7 @@ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-pulseconfdir = @pulseconfdir@
++pulseconfdir = ${EGDIR}
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -3355,10 +3355,10 @@ udevrulesdir = @udevrulesdir@
+ pulseincludedir = $(includedir)/pulse
+ pulsecoreincludedir = $(includedir)/pulsecore
+ pulselibexecdir = $(libexecdir)/pulse
+-@HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart
++@HAVE_X11_TRUE@xdgautostartdir = ${EGDIR}
+ @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
+ @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
+-@HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d
++@HAVE_DBUS_TRUE@dbuspolicydir = ${EGDIR}
+ 
+ ###################################
+ #     Compiler/linker flags       #
diff --git a/pulseaudio-git/patches/patch-src_daemon_caps.c b/pulseaudio-git/patches/patch-src_daemon_caps.c
new file mode 100644
index 0000000..7d6bf73
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_daemon_caps.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_daemon_caps.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
+
+Disable warning about capabilities that only makes sense on Linux.
+
+--- src/daemon/caps.c.orig	2014-01-29 19:48:03.000000000 +0000
++++ src/daemon/caps.c
+@@ -93,8 +93,10 @@ void pa_drop_caps(void) {
+ #error "Don't know how to do capabilities on your system.  Please send a patch."
+ #endif /* __linux__ */
+ #else /* HAVE_SYS_CAPABILITY_H */
++#if 0
+     pa_log_warn("Normally all extra capabilities would be dropped now, but "
+                 "that's impossible because PulseAudio was built without "
+                 "capabilities support.");
+ #endif
++#endif
+ }
diff --git a/pulseaudio-git/patches/patch-src_daemon_main.c b/pulseaudio-git/patches/patch-src_daemon_main.c
new file mode 100644
index 0000000..4299615
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_daemon_main.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_daemon_main.c,v 1.3 2015/09/25 14:37:27 ryoon Exp $
+
+Only display Linux-specific warning on Linux.
+
+--- src/daemon/main.c.orig	2015-09-15 04:46:06.000000000 +0000
++++ src/daemon/main.c
+@@ -997,10 +997,12 @@ int main(int argc, char *argv[]) {
+ 
+     pa_disable_sigpipe();
+ 
++#if defined(__linux__)
+     if (pa_rtclock_hrtimer())
+         pa_log_info("Fresh high-resolution timers available! Bon appetit.");
+     else
+         pa_log_info("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled.");
++#endif
+ 
+     if (conf->lock_memory) {
+ #if defined(HAVE_SYS_MMAN_H) && !defined(__ANDROID__)
diff --git a/pulseaudio-git/patches/patch-src_modules_module-detect.c b/pulseaudio-git/patches/patch-src_modules_module-detect.c
new file mode 100644
index 0000000..bc26eb0
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_modules_module-detect.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_modules_module-detect.c,v 1.2 2014/06/25 15:26:40 ryoon Exp $
+
+Hack to set proper sound device on NetBSD.
+
+--- src/modules/module-detect.c.orig	2014-01-23 18:57:55.000000000 +0000
++++ src/modules/module-detect.c
+@@ -122,6 +122,17 @@ static int detect_oss(pa_core *c, int ju
+     FILE *f;
+     int n = 0, b = 0;
+ 
++#if defined(__NetBSD__)
++/*
++ * Assume primary sound device is used (/dev/audio).
++ * And only primary sound device will be used (n=1).
++ */
++    char args[64];
++    pa_snprintf(args, sizeof(args), "device=/dev/audio");
++    if (!pa_module_load(c, "module-oss", args))
++	exit(1);
++    n = 1;
++#else /* __linux__ or __FreeBSD__ */
+     if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
+         !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
+         !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {
+@@ -173,6 +184,7 @@ static int detect_oss(pa_core *c, int ju
+     }
+ 
+     fclose(f);
++#endif
+     return n;
+ }
+ #endif
diff --git a/pulseaudio-git/patches/patch-src_modules_module-solaris.c b/pulseaudio-git/patches/patch-src_modules_module-solaris.c
new file mode 100644
index 0000000..1fc6541
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_modules_module-solaris.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_modules_module-solaris.c,v 1.1 2015/03/16 14:57:49 jperkin Exp $
+
+Catch up with newer API.
+
+--- src/modules/module-solaris.c.orig	2015-02-12 14:10:35.000000000 +0000
++++ src/modules/module-solaris.c
+@@ -412,10 +412,12 @@ static int sink_process_msg(pa_msgobject
+                         pa_smoother_resume(u->smoother, pa_rtclock_now(), true);
+ 
+                         if (!u->source || u->source_suspended) {
++                            bool mute;
+                             if (unsuspend(u) < 0)
+                                 return -1;
+                             u->sink->get_volume(u->sink);
+-                            u->sink->get_mute(u->sink);
++                            if (u->sink->get_mute(u->sink, &mute) >= 0)
++                                pa_sink_set_mute(u->sink, mute, false);
+                         }
+                         u->sink_suspended = false;
+                     }
+@@ -1033,8 +1035,12 @@ int pa__init(pa_module *m) {
+ 
+         if (sink_new_data.muted_is_set)
+             u->sink->set_mute(u->sink);
+-        else
+-            u->sink->get_mute(u->sink);
++        else {
++            bool mute;
++
++            if (u->sink->get_mute(u->sink, &mute) >= 0)
++                pa_sink_set_mute(u->sink, mute, false);
++        }
+ 
+         pa_sink_put(u->sink);
+     }
diff --git a/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c b/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
new file mode 100644
index 0000000..3647a77
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_modules_oss_module-oss.c,v 1.2 2014/06/25 15:26:40 ryoon Exp $
+
+Set proper sound device default on NetBSD.
+
+--- src/modules/oss/module-oss.c.orig	2014-01-23 18:57:55.000000000 +0000
++++ src/modules/oss/module-oss.c
+@@ -98,7 +98,11 @@ PA_MODULE_USAGE(
+ PA_MODULE_DEPRECATED("Please use module-alsa-card instead of module-oss!");
+ #endif
+ 
++#if defined(__NetBSD__)
++#define DEFAULT_DEVICE "/dev/audio"
++#else /* Linux */
+ #define DEFAULT_DEVICE "/dev/dsp"
++#endif
+ 
+ struct userdata {
+     pa_core *core;
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_core-util.c b/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
new file mode 100644
index 0000000..eb5c0ad
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_pulsecore_core-util.c,v 1.1 2015/09/25 14:37:27 ryoon Exp $
+
+--- src/pulsecore/core-util.c.orig	2015-09-15 04:46:06.000000000 +0000
++++ src/pulsecore/core-util.c
+@@ -54,7 +54,9 @@
+ 
+ #ifdef HAVE_STRTOD_L
+ #include <locale.h>
++#  if !defined(__NetBSD__)
+ #include <xlocale.h>
++#  endif
+ #endif
+ 
+ #ifdef HAVE_SCHED_H
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c b/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
new file mode 100644
index 0000000..6b653a5
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_pulsecore_mix__neon.c,v 1.1 2015/02/28 23:41:58 joerg Exp $
+
+--- src/pulsecore/mix_neon.c.orig	2015-02-25 15:03:12.000000000 +0000
++++ src/pulsecore/mix_neon.c
+@@ -175,6 +175,10 @@ static void pa_mix2_ch4_s16ne_neon(pa_mi
+ 
+     int32x4_t sv0, sv1;
+ 
++#ifdef __clang__
++    sv0 = vld1q_s32(streams[0].linear);
++    sv1 = vld1q_s32(streams[1].linear);
++#else
+     __asm__ __volatile__ (
+         "vld1.s32 %h[sv0], [%[lin0]]         \n\t"
+         "vld1.s32 %h[sv1], [%[lin1]]         \n\t"
+@@ -182,6 +186,7 @@ static void pa_mix2_ch4_s16ne_neon(pa_mi
+         : [lin0] "r" (streams[0].linear), [lin1] "r" (streams[1].linear)
+         : /* clobber list */
+     );
++#endif
+ 
+     length /= sizeof(int16_t);
+     for (; length >= 4; length -= 4) {
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h b/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
new file mode 100644
index 0000000..d529535
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_pulsecore_sample-util.h,v 1.1 2014/06/09 13:08:19 ryoon Exp $
+
+Define glibc-specific (?) __WORDSIZE.
+
+--- src/pulsecore/sample-util.h.orig	2014-01-23 18:57:55.000000000 +0000
++++ src/pulsecore/sample-util.h
+@@ -34,6 +34,14 @@
+ #include <pulsecore/memblock.h>
+ #include <pulsecore/memchunk.h>
+ 
++#if !defined __WORDSIZE
++# if defined __LP64__
++#  define __WORDSIZE     64
++# else
++#  define __WORDSIZE     32
++# endif
++#endif
++
+ typedef struct pa_silence_cache {
+     pa_memblock* blocks[PA_SAMPLE_MAX];
+ } pa_silence_cache;
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c b/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
new file mode 100644
index 0000000..74c5ab5
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.4 2015/02/21 23:13:10 ryoon Exp $
+
+Avoid bad register usage on OSX 32-bit.
+
+--- src/pulsecore/svolume_mmx.c.orig	2015-02-12 14:10:35.000000000 +0000
++++ src/pulsecore/svolume_mmx.c
+@@ -32,7 +32,7 @@
+ 
+ #include "sample-util.h"
+ 
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
+ /* in s: 2 int16_t samples
+  * in v: 2 int32_t volumes, fixed point 16:16
+  * out s: contains scaled and clamped int16_t samples.
+@@ -241,7 +241,7 @@ static void pa_volume_s16re_mmx(int16_t 
+ #endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
+ 
+ void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) {
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
+     if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
+         pa_log_info("Initialising MMX optimized volume functions.");
+ 
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c b/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
new file mode 100644
index 0000000..4495a51
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.4 2015/02/21 23:13:10 ryoon Exp $
+
+Avoid bad register usage on OSX 32-bit.
+
+--- src/pulsecore/svolume_sse.c.orig	2015-02-12 14:10:35.000000000 +0000
++++ src/pulsecore/svolume_sse.c
+@@ -32,7 +32,7 @@
+ 
+ #include "sample-util.h"
+ 
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
+ 
+ #define VOLUME_32x16(s,v)                  /* .. |   vh  |   vl  | */                   \
+       " pxor %%xmm4, %%xmm4          \n\t" /* .. |    0  |    0  | */                   \
+@@ -252,7 +252,7 @@ static void pa_volume_s16re_sse2(int16_t
+ #endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
+ 
+ void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
+     if (flags & PA_CPU_X86_SSE2) {
+         pa_log_info("Initialising SSE2 optimized volume functions.");
+ 
diff --git a/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
new file mode 100644
index 0000000..392cbd8
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_tests_mult-s16-test.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
+
+Define glibc-specific (?) __WORDSIZE.
+
+--- src/tests/mult-s16-test.c.orig	2014-01-23 18:57:55.000000000 +0000
++++ src/tests/mult-s16-test.c
+@@ -30,6 +30,14 @@
+ #include <pulsecore/random.h>
+ #include <pulsecore/macro.h>
+ 
++#if !defined __WORDSIZE
++# if defined __LP64__
++#  define __WORDSIZE     64
++# else
++#  define __WORDSIZE     32
++# endif
++#endif
++
+ #include "runtime-test-util.h"
+ 
+ static inline int32_t pa_mult_s16_volume_32(int16_t v, int32_t cv) {
diff --git a/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c b/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c
new file mode 100644
index 0000000..124e999
--- /dev/null
+++ b/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_tests_rtpoll-test.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
+
+Build fix for systems without real-time signals.
+
+--- src/tests/rtpoll-test.c.orig	2014-01-21 13:39:57.000000000 +0000
++++ src/tests/rtpoll-test.c
+@@ -85,6 +85,7 @@ START_TEST (rtpoll_test) {
+ END_TEST
+ 
+ int main(int argc, char *argv[]) {
++#ifdef SIGRTMIN
+     int failed = 0;
+     Suite *s;
+     TCase *tc;
+@@ -105,4 +106,7 @@ int main(int argc, char *argv[]) {
+     srunner_free(sr);
+ 
+     return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
++#else
++    return 0
++#endif
+ }


Home | Main Index | Thread Index | Old Index