pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/pulseaudio Update to 2.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/9c4cea463964
branches: trunk
changeset: 610680:9c4cea463964
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sat Nov 03 01:54:55 2012 +0000
description:
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:
audio/pulseaudio/Makefile | 129 +--
audio/pulseaudio/PLIST | 330 +++++----
audio/pulseaudio/buildlink3.mk | 20 +-
audio/pulseaudio/distinfo | 34 +-
audio/pulseaudio/options.mk | 21 +-
audio/pulseaudio/patches/patch-aa | 122 +---
audio/pulseaudio/patches/patch-ab | 20 -
audio/pulseaudio/patches/patch-ac | 13 -
audio/pulseaudio/patches/patch-ad | 58 -
audio/pulseaudio/patches/patch-ae | 13 -
audio/pulseaudio/patches/patch-af | 13 -
audio/pulseaudio/patches/patch-ag | 25 -
audio/pulseaudio/patches/patch-ah | 22 -
audio/pulseaudio/patches/patch-ba | 36 -
audio/pulseaudio/patches/patch-bb | 67 --
audio/pulseaudio/patches/patch-ca | 28 -
audio/pulseaudio/patches/patch-configure | 40 +
audio/pulseaudio/patches/patch-da | 47 -
audio/pulseaudio/patches/patch-db | 17 -
audio/pulseaudio/patches/patch-dc | 6 +-
audio/pulseaudio/patches/patch-dd | 85 --
audio/pulseaudio/patches/patch-de | 16 -
audio/pulseaudio/patches/patch-poll_c-build-fix | 23 -
audio/pulseaudio/patches/patch-src_Makefile.in | 13 +
audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c | 34 -
audio/pulseaudio/patches/patch-src_modules_rtp_module-rtp-recv.c | 18 -
audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c | 22 -
audio/pulseaudio/patches/patch-src_pulsecore_macro.h | 15 -
audio/pulseaudio/patches/patch-src_pulsecore_svolume_mmx.c | 24 -
29 files changed, 331 insertions(+), 980 deletions(-)
diffs (truncated from 1659 to 300 lines):
diff -r ab4af9d4bf58 -r 9c4cea463964 audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile Sat Nov 03 01:02:34 2012 +0000
+++ b/audio/pulseaudio/Makefile Sat Nov 03 01:54:55 2012 +0000
@@ -1,36 +1,59 @@
-# $NetBSD: Makefile,v 1.64 2012/10/23 10:28:47 wiz Exp $
-
-# NOTE: Please send a copy of any patches that are not pkgsrc-specific
-# to <pulseaudio-discuss%mail.0pointer.de@localhost>
+# $NetBSD: Makefile,v 1.65 2012/11/03 01:54:55 ryoon Exp $
+#
-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@localhost
-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++
-AUTOCONF_REQD= 2.63
+.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}
-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
+CONFIGURE_ARGS+= --enable-samplerate
+CONFIGURE_ARGS+= --disable-tcpwrap
-PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in
+# Use native atomic ops on NetBSD >= 5.0, otherwise
+# fallback to libatomic_ops
+.if !(${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h))
+.include "../../devel/libatomic_ops/buildlink3.mk"
+.endif
+
+# Build module-mmkbd-evdev.so under Linux
+.if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h)
+PLIST.evdev= yes
+.endif
+
+.include "options.mk"
+
PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in
PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in
PKGCONFIG_OVERRIDE+= libpulse.pc.in
+LIBS.NetBSD+= ${LIBOSSAUDIO}
+
+INSTALLATION_DIRS= share/examples/pulse
+
PULSE_USER?= pulse
PULSE_GROUP?= pulse
PULSE_GROUP_REALTIME?= pulsert
@@ -47,41 +70,9 @@
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/&@'
+PLIST_VARS+= evdev hal oss sun
-.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.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"
+.if ${OPSYS} != "Darwin"
+.include "../../sysutils/consolekit/buildlink3.mk"
.endif
-
-# Build module-mmkbd-evdev.so under Linux
-.if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h)
-PLIST.evdev= yes
-.endif
-
-.include "options.mk"
-
-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 -r ab4af9d4bf58 -r 9c4cea463964 audio/pulseaudio/PLIST
--- a/audio/pulseaudio/PLIST Sat Nov 03 01:02:34 2012 +0000
+++ b/audio/pulseaudio/PLIST Sat Nov 03 01:54:55 2012 +0000
@@ -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/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/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
Home |
Main Index |
Thread Index |
Old Index