From f2222dbe37eec893988f96096aea399f096e0c2f Mon Sep 17 00:00:00 2001 From: jmcneill Date: Mon, 1 Feb 2010 15:00:20 +0000 Subject: Update pulseaudio to 0.9.21. Too many changes to list here: http://pulseaudio.org/milestone/0.9.15 http://pulseaudio.org/milestone/0.9.16 http://pulseaudio.org/milestone/0.9.17 http://pulseaudio.org/milestone/0.9.18 http://pulseaudio.org/milestone/0.9.19 http://pulseaudio.org/milestone/0.9.20 http://pulseaudio.org/milestone/0.9.21 --- audio/pulseaudio/Makefile | 11 +- audio/pulseaudio/PLIST | 253 ++++++++++++++++++++++++++------------ audio/pulseaudio/distinfo | 35 +++--- audio/pulseaudio/patches/patch-aa | 36 +++--- audio/pulseaudio/patches/patch-ab | 35 +++--- audio/pulseaudio/patches/patch-ac | 42 ++----- audio/pulseaudio/patches/patch-ad | 23 ++-- audio/pulseaudio/patches/patch-ae | 37 ++---- audio/pulseaudio/patches/patch-af | 22 ++-- audio/pulseaudio/patches/patch-ag | 32 +++-- audio/pulseaudio/patches/patch-ca | 6 +- audio/pulseaudio/patches/patch-da | 45 +++++++ audio/pulseaudio/patches/patch-db | 15 +++ audio/pulseaudio/patches/patch-dc | 16 +++ 14 files changed, 374 insertions(+), 234 deletions(-) create mode 100644 audio/pulseaudio/patches/patch-da create mode 100644 audio/pulseaudio/patches/patch-db create mode 100644 audio/pulseaudio/patches/patch-dc (limited to 'audio') diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 64965a3a774..c7a206605d5 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.31 2010/01/24 17:11:19 heinz Exp $ +# $NetBSD: Makefile,v 1.32 2010/02/01 15:00:20 jmcneill Exp $ # NOTE: Please send a copy of any patches that are not pkgsrc-specific # to -DISTNAME= pulseaudio-0.9.14 -PKGREVISION= 7 +PULSEAUDIO_VER= 0.9.21 +DISTNAME= pulseaudio-${PULSEAUDIO_VER} CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ @@ -40,6 +40,8 @@ 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 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONFIGURE_ARGS+= --localstatedir=${VARBASE} @@ -47,6 +49,7 @@ CONFIGURE_ARGS+= --with-system-user=${PULSE_USER} CONFIGURE_ARGS+= --with-system-group=${PULSE_GROUP} CONFIGURE_ARGS+= --with-realtime-group=${PULSE_GROUP_REALTIME} CONFIGURE_ARGS+= --with-access-group=${PULSE_GROUP_ACCESS} +CONFIGURE_ARGS+= --disable-tcpwrap MAKE_ENV+= EGDIR=${EGDIR} SPECIAL_PERMS+= bin/pulseaudio ${SETUID_ROOT_PERMS} @@ -64,6 +67,7 @@ CONFIGURE_ENV+= cc_cv_tls___thread=no .endif PLIST_VARS+= evdev hal oss +PLIST_SUBST+= PULSEAUDIO_VER=${PULSEAUDIO_VER:Q} .if ${OPSYS} == "Darwin" BUILDLINK_TRANSFORM+= rm:-Wl,-version-script=./map-file @@ -108,6 +112,7 @@ pre-configure: .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/liboil/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../security/policykit/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .if ${OPSYS} != "Darwin" diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index b0331257611..90e563ef5c8 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -1,20 +1,24 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:32:20 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2010/02/01 15:00:20 jmcneill Exp $ bin/esdcompat bin/pacat bin/pacmd bin/pactl ${PLIST.oss}bin/padsp +bin/pamon bin/paplay bin/parec +bin/parecord bin/pasuspender bin/pax11publish bin/pulseaudio +bin/start-pulseaudio-kde bin/start-pulseaudio-x11 include/pulse/cdecl.h include/pulse/channelmap.h include/pulse/context.h include/pulse/def.h include/pulse/error.h +include/pulse/ext-device-manager.h include/pulse/ext-stream-restore.h include/pulse/gccmacro.h include/pulse/glib-mainloop.h @@ -25,6 +29,7 @@ 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 @@ -40,81 +45,139 @@ include/pulse/xmalloc.h lib/libpulse-mainloop-glib.la lib/libpulse-simple.la lib/libpulse.la -lib/libpulsecore.la +lib/libpulsecommon-${PULSEAUDIO_VER}.la +lib/libpulsecore-${PULSEAUDIO_VER}.la +lib/libpulsedsp.a lib/libpulsedsp.so lib/pkgconfig/libpulse-mainloop-glib.pc lib/pkgconfig/libpulse-simple.pc lib/pkgconfig/libpulse.pc -lib/pulse-0.9/modules/libauth-cookie.so -lib/pulse-0.9/modules/libauthkey.so -lib/pulse-0.9/modules/libcli.so -lib/pulse-0.9/modules/libdbus-util.so -lib/pulse-0.9/modules/libiochannel.so -lib/pulse-0.9/modules/libioline.so -lib/pulse-0.9/modules/libipacl.so -lib/pulse-0.9/modules/liboss-util.so -lib/pulse-0.9/modules/libpacket.so -lib/pulse-0.9/modules/libparseaddr.so -lib/pulse-0.9/modules/libpdispatch.so -lib/pulse-0.9/modules/libprotocol-cli.so -lib/pulse-0.9/modules/libprotocol-esound.so -lib/pulse-0.9/modules/libprotocol-http.so -lib/pulse-0.9/modules/libprotocol-native.so -lib/pulse-0.9/modules/libprotocol-simple.so -lib/pulse-0.9/modules/libpstream-util.so -lib/pulse-0.9/modules/libpstream.so -lib/pulse-0.9/modules/librtp.so -lib/pulse-0.9/modules/libsocket-client.so -lib/pulse-0.9/modules/libsocket-server.so -lib/pulse-0.9/modules/libsocket-util.so -lib/pulse-0.9/modules/libstrlist.so -lib/pulse-0.9/modules/libtagstruct.so -lib/pulse-0.9/modules/libx11prop.so -lib/pulse-0.9/modules/libx11wrap.so -lib/pulse-0.9/modules/module-always-sink.so -lib/pulse-0.9/modules/module-cli-protocol-tcp.so -lib/pulse-0.9/modules/module-cli-protocol-unix.so -lib/pulse-0.9/modules/module-cli.so -lib/pulse-0.9/modules/module-combine.so -lib/pulse-0.9/modules/module-console-kit.so -lib/pulse-0.9/modules/module-default-device-restore.so -lib/pulse-0.9/modules/module-detect.so -lib/pulse-0.9/modules/module-device-restore.so -lib/pulse-0.9/modules/module-esound-compat-spawnfd.so -lib/pulse-0.9/modules/module-esound-compat-spawnpid.so -lib/pulse-0.9/modules/module-esound-protocol-tcp.so -lib/pulse-0.9/modules/module-esound-protocol-unix.so -lib/pulse-0.9/modules/module-esound-sink.so -lib/pulse-0.9/modules/module-gconf.so -${PLIST.hal}lib/pulse-0.9/modules/module-hal-detect.so -lib/pulse-0.9/modules/module-http-protocol-tcp.so -lib/pulse-0.9/modules/module-http-protocol-unix.so -lib/pulse-0.9/modules/module-ladspa-sink.so -lib/pulse-0.9/modules/module-match.so -${PLIST.evdev}lib/pulse-0.9/modules/module-mmkbd-evdev.so -lib/pulse-0.9/modules/module-native-protocol-fd.so -lib/pulse-0.9/modules/module-native-protocol-tcp.so -lib/pulse-0.9/modules/module-native-protocol-unix.so -lib/pulse-0.9/modules/module-null-sink.so -${PLIST.oss}lib/pulse-0.9/modules/module-oss.so -lib/pulse-0.9/modules/module-pipe-sink.so -lib/pulse-0.9/modules/module-pipe-source.so -lib/pulse-0.9/modules/module-position-event-sounds.so -lib/pulse-0.9/modules/module-remap-sink.so -lib/pulse-0.9/modules/module-rescue-streams.so -lib/pulse-0.9/modules/module-rtp-recv.so -lib/pulse-0.9/modules/module-rtp-send.so -lib/pulse-0.9/modules/module-simple-protocol-tcp.so -lib/pulse-0.9/modules/module-simple-protocol-unix.so -lib/pulse-0.9/modules/module-sine.so -lib/pulse-0.9/modules/module-stream-restore.so -lib/pulse-0.9/modules/module-suspend-on-idle.so -lib/pulse-0.9/modules/module-tunnel-sink.so -lib/pulse-0.9/modules/module-tunnel-source.so -lib/pulse-0.9/modules/module-volume-restore.so -lib/pulse-0.9/modules/module-x11-bell.so -lib/pulse-0.9/modules/module-x11-publish.so -lib/pulse-0.9/modules/module-x11-xsmp.so +lib/pulse-${PULSEAUDIO_VER}/modules/libcli.a +lib/pulse-${PULSEAUDIO_VER}/modules/libcli.so +lib/pulse-${PULSEAUDIO_VER}/modules/liboss-util.a +lib/pulse-${PULSEAUDIO_VER}/modules/liboss-util.so +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-cli.a +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-cli.so +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-esound.a +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-esound.so +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-http.a +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-http.so +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-native.a +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-native.so +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-simple.a +lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-simple.so +lib/pulse-${PULSEAUDIO_VER}/modules/libraop.a +lib/pulse-${PULSEAUDIO_VER}/modules/libraop.so +lib/pulse-${PULSEAUDIO_VER}/modules/librtp.a +lib/pulse-${PULSEAUDIO_VER}/modules/librtp.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-always-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-always-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-augment-properties.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-augment-properties.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-card-restore.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-card-restore.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-cli-protocol-tcp.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-cli-protocol-tcp.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-cli-protocol-unix.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-cli-protocol-unix.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-cli.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-cli.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-combine.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-combine.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-console-kit.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-console-kit.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-cork-music-on-phone.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-cork-music-on-phone.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-default-device-restore.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-default-device-restore.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-detect.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-detect.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-device-manager.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-device-manager.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-device-restore.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-device-restore.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-compat-spawnfd.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-compat-spawnfd.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-compat-spawnpid.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-compat-spawnpid.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-protocol-tcp.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-protocol-tcp.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-protocol-unix.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-protocol-unix.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-esound-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-gconf.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-gconf.so +${PLIST.hal}lib/pulse-${PULSEAUDIO_VER}/modules/module-hal-detect.a +${PLIST.hal}lib/pulse-${PULSEAUDIO_VER}/modules/module-hal-detect.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-http-protocol-tcp.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-http-protocol-tcp.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-http-protocol-unix.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-http-protocol-unix.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-intended-roles.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-intended-roles.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-ladspa-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-ladspa-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-loopback.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-loopback.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-match.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-match.so +${PLIST.evdev}lib/pulse-${PULSEAUDIO_VER}/modules/module-mmkbd-evdev.a +${PLIST.evdev}lib/pulse-${PULSEAUDIO_VER}/modules/module-mmkbd-evdev.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-native-protocol-fd.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-native-protocol-fd.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-native-protocol-tcp.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-native-protocol-tcp.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-native-protocol-unix.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-native-protocol-unix.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-null-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-null-sink.so +${PLIST.oss}lib/pulse-${PULSEAUDIO_VER}/modules/module-oss.a +${PLIST.oss}lib/pulse-${PULSEAUDIO_VER}/modules/module-oss.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-pipe-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-pipe-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-pipe-source.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-pipe-source.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-position-event-sounds.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-position-event-sounds.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-raop-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-raop-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-remap-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-remap-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-rescue-streams.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-rescue-streams.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-recv.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-recv.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-send.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-send.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-rygel-media-server.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-rygel-media-server.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-tcp.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-tcp.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-unix.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-unix.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-sink.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-sink.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-source.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-source.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-volume-restore.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-volume-restore.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-bell.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-bell.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-cork-request.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-cork-request.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-publish.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-publish.so +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-xsmp.a +lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-xsmp.so libexec/pulse/gconf-helper man/man1/esdcompat.1 man/man1/pabrowse.1 @@ -129,20 +192,56 @@ man/man1/pulseaudio.1 man/man5/default.pa.5 man/man5/pulse-client.conf.5 man/man5/pulse-daemon.conf.5 -share/gnome/autostart/pulseaudio.desktop share/examples/pulseaudio/client.conf share/examples/pulseaudio/daemon.conf share/examples/pulseaudio/default.pa +share/examples/pulseaudio/pulseaudio-system.conf share/examples/pulseaudio/system.pa -share/PolicyKit/policy/org.pulseaudio.policy +share/gnome/autostart/pulseaudio-kde.desktop +share/gnome/autostart/pulseaudio.desktop +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/hi/LC_MESSAGES/pulseaudio.mo +share/locale/hu/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/ml/LC_MESSAGES/pulseaudio.mo +share/locale/mr/LC_MESSAGES/pulseaudio.mo +share/locale/nl/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/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/uk/LC_MESSAGES/pulseaudio.mo +share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo +share/vala/vapi/libpulse.vapi ${PLIST.avahi}bin/pabrowse ${PLIST.avahi}include/pulse/browser.h ${PLIST.avahi}lib/libpulse-browse.la ${PLIST.avahi}lib/pkgconfig/libpulse-browse.pc -${PLIST.avahi}lib/pulse-0.9/modules/libavahi-wrap.so -${PLIST.avahi}lib/pulse-0.9/modules/module-zeroconf-discover.so -${PLIST.avahi}lib/pulse-0.9/modules/module-zeroconf-publish.so +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/libavahi-wrap.a +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/libavahi-wrap.so +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/module-raop-discover.a +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/module-raop-discover.so +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/module-zeroconf-discover.a +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/module-zeroconf-discover.so +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/module-zeroconf-publish.a +${PLIST.avahi}lib/pulse-${PULSEAUDIO_VER}/modules/module-zeroconf-publish.so +@pkgdir share/pulseaudio/alsa-mixer/profile-sets +@pkgdir share/pulseaudio/alsa-mixer/paths diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 14eb5ff9a9c..6579d142c1c 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,21 +1,16 @@ -$NetBSD: distinfo,v 1.17 2009/12/27 15:06:28 abs Exp $ +$NetBSD: distinfo,v 1.18 2010/02/01 15:00:20 jmcneill 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 (patch-aa) = 49ef2b68ef5ffd861e1339e792ab43205b7b1ed2 -SHA1 (patch-ab) = 8e6270b50364d7d8010f2c42f8383362b315460c -SHA1 (patch-ac) = 877f1dd615129aa7396fd3dc142474f2795fa802 -SHA1 (patch-ad) = 60caf8bc41504fc035a7264ff3c32a4b19da0645 -SHA1 (patch-ae) = 1cd31d18c133fdd5e8db59be319ba5b7a45fe0fe -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) = 88f500154e8345572ebaf12ee891abe50ef19847 -SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34 -SHA1 (patch-ba) = 6b1ac267a317eed77efc2fbfc2fddebc3a8a69d2 -SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a -SHA1 (patch-ca) = 75eef8955fa368a144b9e55258389332a177ed6c +SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22 +RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed +Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes +SHA1 (patch-aa) = 078dd540b56f2db5d676835ab37cd4e8bbe33650 +SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f +SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0 +SHA1 (patch-ad) = 7340114467bc6d2fedb604e0b01ffbf1d319adc1 +SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30 +SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e +SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a +SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171 +SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20 +SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864 +SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982 diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa index 23f1ad8c002..d63398476da 100644 --- a/audio/pulseaudio/patches/patch-aa +++ b/audio/pulseaudio/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ +$NetBSD: patch-aa,v 1.6 2010/02/01 15:00:20 jmcneill Exp $ ---- src/utils/padsp.c.orig 2009-01-12 18:10:34.000000000 -0500 -+++ src/utils/padsp.c 2009-01-19 08:09:05.000000000 -0500 -@@ -59,6 +59,10 @@ +--- src/utils/padsp.c.orig 2009-09-18 20:21:44.000000000 +0000 ++++ src/utils/padsp.c +@@ -60,6 +60,10 @@ # define SIOCINQ FIONREAD #endif @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ /* make sure gcc doesn't redefine open and friends as macros */ #undef open #undef open64 -@@ -114,7 +118,11 @@ static pthread_mutex_t func_mutex = PTHR +@@ -115,7 +119,11 @@ static pthread_mutex_t func_mutex = PTHR static PA_LLIST_HEAD(fd_info, fd_infos) = NULL; @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ static int (*_close)(int) = NULL; static int (*_open)(const char *, int, mode_t) = NULL; static FILE* (*_fopen)(const char *path, const char *mode) = NULL; -@@ -140,6 +148,15 @@ static inline fnptr dlsym_fn(void *handl +@@ -141,6 +149,15 @@ static inline fnptr dlsym_fn(void *handl return (fnptr) (long) dlsym(handle, symbol); } @@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ #define LOAD_IOCTL_FUNC() \ do { \ pthread_mutex_lock(&func_mutex); \ -@@ -147,6 +164,7 @@ do { \ +@@ -148,6 +165,7 @@ do { \ _ioctl = (int (*)(int, int, void*)) dlsym_fn(RTLD_NEXT, "ioctl"); \ pthread_mutex_unlock(&func_mutex); \ } while(0) @@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ #define LOAD_OPEN_FUNC() \ do { \ -@@ -180,11 +198,16 @@ do { \ +@@ -181,11 +199,16 @@ do { \ pthread_mutex_unlock(&func_mutex); \ } while(0) @@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ pthread_mutex_unlock(&func_mutex); \ } while(0) -@@ -1452,7 +1475,8 @@ static int real_open(const char *filenam +@@ -1458,7 +1481,8 @@ static int real_open(const char *filenam return _open(filename, flags, mode); } @@ -77,7 +77,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ r = dsp_open(flags, &_errno); else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) r = mixer_open(flags, &_errno); -@@ -2313,19 +2337,27 @@ fail: +@@ -2319,19 +2343,27 @@ fail: #ifdef sun int ioctl(int fd, int request, ...) { @@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ if (!function_enter()) { LOAD_IOCTL_FUNC(); -@@ -2384,6 +2416,8 @@ int access(const char *pathname, int mod +@@ -2390,6 +2422,8 @@ int access(const char *pathname, int mod if (!pathname || (strcmp(pathname, "/dev/dsp") != 0 && strcmp(pathname, "/dev/adsp") != 0 && @@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(pathname, "/dev/sndstat") != 0 && strcmp(pathname, "/dev/mixer") != 0 )) { LOAD_ACCESS_FUNC(); -@@ -2412,6 +2446,8 @@ int stat(const char *pathname, struct st +@@ -2418,6 +2452,8 @@ int stat(const char *pathname, struct st if (!pathname || !buf || ( strcmp(pathname, "/dev/dsp") != 0 && @@ -123,7 +123,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(pathname, "/dev/adsp") != 0 && strcmp(pathname, "/dev/sndstat") != 0 && strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2469,6 +2505,8 @@ int stat64(const char *pathname, struct +@@ -2475,6 +2511,8 @@ int stat64(const char *pathname, struct if (!pathname || !buf || ( strcmp(pathname, "/dev/dsp") != 0 && @@ -132,7 +132,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(pathname, "/dev/adsp") != 0 && strcmp(pathname, "/dev/sndstat") != 0 && strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2514,6 +2552,8 @@ int open64(const char *filename, int fla +@@ -2520,6 +2558,8 @@ int open64(const char *filename, int fla if (!filename || ( strcmp(filename, "/dev/dsp") != 0 && @@ -141,7 +141,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(filename, "/dev/adsp") != 0 && strcmp(filename, "/dev/sndstat") != 0 && strcmp(filename, "/dev/mixer") != 0 )) { -@@ -2534,6 +2574,8 @@ int __xstat(int ver, const char *pathnam +@@ -2540,6 +2580,8 @@ int __xstat(int ver, const char *pathnam if (!pathname || !buf || ( strcmp(pathname, "/dev/dsp") != 0 && @@ -150,7 +150,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(pathname, "/dev/adsp") != 0 && strcmp(pathname, "/dev/sndstat") != 0 && strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2557,6 +2599,8 @@ int __xstat64(int ver, const char *pathn +@@ -2563,6 +2605,8 @@ int __xstat64(int ver, const char *pathn if (!pathname || !buf || ( strcmp(pathname, "/dev/dsp") != 0 && @@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(pathname, "/dev/adsp") != 0 && strcmp(pathname, "/dev/sndstat") != 0 && strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2586,6 +2630,8 @@ FILE* fopen(const char *filename, const +@@ -2592,6 +2636,8 @@ FILE* fopen(const char *filename, const if (!filename || !mode || ( strcmp(filename, "/dev/dsp") != 0 && @@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.5 2009/01/19 14:19:00 jmcneill Exp $ strcmp(filename, "/dev/adsp") != 0 && strcmp(filename, "/dev/sndstat") != 0 && strcmp(filename, "/dev/mixer") != 0 )) { -@@ -2629,6 +2675,8 @@ FILE *fopen64(const char *filename, cons +@@ -2635,6 +2681,8 @@ FILE *fopen64(const char *filename, cons if (!filename || !mode || ( strcmp(filename, "/dev/dsp") != 0 && diff --git a/audio/pulseaudio/patches/patch-ab b/audio/pulseaudio/patches/patch-ab index 2ac17dbbf6f..02c1931fe61 100644 --- a/audio/pulseaudio/patches/patch-ab +++ b/audio/pulseaudio/patches/patch-ab @@ -1,23 +1,20 @@ -$NetBSD: patch-ab,v 1.2 2009/07/28 12:52:40 tnn Exp $ +$NetBSD: patch-ab,v 1.3 2010/02/01 15:00:20 jmcneill Exp $ ---- src/daemon/main.c.orig 2009-01-13 00:11:38.000000000 +0100 +--- src/daemon/main.c.orig 2010-02-01 14:15:00.000000000 +0000 +++ 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"); +@@ -640,6 +640,7 @@ int main(int argc, char *argv[]) { + * first take the autospawn lock to make things + * synchronous. */ + ++#if notyet /* XXX broken on NetBSD and FreeBSD */ + if ((autospawn_fd = pa_autospawn_lock_init()) < 0) { + pa_log("Failed to initialize autospawn lock"); + goto finish; +@@ -651,6 +652,7 @@ int main(int argc, char *argv[]) { + } + + autospawn_locked = TRUE; +#endif - #ifdef RLIMIT_LOCKS - set_one_rlimit(&conf->rlimit_locks, RLIMIT_LOCKS, "RLIMIT_LOCKS"); - #endif -@@ -351,7 +353,7 @@ int main(int argc, char *argv[]) { - pa_log_set_maximal_level(PA_LOG_INFO); - pa_log_set_ident("pulseaudio"); + } --#if defined(__linux__) && defined(__OPTIMIZE__) -+#if defined(__linux__) && defined(__OPTIMIZE__) && 0 /* CVE-2009-1894 */ - /* - Disable lazy relocations to make usage of external libraries - more deterministic for our RT threads. We abuse __OPTIMIZE__ as + if (conf->daemonize) { diff --git a/audio/pulseaudio/patches/patch-ac b/audio/pulseaudio/patches/patch-ac index b380c744324..4635529571d 100644 --- a/audio/pulseaudio/patches/patch-ac +++ b/audio/pulseaudio/patches/patch-ac @@ -1,39 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2008/12/24 04:11:17 dsainty Exp $ +$NetBSD: patch-ac,v 1.4 2010/02/01 15:00:20 jmcneill 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; +--- src/daemon/start-pulseaudio-x11.in.orig 2010-02-01 14:16:08.000000000 +0000 ++++ src/daemon/start-pulseaudio-x11.in +@@ -21,7 +21,7 @@ set -e - static void* work(void *p) { -+#if 0 - cpu_set_t mask; - struct sched_param param; + [ -z "$PULSE_SERVER" ] -@@ -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 - } +-@PA_BINARY@ --start "$@" ++@PA_BINARY@ -D "$@" - int main(int argc, char*argv[]) { -- int n; -+ int n, ncpus; + if [ x"$DISPLAY" != x ] ; then - 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); - } diff --git a/audio/pulseaudio/patches/patch-ad b/audio/pulseaudio/patches/patch-ad index 1bc53aa8bf5..a295331c9ab 100644 --- a/audio/pulseaudio/patches/patch-ad +++ b/audio/pulseaudio/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $ +$NetBSD: patch-ad,v 1.4 2010/02/01 15:00:20 jmcneill Exp $ ---- src/Makefile.am.orig 2008-12-20 11:45:28.000000000 -0500 -+++ src/Makefile.am 2008-12-20 11:47:47.000000000 -0500 -@@ -26,9 +26,9 @@ +--- src/Makefile.am.orig 2009-11-23 03:57:04.000000000 +0000 ++++ src/Makefile.am +@@ -26,13 +26,13 @@ pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore @@ -11,10 +11,15 @@ $NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $ pulselibexecdir=$(libexecdir)/pulse -xdgautostartdir=$(sysconfdir)/xdg/autostart +xdgautostartdir=$(PREFIX)/share/gnome/autostart + alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets + alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths + udevrulesdir=/lib/udev/rules.d +-dbuspolicydir=$(sysconfdir)/dbus-1/system.d ++dbuspolicydir=$(EGDIR) ################################### # Defines # -@@ -38,7 +38,7 @@ +@@ -42,7 +42,7 @@ PA_BINARY=$(bindir)/pulseaudio$(EXEEXT) if OS_IS_WIN32 PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT% else @@ -23,12 +28,12 @@ $NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $ endif ################################### -@@ -1396,7 +1396,7 @@ +@@ -1419,7 +1419,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_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 diff --git a/audio/pulseaudio/patches/patch-ae b/audio/pulseaudio/patches/patch-ae index bc75140bc43..e326cb794e4 100644 --- a/audio/pulseaudio/patches/patch-ae +++ b/audio/pulseaudio/patches/patch-ae @@ -1,30 +1,13 @@ -$NetBSD: patch-ae,v 1.1.1.1 2008/12/18 14:42:56 jmcneill Exp $ +$NetBSD: patch-ae,v 1.2 2010/02/01 15:00:20 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 - } +--- src/pulse/context.c.orig 2010-02-01 14:16:41.000000000 +0000 ++++ src/pulse/context.c +@@ -718,7 +718,7 @@ static int context_autospawn(pa_context - int pa_socket_set_rcvbuf(int fd, size_t l) { -+ int bufsz = (int)l; -+ - pa_assert(fd >= 0); + /* Setup argv */ + argv[n++] = c->conf->daemon_binary; +- argv[n++] = "--start"; ++ argv[n++] = "-D"; -- 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; - } + while (n < PA_ELEMENTSOF(argv)-1) { + char *a; diff --git a/audio/pulseaudio/patches/patch-af b/audio/pulseaudio/patches/patch-af index 9de7b4ff145..1fff3b65097 100644 --- a/audio/pulseaudio/patches/patch-af +++ b/audio/pulseaudio/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.1.1.1 2008/12/18 14:42:56 jmcneill Exp $ +$NetBSD: patch-af,v 1.2 2010/02/01 15:00:20 jmcneill Exp $ ---- src/daemon/default.pa.in.orig 2008-12-18 08:30:19.000000000 -0500 -+++ src/daemon/default.pa.in -@@ -87,7 +87,7 @@ load-module module-rescue-streams - load-module module-always-sink +--- src/pulse/util.c.orig 2010-02-01 14:18:18.000000000 +0000 ++++ src/pulse/util.c +@@ -178,7 +178,7 @@ char *pa_get_binary_name(char *s, size_t + } + #endif - ### Automatically suspend sinks/sources that become idle for too long --load-module module-suspend-on-idle -+#load-module module-suspend-on-idle - - ### If autoexit on idle is enabled we want to make sure we only quit - ### when no local session needs us anymore. +-#ifdef __linux__ ++#if defined(__linux__) || defined(__NetBSD__) + { + char *rp; + /* This works on Linux only */ diff --git a/audio/pulseaudio/patches/patch-ag b/audio/pulseaudio/patches/patch-ag index 9c459bd5c30..0f017c4a677 100644 --- a/audio/pulseaudio/patches/patch-ag +++ b/audio/pulseaudio/patches/patch-ag @@ -1,16 +1,22 @@ -$NetBSD: patch-ag,v 1.1 2008/12/23 02:15:27 hasso Exp $ +$NetBSD: patch-ag,v 1.2 2010/02/01 15:00:20 jmcneill 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; +--- src/pulsecore/shm.c.orig 2010-02-01 14:21:15.000000000 +0000 ++++ src/pulsecore/shm.c +@@ -91,7 +91,7 @@ struct shm_marker { + #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker)) - if (!(p = rp = pa_readlink(dev))) { -+#ifdef ENOLINK - if (errno != EINVAL && errno != ENOLINK) { -+#else -+ if (errno != EINVAL) { -+#endif - r = -1; - goto finish; + static char *segment_name(char *fn, size_t l, unsigned id) { +- pa_snprintf(fn, l, "/pulse-shm-%u", id); ++ pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id); + return fn; + } + +@@ -142,7 +142,7 @@ int pa_shm_create_rw(pa_shm *m, size_t s + pa_random(&m->id, sizeof(m->id)); + segment_name(fn, sizeof(fn), m->id); + +- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) { ++ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) { + pa_log("shm_open() failed: %s", pa_cstrerror(errno)); + goto fail; } diff --git a/audio/pulseaudio/patches/patch-ca b/audio/pulseaudio/patches/patch-ca index 486e43d966f..9847af808b4 100644 --- a/audio/pulseaudio/patches/patch-ca +++ b/audio/pulseaudio/patches/patch-ca @@ -1,6 +1,6 @@ -$NetBSD: patch-ca,v 1.1 2009/01/21 15:40:20 drochner Exp $ +$NetBSD: patch-ca,v 1.2 2010/02/01 15:00:20 jmcneill Exp $ ---- src/pulse/utf8.c.orig 2008-09-03 23:13:43.000000000 +0200 +--- src/pulse/utf8.c.orig 2009-09-10 00:04:58.000000000 +0000 +++ src/pulse/utf8.c @@ -55,6 +55,7 @@ @@ -10,7 +10,7 @@ $NetBSD: patch-ca,v 1.1 2009/01/21 15:40:20 drochner Exp $ #endif #include -@@ -243,11 +244,11 @@ static char* iconv_simple(const char *st +@@ -238,11 +239,11 @@ static char* iconv_simple(const char *st } char* pa_utf8_to_locale (const char *str) { diff --git a/audio/pulseaudio/patches/patch-da b/audio/pulseaudio/patches/patch-da new file mode 100644 index 00000000000..1bfda54131c --- /dev/null +++ b/audio/pulseaudio/patches/patch-da @@ -0,0 +1,45 @@ +$NetBSD: patch-da,v 1.1 2010/02/01 15:00:20 jmcneill Exp $ + +--- src/modules/module-cli.c.orig 2009-11-23 03:57:05.000000000 +0000 ++++ src/modules/module-cli.c +@@ -105,6 +105,32 @@ int pa__init(pa_module*m) { + * of log messages, particularly because if stdout and stderr are + * dup'ed they share the same O_NDELAY, too. */ + ++#ifndef O_CLOEXEC ++ if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0) { ++ int flags; ++ if ((flags = fcntl(fd, F_GETFD)) < 0) { ++ pa_log_debug("Couldn't get file handle flags"); ++ close(fd); ++ fd = -1; ++ goto error; ++ } ++ flags |= FD_CLOEXEC; ++ if (fcntl(fd, F_SETFD, flags) < 0) { ++ pa_log_debug("Couldn't set file handle flags"); ++ close(fd); ++ fd = -1; ++ goto error; ++ } ++ io = pa_iochannel_new(m->core->mainloop, fd, fd); ++ pa_log_debug("Managed to open /dev/tty."); ++ } ++error: ++ if (fd < 0) { ++ io = pa_iochannel_new(m->core->mainloop, STDIN_FILENO, STDOUT_FILENO); ++ pa_iochannel_set_noclose(io, TRUE); ++ pa_log_debug("Failed to open /dev/tty, using stdin/stdout fds instead."); ++ } ++#else + if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) { + io = pa_iochannel_new(m->core->mainloop, fd, fd); + pa_log_debug("Managed to open /dev/tty."); +@@ -113,6 +139,7 @@ int pa__init(pa_module*m) { + pa_iochannel_set_noclose(io, TRUE); + pa_log_debug("Failed to open /dev/tty, using stdin/stdout fds instead."); + } ++#endif + + m->userdata = pa_cli_new(m->core, io, m); + pa_cli_set_eof_callback(m->userdata, exit_on_eof ? eof_and_exit_cb : eof_and_unload_cb, m); diff --git a/audio/pulseaudio/patches/patch-db b/audio/pulseaudio/patches/patch-db new file mode 100644 index 00000000000..c65a60f672d --- /dev/null +++ b/audio/pulseaudio/patches/patch-db @@ -0,0 +1,15 @@ +$NetBSD: patch-db,v 1.1 2010/02/01 15:00:20 jmcneill Exp $ + +--- src/daemon/default.pa.in.orig 2009-11-23 03:57:05.000000000 +0000 ++++ src/daemon/default.pa.in +@@ -49,8 +49,8 @@ load-module module-augment-properties + #load-module module-pipe-sink + + ### Automatically load driver modules depending on the hardware available +-.ifexists module-udev-detect@PA_SOEXT@ +-load-module module-udev-detect ++.ifexists module-hal-detect@PA_SOEXT@ ++load-module module-hal-detect + .else + ### Alternatively use the static hardware detection module (for systems that + ### lack udev support) diff --git a/audio/pulseaudio/patches/patch-dc b/audio/pulseaudio/patches/patch-dc new file mode 100644 index 00000000000..a88cc3372a6 --- /dev/null +++ b/audio/pulseaudio/patches/patch-dc @@ -0,0 +1,16 @@ +$NetBSD: patch-dc,v 1.1 2010/02/01 15:00:20 jmcneill Exp $ + +--- src/modules/module-hal-detect.c.orig 2009-09-10 00:04:58.000000000 +0000 ++++ src/modules/module-hal-detect.c +@@ -337,6 +337,11 @@ static int hal_device_load_oss(struct us + + /* We store only one entry per card, hence we look for the originating device */ + originating_udi = libhal_device_get_property_string(u->context, udi, "oss.originating_device", &error); ++ if (dbus_error_is_set(&error) || !originating_udi) { ++ if (dbus_error_is_set(&error)) ++ dbus_error_free(&error); ++ originating_udi = libhal_device_get_property_string(u->context, udi, "sound.originating_device", &error); ++ } + if (dbus_error_is_set(&error) || !originating_udi) + goto fail; + -- cgit v1.2.3