diff options
| author | ryoon <ryoon> | 2012-11-03 01:54:55 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2012-11-03 01:54:55 +0000 |
| commit | 753f8f5b94381cd2df4c66c554e9e2d810548f63 (patch) | |
| tree | 3e32991602d9cd02129f8bb05302e75436f3cb98 /audio/pulseaudio | |
| parent | 6a8ece7bd9bd8600f0358991f71d3f22e63be34c (diff) | |
| download | pkgsrc-753f8f5b94381cd2df4c66c554e9e2d810548f63.tar.gz | |
Update to 2.1
* Tested on NetBSD/i386 5.1, /i386 6.0, and /amd64 6.99.13
* Also tested on OpenIndiana/i386 151a7, but my environment lacks audio
device, so I cannot check audio output
* Tested with multimedia/mplayer's -ao pulse option, works fine
* Add gm4 to USE_TOOLS for OpenIndiana build
Changelog:
Many changes. See http://www.freedesktop.org/wiki/Software/PulseAudio .
Diffstat (limited to 'audio/pulseaudio')
29 files changed, 330 insertions, 979 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 6938fe51ad1..38bb80164c0 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,36 +1,59 @@ -# $NetBSD: Makefile,v 1.64 2012/10/23 10:28:47 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2012/11/03 01:54:55 ryoon Exp $ +# -# NOTE: Please send a copy of any patches that are not pkgsrc-specific -# to <pulseaudio-discuss@mail.0pointer.de> - -PULSEAUDIO_VER= 0.9.21 -PKGREVISION= 20 -DISTNAME= pulseaudio-${PULSEAUDIO_VER} +DISTNAME= pulseaudio-2.1 CATEGORIES= audio -MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ +MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.pulseaudio.org/ +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 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \ - autoconf automake autoreconf +USE_TOOLS+= gmake gm4 intltool pkg-config +USE_LANGUAGES= c c++ + +.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+= EGDIR=${EGDIR} +MAKE_ENV+= EGDIR=${EGDIR} + +CONFIGURE_ARGS+= --enable-samplerate +CONFIGURE_ARGS+= --disable-tcpwrap + +# 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 -AUTOCONF_REQD= 2.63 +# Build module-mmkbd-evdev.so under Linux +.if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h) +PLIST.evdev= yes +.endif -REPLACE_SH+= src/daemon/esdcompat.in -REPLACE_SH+= src/daemon/start-pulseaudio-x11.in -REPLACE_SH+= src/daemon/start-pulseaudio-kde.in -REPLACE_SH+= src/utils/padsp +.include "options.mk" -PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in 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 @@ -47,41 +70,9 @@ 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} -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} - -SUBST_CLASSES+= padsp -SUBST_MESSAGE.padsp= Fixing LD_PRELOAD paths -SUBST_STAGE.padsp= post-build -SUBST_FILES.padsp= src/utils/padsp -SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@' - -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" -# broken test for TLS -CONFIGURE_ENV+= cc_cv_tls___thread=no -.endif -# see PR 42820 -.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M4.*} != "" -BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined -.endif - PLIST_VARS+= evdev hal oss sun -PLIST_SUBST+= PULSEAUDIO_VER=${PULSEAUDIO_VER:Q} -.if ${OPSYS} == "Darwin" -BUILDLINK_TRANSFORM+= rm:-Wl,-version-script=./map-file -BUILDLINK_TRANSFORM+= rm:-Wl,-no-undefined -BUILDLINK_TRANSFORM+= rm:-Wl,-z rm:-Wl,nodelete -.elif ${OPSYS} == "SunOS" +.if ${OPSYS} == "SunOS" PLIST.sun= yes . if ${OS_VERSION} == "5.11" PLIST.hal= yes @@ -92,53 +83,25 @@ PLIST.hal= yes PLIST.oss= yes .endif -CFLAGS.SunOS+= -std=c99 - PKG_GROUPS= ${PULSE_GROUP} PKG_GROUPS+= ${PULSE_GROUP_REALTIME} PKG_GROUPS+= ${PULSE_GROUP_ACCESS} PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} -BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections - -# Use native atomic ops on NetBSD >= 5.0, otherwise -# fallback to libatomic_ops -.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h) -CONFIGURE_ARGS+= --enable-netbsd-atomic-ops -.else -CONFIGURE_ARGS+= --disable-netbsd-atomic-ops -.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 +.if ${OPSYS} != "Darwin" +.include "../../sysutils/consolekit/buildlink3.mk" .endif - -.include "options.mk" - -pre-configure: - cd ${WRKSRC} && autoreconf -f ${AUTORECONF_ARGS} - .include "../../audio/libsamplerate/buildlink3.mk" -BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.20 .include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/liboil/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/policykit/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" -.if ${OPSYS} != "Darwin" -.include "../../sysutils/consolekit/buildlink3.mk" -.endif .include "../../sysutils/hal/buildlink3.mk" -.include "../../x11/libICE/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXtst/buildlink3.mk" +.include "../../textproc/json-c/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index 1179e45e2de..b704e4a88c4 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2011/10/12 16:46:15 hans Exp $ +@comment $NetBSD: PLIST,v 1.10 2012/11/03 01:54:55 ryoon Exp $ bin/esdcompat bin/pacat bin/pacmd @@ -9,17 +9,21 @@ bin/paplay bin/parec bin/parecord bin/pasuspender -bin/pax11publish +${PLIST.x11}bin/pax11publish bin/pulseaudio -bin/start-pulseaudio-kde -bin/start-pulseaudio-x11 +${PLIST.x11}bin/start-pulseaudio-kde +${PLIST.x11}bin/start-pulseaudio-x11 +${PLIST.x11}etc/xdg/autostart/pulseaudio-kde.desktop +${PLIST.x11}etc/xdg/autostart/pulseaudio.desktop 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-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 @@ -42,147 +46,174 @@ 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/libpulsecommon-${PULSEAUDIO_VER}.la -lib/libpulsecore-${PULSEAUDIO_VER}.la -${PLIST.oss}lib/libpulsedsp.a -${PLIST.oss}lib/libpulsedsp.so +lib/libpulsecore-${PKGVERSION}.la lib/pkgconfig/libpulse-mainloop-glib.pc lib/pkgconfig/libpulse-simple.pc lib/pkgconfig/libpulse.pc -lib/pulse-${PULSEAUDIO_VER}/modules/libcli.a -lib/pulse-${PULSEAUDIO_VER}/modules/libcli.so -${PLIST.oss}lib/pulse-${PULSEAUDIO_VER}/modules/liboss-util.a -${PLIST.oss}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.avahi}lib/pulse-${PKGVERSION}/modules/libavahi-wrap.a +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/libavahi-wrap.so +lib/pulse-${PKGVERSION}/modules/libcli.a +lib/pulse-${PKGVERSION}/modules/libcli.so +${PLIST.oss}lib/pulse-${PKGVERSION}/modules/liboss-util.a +${PLIST.oss}lib/pulse-${PKGVERSION}/modules/liboss-util.so +lib/pulse-${PKGVERSION}/modules/libprotocol-cli.a +lib/pulse-${PKGVERSION}/modules/libprotocol-cli.so +lib/pulse-${PKGVERSION}/modules/libprotocol-esound.a +lib/pulse-${PKGVERSION}/modules/libprotocol-esound.so +lib/pulse-${PKGVERSION}/modules/libprotocol-http.a +lib/pulse-${PKGVERSION}/modules/libprotocol-http.so +lib/pulse-${PKGVERSION}/modules/libprotocol-native.a +lib/pulse-${PKGVERSION}/modules/libprotocol-native.so +lib/pulse-${PKGVERSION}/modules/libprotocol-simple.a +lib/pulse-${PKGVERSION}/modules/libprotocol-simple.so +lib/pulse-${PKGVERSION}/modules/libraop.a +lib/pulse-${PKGVERSION}/modules/libraop.so +lib/pulse-${PKGVERSION}/modules/librtp.a +lib/pulse-${PKGVERSION}/modules/librtp.so +lib/pulse-${PKGVERSION}/modules/module-always-sink.a +lib/pulse-${PKGVERSION}/modules/module-always-sink.so +lib/pulse-${PKGVERSION}/modules/module-augment-properties.a +lib/pulse-${PKGVERSION}/modules/module-augment-properties.so +lib/pulse-${PKGVERSION}/modules/module-card-restore.a +lib/pulse-${PKGVERSION}/modules/module-card-restore.so +lib/pulse-${PKGVERSION}/modules/module-cli-protocol-tcp.a +lib/pulse-${PKGVERSION}/modules/module-cli-protocol-tcp.so +lib/pulse-${PKGVERSION}/modules/module-cli-protocol-unix.a +lib/pulse-${PKGVERSION}/modules/module-cli-protocol-unix.so +lib/pulse-${PKGVERSION}/modules/module-cli.a +lib/pulse-${PKGVERSION}/modules/module-cli.so +lib/pulse-${PKGVERSION}/modules/module-combine-sink.a +lib/pulse-${PKGVERSION}/modules/module-combine-sink.so +lib/pulse-${PKGVERSION}/modules/module-combine.a +lib/pulse-${PKGVERSION}/modules/module-combine.so +lib/pulse-${PKGVERSION}/modules/module-console-kit.a +lib/pulse-${PKGVERSION}/modules/module-console-kit.so +lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.a +lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.so +lib/pulse-${PKGVERSION}/modules/module-default-device-restore.a +lib/pulse-${PKGVERSION}/modules/module-default-device-restore.so +lib/pulse-${PKGVERSION}/modules/module-detect.a +lib/pulse-${PKGVERSION}/modules/module-detect.so +lib/pulse-${PKGVERSION}/modules/module-device-manager.a +lib/pulse-${PKGVERSION}/modules/module-device-manager.so +lib/pulse-${PKGVERSION}/modules/module-device-restore.a +lib/pulse-${PKGVERSION}/modules/module-device-restore.so +lib/pulse-${PKGVERSION}/modules/module-echo-cancel.a +lib/pulse-${PKGVERSION}/modules/module-echo-cancel.so +lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.a +lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.so +lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.a +lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.so +lib/pulse-${PKGVERSION}/modules/module-esound-protocol-tcp.a +lib/pulse-${PKGVERSION}/modules/module-esound-protocol-tcp.so +lib/pulse-${PKGVERSION}/modules/module-esound-protocol-unix.a +lib/pulse-${PKGVERSION}/modules/module-esound-protocol-unix.so +lib/pulse-${PKGVERSION}/modules/module-esound-sink.a +lib/pulse-${PKGVERSION}/modules/module-esound-sink.so +lib/pulse-${PKGVERSION}/modules/module-filter-apply.a +lib/pulse-${PKGVERSION}/modules/module-filter-apply.so +lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.a +lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.so +${PLIST.hal}lib/pulse-${PKGVERSION}/modules/module-hal-detect.a +${PLIST.hal}lib/pulse-${PKGVERSION}/modules/module-hal-detect.so +lib/pulse-${PKGVERSION}/modules/module-http-protocol-tcp.a +lib/pulse-${PKGVERSION}/modules/module-http-protocol-tcp.so +lib/pulse-${PKGVERSION}/modules/module-http-protocol-unix.a +lib/pulse-${PKGVERSION}/modules/module-http-protocol-unix.so +lib/pulse-${PKGVERSION}/modules/module-intended-roles.a +lib/pulse-${PKGVERSION}/modules/module-intended-roles.so +lib/pulse-${PKGVERSION}/modules/module-ladspa-sink.a +lib/pulse-${PKGVERSION}/modules/module-ladspa-sink.so +lib/pulse-${PKGVERSION}/modules/module-loopback.a +lib/pulse-${PKGVERSION}/modules/module-loopback.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 -${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.a -${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.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 +lib/pulse-${PKGVERSION}/modules/module-match.a +lib/pulse-${PKGVERSION}/modules/module-match.so +lib/pulse-${PKGVERSION}/modules/module-native-protocol-fd.a +lib/pulse-${PKGVERSION}/modules/module-native-protocol-fd.so +lib/pulse-${PKGVERSION}/modules/module-native-protocol-tcp.a +lib/pulse-${PKGVERSION}/modules/module-native-protocol-tcp.so +lib/pulse-${PKGVERSION}/modules/module-native-protocol-unix.a +lib/pulse-${PKGVERSION}/modules/module-native-protocol-unix.so +lib/pulse-${PKGVERSION}/modules/module-null-sink.a +lib/pulse-${PKGVERSION}/modules/module-null-sink.so +lib/pulse-${PKGVERSION}/modules/module-null-source.a +lib/pulse-${PKGVERSION}/modules/module-null-source.so +${PLIST.oss}lib/pulse-${PKGVERSION}/modules/module-oss.a +${PLIST.oss}lib/pulse-${PKGVERSION}/modules/module-oss.so +lib/pulse-${PKGVERSION}/modules/module-pipe-sink.a +lib/pulse-${PKGVERSION}/modules/module-pipe-sink.so +lib/pulse-${PKGVERSION}/modules/module-pipe-source.a +lib/pulse-${PKGVERSION}/modules/module-pipe-source.so +lib/pulse-${PKGVERSION}/modules/module-position-event-sounds.a +lib/pulse-${PKGVERSION}/modules/module-position-event-sounds.so +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-raop-discover.a +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-raop-discover.so +lib/pulse-${PKGVERSION}/modules/module-raop-sink.a +lib/pulse-${PKGVERSION}/modules/module-raop-sink.so +lib/pulse-${PKGVERSION}/modules/module-remap-sink.a +lib/pulse-${PKGVERSION}/modules/module-remap-sink.so +lib/pulse-${PKGVERSION}/modules/module-rescue-streams.a +lib/pulse-${PKGVERSION}/modules/module-rescue-streams.so +lib/pulse-${PKGVERSION}/modules/module-role-cork.a +lib/pulse-${PKGVERSION}/modules/module-role-cork.so +lib/pulse-${PKGVERSION}/modules/module-rtp-recv.a +lib/pulse-${PKGVERSION}/modules/module-rtp-recv.so +lib/pulse-${PKGVERSION}/modules/module-rtp-send.a +lib/pulse-${PKGVERSION}/modules/module-rtp-send.so +lib/pulse-${PKGVERSION}/modules/module-rygel-media-server.a +lib/pulse-${PKGVERSION}/modules/module-rygel-media-server.so +lib/pulse-${PKGVERSION}/modules/module-simple-protocol-tcp.a +lib/pulse-${PKGVERSION}/modules/module-simple-protocol-tcp.so +lib/pulse-${PKGVERSION}/modules/module-simple-protocol-unix.a +lib/pulse-${PKGVERSION}/modules/module-simple-protocol-unix.so +lib/pulse-${PKGVERSION}/modules/module-sine-source.a +lib/pulse-${PKGVERSION}/modules/module-sine-source.so +lib/pulse-${PKGVERSION}/modules/module-sine.a +lib/pulse-${PKGVERSION}/modules/module-sine.so +${PLIST.sun}lib/pulse-${PKGVERSION}/modules/module-solaris.a +${PLIST.sun}lib/pulse-${PKGVERSION}/modules/module-solaris.so +lib/pulse-${PKGVERSION}/modules/module-stream-restore.a +lib/pulse-${PKGVERSION}/modules/module-stream-restore.so +lib/pulse-${PKGVERSION}/modules/module-suspend-on-idle.a +lib/pulse-${PKGVERSION}/modules/module-suspend-on-idle.so +lib/pulse-${PKGVERSION}/modules/module-switch-on-connect.a +lib/pulse-${PKGVERSION}/modules/module-switch-on-connect.so +lib/pulse-${PKGVERSION}/modules/module-switch-on-port-available.a +lib/pulse-${PKGVERSION}/modules/module-switch-on-port-available.so +lib/pulse-${PKGVERSION}/modules/module-tunnel-sink.a +lib/pulse-${PKGVERSION}/modules/module-tunnel-sink.so +lib/pulse-${PKGVERSION}/modules/module-tunnel-source.a +lib/pulse-${PKGVERSION}/modules/module-tunnel-source.so +lib/pulse-${PKGVERSION}/modules/module-virtual-sink.a +lib/pulse-${PKGVERSION}/modules/module-virtual-sink.so +lib/pulse-${PKGVERSION}/modules/module-virtual-source.a +lib/pulse-${PKGVERSION}/modules/module-virtual-source.so +lib/pulse-${PKGVERSION}/modules/module-virtual-surround-sink.a +lib/pulse-${PKGVERSION}/modules/module-virtual-surround-sink.so +lib/pulse-${PKGVERSION}/modules/module-volume-restore.a +lib/pulse-${PKGVERSION}/modules/module-volume-restore.so +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-bell.a +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-bell.so +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-cork-request.a +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-cork-request.so +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-publish.a +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-publish.so +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-xsmp.a +${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-xsmp.so +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-discover.a +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-discover.so +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-publish.a +${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-publish.so +lib/pulseaudio/libpulsecommon-${PKGVERSION}.la +${PLIST.oss}lib/pulseaudio/libpulsedsp.la man/man1/esdcompat.1 -man/man1/pabrowse.1 man/man1/pacat.1 man/man1/pacmd.1 man/man1/pactl.1 @@ -191,7 +222,10 @@ man/man1/paplay.1 man/man1/pasuspender.1 man/man1/pax11publish.1 man/man1/pulseaudio.1 +man/man1/start-pulseaudio-kde.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/examples/pulseaudio/client.conf @@ -199,8 +233,6 @@ share/examples/pulseaudio/daemon.conf share/examples/pulseaudio/default.pa share/examples/pulseaudio/pulseaudio-system.conf share/examples/pulseaudio/system.pa -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 @@ -212,6 +244,7 @@ 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/it/LC_MESSAGES/pulseaudio.mo @@ -225,6 +258,7 @@ 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/sr/LC_MESSAGES/pulseaudio.mo share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo share/locale/sv/LC_MESSAGES/pulseaudio.mo @@ -232,18 +266,10 @@ 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/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.deps 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-${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 +@pkgdir share/examples/pulse +@pkgdir libexec/pulse diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk index 6261cac0bf9..a0a34d9afd6 100644 --- a/audio/pulseaudio/buildlink3.mk +++ b/audio/pulseaudio/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2012/09/15 10:03:43 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2012/11/03 01:54:55 ryoon Exp $ BUILDLINK_TREE+= pulseaudio .if !defined(PULSEAUDIO_BUILDLINK3_MK) PULSEAUDIO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.13 -BUILDLINK_ABI_DEPENDS.pulseaudio+= pulseaudio>=0.9.21nb17 -BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio +BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=2.1 +BUILDLINK_ABI_DEPENDS.pulseaudio+= pulseaudio>=2.1 +BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio2 .include "../../mk/bsd.fast.prefs.mk" @@ -15,14 +15,18 @@ BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio .include "../../devel/libatomic_ops/buildlink3.mk" .endif +pkgbase:= pulseaudio +. include "../../mk/pkg-build-options.mk" + +.include "../../mk/bsd.fast.prefs.mk" + +.if !empty(PKG_BUILD_OPTIONS.pulseaudio:Mx11) +.endif + .include "../../audio/libsndfile/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" -.include "../../x11/libICE/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXtst/buildlink3.mk" .endif # PULSEAUDIO_BUILDLINK3_MK BUILDLINK_TREE+= -pulseaudio diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 848dfde77ea..42bb6b8e353 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,27 +1,9 @@ -$NetBSD: distinfo,v 1.33 2012/05/30 23:47:49 obache Exp $ +$NetBSD: distinfo,v 1.34 2012/11/03 01:54:55 ryoon Exp $ -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) = 201916051465bcb694bc6490dd6d23265ee02241 -SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f -SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0 -SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442 -SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30 -SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e -SHA1 (patch-ag) = 64c93717f864605ba66cc6c4be84a594aeda943c -SHA1 (patch-ah) = b4ce6535ca9dfc695bd04c5fae0a5bc614bec2eb -SHA1 (patch-ba) = 7a57cbd68026c72804bb705d2a23e562c59b86a7 -SHA1 (patch-bb) = e6f4095eb460c605b8dcc02980c5cff0cd0715a8 -SHA1 (patch-ca) = 14ea426afebad99b53e6f8d594ff2f5adac07e30 -SHA1 (patch-da) = 3d63c7a2e76e41b9400869badda0d0e008c4b9bc -SHA1 (patch-db) = 1bd6b5c35a38476de4bfdb606b5ecf8243ddf91f -SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c -SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f -SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8 -SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0 -SHA1 (patch-src_modules_bluetooth_module-bluetooth-device.c) = 2c107e60772d53970365ab60a3d2fc52a6df2034 -SHA1 (patch-src_modules_rtp_module-rtp-recv.c) = 4119c37ac184bc6794304c50fd57e6c8a69fdd31 -SHA1 (patch-src_modules_rtp_rtp.c) = 00973c7a08f1809d35f9b61b569888bbed14ce6b -SHA1 (patch-src_pulsecore_macro.h) = 635629d334529021d0dca2defe9c757c4cd20c5b -SHA1 (patch-src_pulsecore_svolume_mmx.c) = ad1a1be7c1acf52c41447b2fb7d7dcd4c2da204b +SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01 +RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485 +Size (pulseaudio-2.1.tar.xz) = 1355004 bytes +SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7 +SHA1 (patch-configure) = 8f0b923470bd41d0c8495e88b8dfff59628261a1 +SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3 +SHA1 (patch-src_Makefile.in) = 9f1ba78d232cc56c69009245f2eaa6d6c6cf349c diff --git a/audio/pulseaudio/options.mk b/audio/pulseaudio/options.mk index 82e4f4ab29c..c7fe0366ae4 100644 --- a/audio/pulseaudio/options.mk +++ b/audio/pulseaudio/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2011/04/01 15:46:04 ahoka Exp $ +# $NetBSD: options.mk,v 1.4 2012/11/03 01:54:55 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio -PKG_SUPPORTED_OPTIONS= avahi -PKG_SUGGESTED_OPTIONS= avahi +PKG_SUPPORTED_OPTIONS= avahi x11 +PKG_SUGGESTED_OPTIONS= avahi x11 PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} .include "../../mk/bsd.options.mk" @@ -15,3 +15,18 @@ 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/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa index 444b7a751e3..893a061b942 100644 --- a/audio/pulseaudio/patches/patch-aa +++ b/audio/pulseaudio/patches/patch-aa @@ -1,13 +1,12 @@ -$NetBSD: patch-aa,v 1.12 2012/05/30 23:47:49 obache Exp $ +$NetBSD: patch-aa,v 1.13 2012/11/03 01:54:55 ryoon Exp $ -SNDDSP_GETODELAY isn't defined on NetBSD-4.x. 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 2009-09-18 20:21:44.000000000 +0000 +--- src/utils/padsp.c.orig 2012-07-16 11:37:55.000000000 +0000 +++ src/utils/padsp.c @@ -49,6 +49,9 @@ #ifdef __linux__ @@ -19,18 +18,7 @@ SOUND_PCM_* is not available on SunOS. #include <pulse/pulseaudio.h> #include <pulse/gccmacro.h> -@@ -60,6 +63,10 @@ - # define SIOCINQ FIONREAD - #endif - -+#if !defined(SNDCTL_DSP_GETODELAY) -+# define SNDCTL_DSP_GETODELAY _IOR ('P', 23, int) -+#endif -+ - /* make sure gcc doesn't redefine open and friends as macros */ - #undef open - #undef open64 -@@ -115,7 +122,11 @@ static pthread_mutex_t func_mutex = PTHR +@@ -115,7 +118,11 @@ static pthread_mutex_t func_mutex = PTHR static PA_LLIST_HEAD(fd_info, fd_infos) = NULL; @@ -41,8 +29,8 @@ SOUND_PCM_* is not available on SunOS. +#endif static int (*_close)(int) = NULL; static int (*_open)(const char *, int, mode_t) = NULL; - static FILE* (*_fopen)(const char *path, const char *mode) = NULL; -@@ -141,6 +152,15 @@ static inline fnptr dlsym_fn(void *handl + 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); } @@ -51,14 +39,14 @@ SOUND_PCM_* is not available on SunOS. +do { \ + pthread_mutex_lock(&func_mutex); \ + if (!_ioctl) \ -+ _ioctl = (int (*)(int, u_long, void*)) dlsym_fn(RTLD_NEXT, "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); \ -@@ -148,6 +168,7 @@ do { \ +@@ -150,6 +166,7 @@ do { \ _ioctl = (int (*)(int, int, void*)) dlsym_fn(RTLD_NEXT, "ioctl"); \ pthread_mutex_unlock(&func_mutex); \ } while(0) @@ -66,7 +54,7 @@ SOUND_PCM_* is not available on SunOS. #define LOAD_OPEN_FUNC() \ do { \ -@@ -181,11 +202,16 @@ do { \ +@@ -199,11 +216,16 @@ do { \ pthread_mutex_unlock(&func_mutex); \ } while(0) @@ -84,17 +72,7 @@ SOUND_PCM_* is not available on SunOS. pthread_mutex_unlock(&func_mutex); \ } while(0) -@@ -1458,7 +1484,8 @@ static int real_open(const char *filenam - return _open(filename, flags, mode); - } - -- if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0)) -+ if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0 || -+ strcmp(filename, "/dev/sound") == 0 || strcmp(filename, "/dev/audio") == 0)) - r = dsp_open(flags, &_errno); - else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) - r = mixer_open(flags, &_errno); -@@ -2224,6 +2251,7 @@ static int dsp_ioctl(fd_info *i, unsigne +@@ -2264,6 +2286,7 @@ static int dsp_ioctl(fd_info *i, unsigne break; } @@ -102,27 +80,25 @@ SOUND_PCM_* is not available on SunOS. case SOUND_PCM_READ_RATE: debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n"); -@@ -2247,7 +2275,7 @@ static int dsp_ioctl(fd_info *i, unsigne - *(int*) argp = pa_sample_size(&i->sample_spec)*8; +@@ -2288,6 +2311,7 @@ static int dsp_ioctl(fd_info *i, unsigne pa_threaded_mainloop_unlock(i->mainloop); break; -- + +#endif case SNDCTL_DSP_GETOPTR: { count_info *info; -@@ -2317,21 +2345,35 @@ fail: +@@ -2357,21 +2381,35 @@ fail: return ret; } --#ifdef sun +/* 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 + #ifdef sun int ioctl(int fd, int request, ...) { +#elif defined(OLD_NETBSD_IOCTL_CALL) +int ioctl(int fd, u_long request, void *_argp) { @@ -148,75 +124,3 @@ SOUND_PCM_* is not available on SunOS. if (!function_enter()) { LOAD_IOCTL_FUNC(); -@@ -2390,6 +2432,8 @@ int access(const char *pathname, int mod - if (!pathname || - (strcmp(pathname, "/dev/dsp") != 0 && - strcmp(pathname, "/dev/adsp") != 0 && -+ strcmp(pathname, "/dev/sound") != 0 && -+ strcmp(pathname, "/dev/audio") != 0 && - strcmp(pathname, "/dev/sndstat") != 0 && - strcmp(pathname, "/dev/mixer") != 0 )) { - LOAD_ACCESS_FUNC(); -@@ -2418,6 +2462,8 @@ int stat(const char *pathname, struct st - if (!pathname || - !buf || - ( strcmp(pathname, "/dev/dsp") != 0 && -+ strcmp(pathname, "/dev/sound") != 0 && -+ strcmp(pathname, "/dev/audio") != 0 && - strcmp(pathname, "/dev/adsp") != 0 && - strcmp(pathname, "/dev/sndstat") != 0 && - strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2475,6 +2521,8 @@ int stat64(const char *pathname, struct - if (!pathname || - !buf || - ( strcmp(pathname, "/dev/dsp") != 0 && -+ strcmp(pathname, "/dev/sound") != 0 && -+ strcmp(pathname, "/dev/audio") != 0 && - strcmp(pathname, "/dev/adsp") != 0 && - strcmp(pathname, "/dev/sndstat") != 0 && - strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2520,6 +2568,8 @@ int open64(const char *filename, int fla - - if (!filename || - ( strcmp(filename, "/dev/dsp") != 0 && -+ strcmp(filename, "/dev/sound") != 0 && -+ strcmp(filename, "/dev/audio") != 0 && - strcmp(filename, "/dev/adsp") != 0 && - strcmp(filename, "/dev/sndstat") != 0 && - strcmp(filename, "/dev/mixer") != 0 )) { -@@ -2540,6 +2590,8 @@ int __xstat(int ver, const char *pathnam - if (!pathname || - !buf || - ( strcmp(pathname, "/dev/dsp") != 0 && -+ strcmp(pathname, "/dev/sound") != 0 && -+ strcmp(pathname, "/dev/audio") != 0 && - strcmp(pathname, "/dev/adsp") != 0 && - strcmp(pathname, "/dev/sndstat") != 0 && - strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2563,6 +2615,8 @@ int __xstat64(int ver, const char *pathn - if (!pathname || - !buf || - ( strcmp(pathname, "/dev/dsp") != 0 && -+ strcmp(pathname, "/dev/sound") != 0 && -+ strcmp(pathname, "/dev/audio") != 0 && - strcmp(pathname, "/dev/adsp") != 0 && - strcmp(pathname, "/dev/sndstat") != 0 && - strcmp(pathname, "/dev/mixer") != 0 )) { -@@ -2592,6 +2646,8 @@ FILE* fopen(const char *filename, const - if (!filename || - !mode || - ( strcmp(filename, "/dev/dsp") != 0 && -+ strcmp(filename, "/dev/sound") != 0 && -+ strcmp(filename, "/dev/audio") != 0 && - strcmp(filename, "/dev/adsp") != 0 && - strcmp(filename, "/dev/sndstat") != 0 && - strcmp(filename, "/dev/mixer") != 0 )) { -@@ -2635,6 +2691,8 @@ FILE *fopen64(const char *filename, cons - if (!filename || - !mode || - ( strcmp(filename, "/dev/dsp") != 0 && -+ strcmp(filename, "/dev/sound") != 0 && -+ strcmp(filename, "/dev/audio") != 0 && - strcmp(filename, "/dev/adsp") != 0 && - strcmp(filename, "/dev/sndstat") != 0 && - strcmp(filename, "/dev/mixer") != 0 )) { diff --git a/audio/pulseaudio/patches/patch-ab b/audio/pulseaudio/patches/patch-ab deleted file mode 100644 index 02c1931fe61..00000000000 --- a/audio/pulseaudio/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2010/02/01 15:00:20 jmcneill Exp $ - ---- src/daemon/main.c.orig 2010-02-01 14:15:00.000000000 +0000 -+++ src/daemon/main.c -@@ -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 - } - - if (conf->daemonize) { diff --git a/audio/pulseaudio/patches/patch-ac b/audio/pulseaudio/patches/patch-ac deleted file mode 100644 index 4635529571d..00000000000 --- a/audio/pulseaudio/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2010/02/01 15:00:20 jmcneill Exp $ - ---- 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 - - [ -z "$PULSE_SERVER" ] - --@PA_BINARY@ --start "$@" -+@PA_BINARY@ -D "$@" - - if [ x"$DISPLAY" != x ] ; then - diff --git a/audio/pulseaudio/patches/patch-ad b/audio/pulseaudio/patches/patch-ad deleted file mode 100644 index 70d8c07dd1b..00000000000 --- a/audio/pulseaudio/patches/patch-ad +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2011/05/21 15:32:59 wiz Exp $ - -1. chunk: adapt installation paths for pkgsrc; make UDEV optional -2. chunk: adapt installation path for pkgsrc -3. chunk: adapt path for NetBSD -4. chunk: link against libossaudio where it exists (variable supplied -by pkgsrc) - ---- src/Makefile.am.orig 2009-11-22 19:57:04.000000000 -0800 -+++ src/Makefile.am 2010-10-01 10:11:05.000000000 -0700 -@@ -26,13 +26,17 @@ - - pulseincludedir=$(includedir)/pulse - pulsecoreincludedir=$(includedir)/pulsecore --pulseconfdir=$(sysconfdir)/pulse -+pulseconfdir=$(EGDIR) - 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 -+if HAVE_UDEV - udevrulesdir=/lib/udev/rules.d --dbuspolicydir=$(sysconfdir)/dbus-1/system.d -+else -+udevrulesdir= -+endif -+dbuspolicydir=$(EGDIR) - - ################################### - # Defines # -@@ -42,7 +46,7 @@ - if OS_IS_WIN32 - PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT% - else --PA_DEFAULT_CONFIG_DIR=$(pulseconfdir) -+PA_DEFAULT_CONFIG_DIR=$(sysconfdir)/pulse - endif - - ################################### -@@ -83,7 +87,7 @@ - -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \ - -DAO_REQUIRE_CAS \ - -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \ -- -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \ -+ -DPA_MACHINE_ID=\"$(localstatedir)/db/dbus/machine-id\" \ - -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \ - -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" - -@@ -1419,7 +1423,7 @@ - # OSS - - 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-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la - - module_oss_la_SOURCES = modules/oss/module-oss.c diff --git a/audio/pulseaudio/patches/patch-ae b/audio/pulseaudio/patches/patch-ae deleted file mode 100644 index e326cb794e4..00000000000 --- a/audio/pulseaudio/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2010/02/01 15:00:20 jmcneill Exp $ - ---- 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 - - /* Setup argv */ - argv[n++] = c->conf->daemon_binary; -- argv[n++] = "--start"; -+ argv[n++] = "-D"; - - while (n < PA_ELEMENTSOF(argv)-1) { - char *a; diff --git a/audio/pulseaudio/patches/patch-af b/audio/pulseaudio/patches/patch-af deleted file mode 100644 index 1fff3b65097..00000000000 --- a/audio/pulseaudio/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2010/02/01 15:00:20 jmcneill Exp $ - ---- 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 - --#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 deleted file mode 100644 index 5a201aa573e..00000000000 --- a/audio/pulseaudio/patches/patch-ag +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2011/05/21 15:33:00 wiz Exp $ - -shm_open takes a path on NetBSD; pa_shm_create_rw needs write -permissions, so +w the shared memory when creating it. - ---- 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)) - - 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-ah b/audio/pulseaudio/patches/patch-ah deleted file mode 100644 index 7610c632128..00000000000 --- a/audio/pulseaudio/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2011/05/21 15:33:00 wiz Exp $ - -Fix build on NetBSD/arm: -Fix wrong placed #else clause against #if defined(__linux__) in cpu-arm.c. - ---- src/pulsecore/cpu-arm.c.orig 2009-11-23 03:57:07.000000000 +0000 -+++ src/pulsecore/cpu-arm.c 2010-08-07 08:14:36.000000000 +0000 -@@ -129,11 +129,11 @@ - (flags & PA_CPU_ARM_EDSP) ? "EDSP " : "", - (flags & PA_CPU_ARM_NEON) ? "NEON " : "", - (flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : ""); --#else /* defined (__linux__) */ -- pa_log ("ARM cpu features not yet supported on this OS"); --#endif /* defined (__linux__) */ - - if (flags & PA_CPU_ARM_V6) - pa_volume_func_init_arm (flags); -+#else /* defined (__linux__) */ -+ pa_log ("ARM cpu features not yet supported on this OS"); -+#endif /* defined (__linux__) */ - #endif /* defined (__arm__) */ - } diff --git a/audio/pulseaudio/patches/patch-ba b/audio/pulseaudio/patches/patch-ba deleted file mode 100644 index 7adfd1a4354..00000000000 --- a/audio/pulseaudio/patches/patch-ba +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ba,v 1.8 2011/05/21 15:33:00 wiz Exp $ - -1. chunk: -Check NetBSD's native atomic_ops in configure even in arm case. -configure checks $host_cpu first, not $host_os on checks for -native atomic operations. -(In upstream it seems fixed to see $host_os first but - it might still have problem around NetBSD version checks) - -2. chunk: -Fix for security vulnerability reported in CVE-2009-1299, taken from here: - -http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee - ---- configure.ac.orig 2009-11-23 04:06:47.000000000 +0000 -+++ configure.ac 2010-08-07 08:06:57.000000000 +0000 -@@ -220,6 +220,10 @@ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED(ATOMIC_ARM_LINUX_HELPERS, 1, [special arm linux implementation]) - need_libatomic_ops=no -+ elif 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([no]) - AC_CACHE_CHECK([compiler support for arm inline asm atomic operations], -@@ -424,7 +428,7 @@ - AC_FUNC_FORK - AC_FUNC_GETGROUPS - AC_FUNC_SELECT_ARGTYPES --AC_CHECK_FUNCS_ONCE([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \ -+AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod 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 pthread_setaffinity_np]) diff --git a/audio/pulseaudio/patches/patch-bb b/audio/pulseaudio/patches/patch-bb deleted file mode 100644 index 1705ec3c6bc..00000000000 --- a/audio/pulseaudio/patches/patch-bb +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-bb,v 1.5 2010/07/24 12:51:09 tron Exp $ - -Fix for security vulnerability reported in CVE-2009-1299, taken from here: - -http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee - ---- src/pulsecore/core-util.c.orig 2009-11-23 03:57:07.000000000 +0000 -+++ src/pulsecore/core-util.c 2010-07-24 13:33:30.000000000 +0100 -@@ -196,7 +196,7 @@ - /** Creates a directory securely */ - int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) { - struct stat st; -- int r, saved_errno; -+ int r, saved_errno, fd; - - pa_assert(dir); - -@@ -214,16 +214,45 @@ - if (r < 0 && errno != EEXIST) - return -1; - --#ifdef HAVE_CHOWN -+#ifdef HAVE_FSTAT -+ if ((fd = open(dir, -+#ifdef O_CLOEXEC -+ O_CLOEXEC| -+#endif -+#ifdef O_NOCTTY -+ O_NOCTTY| -+#endif -+#ifdef O_NOFOLLOW -+ O_NOFOLLOW| -+#endif -+ O_RDONLY)) < 0) -+ goto fail; -+ -+ if (fstat(fd, &st) < 0) { -+ pa_assert_se(pa_close(fd) >= 0); -+ goto fail; -+ } -+ -+ if (!S_ISDIR(st.st_mode)) { -+ pa_assert_se(pa_close(fd) >= 0); -+ errno = EEXIST; -+ goto fail; -+ } -+ -+#ifdef HAVE_FCHOWN - if (uid == (uid_t)-1) - uid = getuid(); - if (gid == (gid_t)-1) - gid = getgid(); -- (void) chown(dir, uid, gid); -+ (void) fchown(fd, uid, gid); -+#endif -+ -+#ifdef HAVE_FCHMOD -+ (void) fchmod(fd, m); - #endif - --#ifdef HAVE_CHMOD -- chmod(dir, m); -+ pa_assert_se(pa_close(fd) >= 0); -+ - #endif - - #ifdef HAVE_LSTAT diff --git a/audio/pulseaudio/patches/patch-ca b/audio/pulseaudio/patches/patch-ca deleted file mode 100644 index f961bda07d7..00000000000 --- a/audio/pulseaudio/patches/patch-ca +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ca,v 1.3 2011/05/21 15:33:00 wiz Exp $ - -Avoid GNUism in iconv usage. - ---- src/pulse/utf8.c.orig 2009-09-10 00:04:58.000000000 +0000 -+++ src/pulse/utf8.c -@@ -55,6 +55,7 @@ - - #ifdef HAVE_ICONV - #include <iconv.h> -+#include <langinfo.h> - #endif - - #include <pulse/xmalloc.h> -@@ -238,11 +239,11 @@ static char* iconv_simple(const char *st - } - - char* pa_utf8_to_locale (const char *str) { -- return iconv_simple(str, "", "UTF-8"); -+ return iconv_simple(str, nl_langinfo(CODESET), "UTF-8"); - } - - char* pa_locale_to_utf8 (const char *str) { -- return iconv_simple(str, "UTF-8", ""); -+ return iconv_simple(str, "UTF-8", nl_langinfo(CODESET)); - } - - #else diff --git a/audio/pulseaudio/patches/patch-configure b/audio/pulseaudio/patches/patch-configure new file mode 100644 index 00000000000..15bbb81cc86 --- /dev/null +++ b/audio/pulseaudio/patches/patch-configure @@ -0,0 +1,40 @@ +$NetBSD: patch-configure,v 1.1 2012/11/03 01:54:55 ryoon Exp $ + +--- configure.orig 2012-07-19 11:30:11.000000000 +0000 ++++ configure +@@ -8062,7 +8062,7 @@ $as_echo "#define ATOMIC_ARM_INLINE_ASM + fi + fi + ;; +- *-netbsdelf5*) ++ *-netbsd*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + need_libatomic_ops=no +@@ -19748,7 +19748,7 @@ _ACEOF + + fi + +-if test "$ac_cv_tls" == "__thread"; then : ++if test "$ac_cv_tls" = "__thread"; then : + + $as_echo "#define SUPPORT_TLS___THREAD 1" >>confdefs.h + +@@ -20146,7 +20146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi + +-if test "x$ax_pthread_ok" == "xyes"; then : ++if test "x$ax_pthread_ok" = "xyes"; then : + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + +@@ -26138,7 +26138,7 @@ _ACEOF + PA_SOEXT=.so + + +-pulseconfdir="${sysconfdir}/pulse" ++pulseconfdir="${EGDIR}" + + + prefix_NONE= diff --git a/audio/pulseaudio/patches/patch-da b/audio/pulseaudio/patches/patch-da deleted file mode 100644 index bdd294aa58a..00000000000 --- a/audio/pulseaudio/patches/patch-da +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-da,v 1.2 2011/05/21 15:33:00 wiz Exp $ - -O_CLOEXEC is done differently on NetBSD (fcntl + FD_CLOEXEC). - ---- 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 deleted file mode 100644 index 9f2b2238231..00000000000 --- a/audio/pulseaudio/patches/patch-db +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-db,v 1.2 2011/05/21 15:33:00 wiz Exp $ - -Make udev optional. - ---- 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 index 960ca29f640..b46812c01ee 100644 --- a/audio/pulseaudio/patches/patch-dc +++ b/audio/pulseaudio/patches/patch-dc @@ -1,11 +1,11 @@ -$NetBSD: patch-dc,v 1.2 2011/05/21 15:33:00 wiz Exp $ +$NetBSD: patch-dc,v 1.3 2012/11/03 01:54:55 ryoon Exp $ If oss.originating_device hal properly isn't availble, try sound.originating_device. ---- src/modules/module-hal-detect.c.orig 2009-09-10 00:04:58.000000000 +0000 +--- src/modules/module-hal-detect.c.orig 2012-07-19 11:29:39.000000000 +0000 +++ src/modules/module-hal-detect.c -@@ -337,6 +337,11 @@ static int hal_device_load_oss(struct us +@@ -334,6 +334,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); diff --git a/audio/pulseaudio/patches/patch-dd b/audio/pulseaudio/patches/patch-dd deleted file mode 100644 index d6b3cbde930..00000000000 --- a/audio/pulseaudio/patches/patch-dd +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-dd,v 1.2 2011/05/21 15:33:00 wiz Exp $ - -Avoid autoreconf from adding a git dependency. - ---- git-version-gen.orig 2010-02-02 06:54:03.000000000 -0500 -+++ git-version-gen 2010-02-02 06:55:16.000000000 -0500 -@@ -74,76 +74,10 @@ case $# in - esac - - tarball_version_file=$1 --nl=' --' -- --# First see if there is a tarball-only version file. --# then try "git describe", then default. --if test -f $tarball_version_file --then -- v=`cat $tarball_version_file` || exit 1 -- case $v in -- *$nl*) v= ;; # reject multi-line output -- [0-9]*) ;; -- *) v= ;; -- esac -- test -z "$v" \ -- && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 --fi -- --if test -n "$v" --then -- : # use $v --elif test -d .git \ -- && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ -- || git describe --abbrev=4 HEAD 2>/dev/null` \ -- && case $v in -- v[0-9]*) ;; -- *) (exit 1) ;; -- esac --then -- # Is this a new git that lists number of commits since the last -- # tag or the previous older version that did not? -- # Newer: v6.10-77-g0f8faeb -- # Older: v6.10-g0f8faeb --# case $v in --# *-*-*) : git describe is okay three part flavor ;; --# *-*) --# : git describe is older two part flavor --# # Recreate the number of commits and rewrite such that the --# # result is the same as if we were using the newer version --# # of git describe. --# vtag=`echo "$v" | sed 's/-.*//'` --# numcommits=`git rev-list "$vtag"..HEAD | wc -l` --# v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; --# ;; --# esac -- -- # Change the first '-' to a '.', so version-comparing tools work properly. -- # Remove the "g" in git describe's output string, to save a byte. --# v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; -- : --else -- v=UNKNOWN --fi -- --v=`echo "$v" |sed 's/^v//'` -- --# Don't declare a version "dirty" merely because a time stamp has changed. --git status > /dev/null 2>&1 -- --dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= --case "$dirty" in -- '') ;; -- *) # Append the suffix only if there isn't one already. -- case $v in -- *-dirty) ;; -- *) v="$v-dirty" ;; -- esac ;; --esac -+v=`cat ${tarball_version_file}` - - # Omit the trailing newline, so that m4_esyscmd can use the result directly. --echo "$v" | tr -d '\012' -+echo "${v}" | tr -d '\012' - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/audio/pulseaudio/patches/patch-de b/audio/pulseaudio/patches/patch-de deleted file mode 100644 index 0cf8db7d1be..00000000000 --- a/audio/pulseaudio/patches/patch-de +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-de,v 1.1 2011/05/21 15:33:00 wiz Exp $ - -pthread_key_create returns 0 on success; return values on failure are -not defined. - ---- src/pulsecore/thread-posix.c.orig 2010-06-13 14:15:54.000000000 +0000 -+++ src/pulsecore/thread-posix.c -@@ -172,7 +172,7 @@ pa_tls* pa_tls_new(pa_free_cb_t free_cb) - - t = pa_xnew(pa_tls, 1); - -- if (pthread_key_create(&t->key, free_cb) < 0) { -+ if (pthread_key_create(&t->key, free_cb)) { - pa_xfree(t); - return NULL; - } diff --git a/audio/pulseaudio/patches/patch-poll_c-build-fix b/audio/pulseaudio/patches/patch-poll_c-build-fix deleted file mode 100644 index d571c783760..00000000000 --- a/audio/pulseaudio/patches/patch-poll_c-build-fix +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-poll_c-build-fix,v 1.2 2011/05/21 15:33:00 wiz Exp $ - -Fix compilation on platforms without poll(). - ---- src/pulsecore/poll.c.orig 2009-03-05 11:28:10.000000000 +0000 -+++ src/pulsecore/poll.c -@@ -41,11 +41,16 @@ - #include <sys/select.h> - #endif - -+#ifdef HAVE_SYS_SOCKET_H -+#include <sys/socket.h> -+#endif -+ - #include "winsock.h" - - #ifndef HAVE_POLL_H - - #include <pulsecore/core-util.h> -+#include <pulse/util.h> - - #include "poll.h" - diff --git a/audio/pulseaudio/patches/patch-src_Makefile.in b/audio/pulseaudio/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..c0cdc36669f --- /dev/null +++ b/audio/pulseaudio/patches/patch-src_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2012/11/03 01:54:55 ryoon Exp $ + +--- src/Makefile.in.orig 2012-07-19 11:30:13.000000000 +0000 ++++ src/Makefile.in +@@ -2943,7 +2943,7 @@ pulselibexecdir = $(libexecdir)/pulse + @HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart + @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/audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c b/audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c deleted file mode 100644 index 263dbca4ac3..00000000000 --- a/audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-src_modules_bluetooth_module-bluetooth-device.c,v 1.1 2011/10/12 20:12:35 hans Exp $ - ---- src/modules/bluetooth/module-bluetooth-device.c.orig Wed Nov 11 05:11:07 2009 -+++ src/modules/bluetooth/module-bluetooth-device.c Tue Oct 11 19:23:10 2011 -@@ -781,9 +781,11 @@ - pa_make_fd_nonblock(u->stream_fd); - pa_make_socket_low_delay(u->stream_fd); - -+#ifdef SO_TIMESTAMP - one = 1; - if (setsockopt(u->stream_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one)) < 0) - pa_log_warn("Failed to enable SO_TIMESTAMP: %s", pa_cstrerror(errno)); -+#endif - - pa_log_debug("Stream properly set up, we're ready to roll!"); - -@@ -1104,6 +1106,7 @@ - memchunk.length = (size_t) l; - u->read_index += (uint64_t) l; - -+#ifdef SO_TIMESTAMP - for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) - if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) { - struct timeval *tv = (struct timeval*) CMSG_DATA(cm); -@@ -1117,6 +1120,9 @@ - pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); - tstamp = pa_rtclock_now(); - } -+#else -+ tstamp = pa_rtclock_now(); -+#endif - - pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec)); - pa_smoother_resume(u->read_smoother, tstamp, TRUE); diff --git a/audio/pulseaudio/patches/patch-src_modules_rtp_module-rtp-recv.c b/audio/pulseaudio/patches/patch-src_modules_rtp_module-rtp-recv.c deleted file mode 100644 index 4f5e721a324..00000000000 --- a/audio/pulseaudio/patches/patch-src_modules_rtp_module-rtp-recv.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_modules_rtp_module-rtp-recv.c,v 1.1 2011/10/12 20:12:35 hans Exp $ - ---- src/modules/rtp/module-rtp-recv.c.orig Mon Nov 23 04:57:06 2009 -+++ src/modules/rtp/module-rtp-recv.c Tue Oct 11 19:21:12 2011 -@@ -397,11 +397,13 @@ - - pa_make_udp_socket_low_delay(fd); - -+#ifdef SO_TIMESTAMP - one = 1; - if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one)) < 0) { - pa_log("SO_TIMESTAMP failed: %s", pa_cstrerror(errno)); - goto fail; - } -+#endif - - one = 1; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) { diff --git a/audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c b/audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c deleted file mode 100644 index caf868c384f..00000000000 --- a/audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_modules_rtp_rtp.c,v 1.1 2011/10/12 20:12:35 hans Exp $ - ---- ./src/modules/rtp/rtp.c.orig Mon Jun 8 21:21:21 2009 -+++ ./src/modules/rtp/rtp.c Tue Oct 11 19:19:50 2011 -@@ -278,6 +278,7 @@ - pa_memchunk_reset(&c->memchunk); - } - -+#ifdef SO_TIMESTAMP - for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) { - if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) - memcpy(tstamp, CMSG_DATA(cm), sizeof(struct timeval)); -@@ -289,6 +290,9 @@ - pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); - memset(tstamp, 0, sizeof(tstamp)); - } -+#else -+ memset(tstamp, 0, sizeof(tstamp)); -+#endif - - return 0; - diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_macro.h b/audio/pulseaudio/patches/patch-src_pulsecore_macro.h deleted file mode 100644 index 48accc7e83b..00000000000 --- a/audio/pulseaudio/patches/patch-src_pulsecore_macro.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_pulsecore_macro.h,v 1.1 2011/09/14 15:53:35 hans Exp $ - ---- src/pulsecore/macro.h.orig 2009-09-18 22:21:44.000000000 +0200 -+++ src/pulsecore/macro.h 2011-09-08 12:44:25.798236549 +0200 -@@ -37,6 +37,10 @@ - #error "Please include config.h before including this file!" - #endif - -+#ifdef __sun -+#define typeof __typeof__ -+#endif -+ - #ifndef PA_LIKELY - #ifdef __GNUC__ - #define PA_LIKELY(x) (__builtin_expect(!!(x),1)) diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume_mmx.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume_mmx.c deleted file mode 100644 index 0dd65f37d97..00000000000 --- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume_mmx.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_pulsecore_svolume_mmx.c,v 1.1 2011/07/21 15:10:11 joerg Exp $ - -Drop lvalue casts in assembler constraints as clang rejects those. - ---- src/pulsecore/svolume_mmx.c.orig 2011-07-20 12:49:46.000000000 +0000 -+++ src/pulsecore/svolume_mmx.c -@@ -153,7 +153,7 @@ pa_volume_s16ne_mmx (int16_t *samples, i - "6: \n\t" - " emms \n\t" - -- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp) -+ : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) - : "rm" ((pa_reg_x86)channels) - : "cc" - ); -@@ -229,7 +229,7 @@ pa_volume_s16re_mmx (int16_t *samples, i - "6: \n\t" - " emms \n\t" - -- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp) -+ : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) - : "rm" ((pa_reg_x86)channels) - : "cc" - ); |