From 7a72bea800f9c903fa9aef47c54f60dbb43179ff Mon Sep 17 00:00:00 2001 From: kwm Date: Sat, 4 Aug 2012 09:39:16 +0000 Subject: Update to 2.0. Add instructions in MC-UPDATING to deal with this. Since a lot of things in GNOME 3 now link with pulse the list gets a bit long. If someone thinks I should maintain a list let me know. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17010 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/pulseaudio/Makefile | 58 +++++++++++++--------------- audio/pulseaudio/distinfo | 4 +- audio/pulseaudio/files/patch-src_Makefile.in | 12 +++--- audio/pulseaudio/pkg-plist | 32 ++++++++++----- 4 files changed, 57 insertions(+), 49 deletions(-) (limited to 'audio/pulseaudio') diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index ac309a161..73a426bfe 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -3,27 +3,26 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/audio/pulseaudio/Makefile,v 1.23 2011/10/22 22:05:06 kwm Exp $ +# $MCom: ports/audio/pulseaudio/Makefile,v 1.24 2011/10/23 11:33:24 kwm Exp $ # # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by -# PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon, -# audio/gstreamer-plugins-pulse and empathy3. +# PORTREVISION bumps of depending ports. # PORTNAME= pulseaudio -PORTVERSION= 1.1 +PORTVERSION= 2.0 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Sound server for UNIX -LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ - speexdsp.1:${PORTSDIR}/audio/speex \ - json.0:${PORTSDIR}/devel/json-c \ - dbus-1.3:${PORTSDIR}/devel/dbus \ +LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ + speexdsp:${PORTSDIR}/audio/speex \ + json:${PORTSDIR}/devel/json-c \ + dbus-1:${PORTSDIR}/devel/dbus \ execinfo:${PORTSDIR}/devel/libexecinfo \ - ck-connector.0:${PORTSDIR}/sysutils/consolekit + ck-connector:${PORTSDIR}/sysutils/consolekit USE_XZ= yes USE_GNOME= gnomehack glib20 intltool ltverhack gnomehier @@ -40,8 +39,8 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ OPENSSL_LIBS="-lcrypto -lssl" \ LIBS="-lm -lintl" \ ac_cv_header_linux_input_h="" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var \ --with-database=simple \ @@ -50,18 +49,13 @@ CONFIGURE_ARGS= --localstatedir=/var \ --disable-gtk2 \ --disable-lirc # untested - #FIXME --with-database=auto|tdb|gdbm|simple USERS= pulse GROUPS= pulse pulse-access pulse-rt -OPTIONS= JACK "JACK audio support" Off \ - AVAHI "Enable Avahi mDNS support" On \ - HAL "Enable HAL support" On \ - GCONF "Enable GConf support" On \ - ALSA "Enable alsa support" Off \ - SIMD "Enable autodetection of SIMD (MMX, SSE2, VMX)" on +OPTIONS_DEFINE= JACK AVAHI HAL GCONF ALSA SIMD +OPTIONS_DEFAULT=AVAHI HAL GCONF SIMD PULSE_VERSION= ${PORTVERSION} PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} @@ -69,35 +63,37 @@ PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} MAN1= esdcompat.1 pacat.1 pacmd.1 pactl.1 padsp.1 \ paplay.1 pasuspender.1 pax11publish.1 pulseaudio.1 \ start-pulseaudio-kde.1 start-pulseaudio-x11.1 -MAN5= default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5 +MAN5= default.pa.5 pulse-cli-syntax.5 pulse-client.conf.5 \ + pulse-daemon.conf.5 .include -.if defined(WITH_JACK) -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +.if ${PORT_OPTIONS:MJACK} +LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack PLIST_SUB+= JACK="" .else PLIST_SUB+= JACK="@comment " CONFIGURE_ARGS+=--disable-jack .endif -.if !defined(WITHOUT_AVAHI) -LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app +.if ${PORT_OPTIONS:MAVAHI} +LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app PLIST_SUB+= AVAHI="" .else CONFIGURE_ARGS+=--disable-avahi PLIST_SUB+= AVAHI="@comment " .endif -.if !defined(WITHOUT_HAL) -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +.if ${PORT_OPTIONS:MHAL} +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal +CONFIGURE_ARGS+=--enable-hal PLIST_SUB+= HAL="" .else CONFIGURE_ARGS+=--disable-hal PLIST_SUB+= HAL="@comment " .endif -.if !defined(WITHOUT_GCONF) +.if ${PORT_OPTIONS:MGCONF} USE_GNOME+= gconf2 PLIST_SUB+= GCONF="" .else @@ -105,23 +101,23 @@ CONFIGURE_ARGS+=--disable-gconf PLIST_SUB+= GCONF="@comment " .endif -.if defined(WITH_ALSA) -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +.if ${PORT_OPTIONS:MALSA} +LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib PLIST_SUB+= ALSA="" .else CONFIGURE_ARGS+=--disable-alsa PLIST_SUB+= ALSA="@comment " .endif -.if defined(WITH_SIMD) -LIB_DEPENDS+= orc-0.4.0:${PORTSDIR}/devel/orc +.if ${PORT_OPTIONS:MSIMD} +LIB_DEPENDS+= orc-0.4:${PORTSDIR}/devel/orc CONFIGURE_ARGS+=--enable-orc .else CONFIGURE_ARGS+=--disable-orc .endif # OSVERSION wasn't bumped after the MFC. So we need to use the next bump. -# Sadly for 7-stable the OSVERSION wasn't bumped after 7.4-R +# Sadly for 7-stable the OSVERSION wasn't bumped after 7.4-R .if ((${OSVERSION} >= 800000) && (${OSVERSION} < 802504)) || \ ((${OSVERSION} >= 900000) && (${OSVERSION} < 900037)) EXTRA_PATCHES+= ${FILESDIR}/extra-src_modules_oss_module-oss.c diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 2fc7e6906..bf8aa995c 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,2 +1,2 @@ -SHA256 (pulseaudio-1.1.tar.xz) = 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee -SIZE (pulseaudio-1.1.tar.xz) = 1306168 +SHA256 (pulseaudio-2.0.tar.xz) = 28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061 +SIZE (pulseaudio-2.0.tar.xz) = 1353708 diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in index da6e03d70..e8503dd85 100644 --- a/audio/pulseaudio/files/patch-src_Makefile.in +++ b/audio/pulseaudio/files/patch-src_Makefile.in @@ -1,13 +1,11 @@ ---- src/Makefile.in.orig 2011-10-23 13:13:30.000000000 +0200 -+++ src/Makefile.in 2011-10-23 13:14:26.000000000 +0200 -@@ -8629,8 +8629,8 @@ +--- src/Makefile.in.orig 2012-06-08 11:09:45.000000000 +0200 ++++ src/Makefile.in 2012-06-08 11:10:00.000000000 +0200 +@@ -8531,7 +8531,7 @@ info-am: install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \ - install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \ -- install-pulseconfDATA install-pulseincludeHEADERS \ + install-dist_alsaprofilesetsDATA \ -+ install-pulseincludeHEADERS \ - install-xdgautostartDATA + install-padsplibLTLIBRARIES install-pulseconfDATA \ + install-pulseincludeHEADERS install-xdgautostartDATA - install-dvi: install-dvi-am diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index 4e26c18f2..b78808fe1 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -10,6 +10,7 @@ bin/parecord bin/pasuspender bin/pax11publish bin/pulseaudio +bin/qpaeq bin/start-pulseaudio-kde bin/start-pulseaudio-x11 etc/dbus-1/system.d/pulseaudio-system.conf @@ -72,14 +73,9 @@ lib/libpulse.a lib/libpulse.la lib/libpulse.so lib/libpulse.so.0 -lib/libpulsecommon-%%PULSE_VERSION%%.a -lib/libpulsecommon-%%PULSE_VERSION%%.la -lib/libpulsecommon-%%PULSE_VERSION%%.so lib/libpulsecore-%%PULSE_VERSION%%.a lib/libpulsecore-%%PULSE_VERSION%%.la lib/libpulsecore-%%PULSE_VERSION%%.so -lib/libpulsedsp.a -lib/libpulsedsp.so %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a @@ -128,8 +124,6 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.a lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so -lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.a -lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.so lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.a lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.so lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.a @@ -140,6 +134,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.a lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.a lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so +lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.a +lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.a lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.a @@ -164,8 +160,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.a lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.a lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so -%%JACK%%lib/pulse-1.1/modules/module-jackdbus-detect.a -%%JACK%%lib/pulse-1.1/modules/module-jackdbus-detect.so +%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jackdbus-detect.a +%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jackdbus-detect.so %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.a %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.a @@ -202,6 +198,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.a lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so +lib/pulse-%%PULSE_VERSION%%/modules/module-role-cork.a +lib/pulse-%%PULSE_VERSION%%/modules/module-role-cork.so lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.a lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.a @@ -222,6 +220,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.a lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.a lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.so +lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.a +lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.so lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.a @@ -230,6 +230,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.a lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.so +lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.a +lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.a lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.a @@ -244,6 +246,12 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.a %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so +lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.a +lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.la +lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.so +lib/pulseaudio/libpulsedsp.a +lib/pulseaudio/libpulsedsp.la +lib/pulseaudio/libpulsedsp.so libdata/pkgconfig/libpulse-mainloop-glib.pc libdata/pkgconfig/libpulse-simple.pc libdata/pkgconfig/libpulse.pc @@ -270,8 +278,13 @@ libdata/pkgconfig/libpulse.pc %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf.common +%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-0.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-1.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-2.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-3.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf +%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/extra-hdmi.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/maudio-fasttrack-pro.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf @@ -325,6 +338,7 @@ share/vala/vapi/libpulse.vapi %%GCONF%%@dirrm libexec/pulse @dirrm lib/pulse-%%PULSE_VERSION%%/modules @dirrm lib/pulse-%%PULSE_VERSION%% +@dirrm lib/pulseaudio @dirrmtry lib/cmake/PulseAudio @dirrmtry lib/cmake @dirrm include/pulse -- cgit v1.2.3