diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/pulseaudio/Makefile | 60 | ||||
| -rw-r--r-- | audio/pulseaudio/files/extra-src_modules_oss_module-oss.c | 11 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | audio/pulseaudio/pkg-plist | 3 |
4 files changed, 15 insertions, 70 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index df4956c8f..e447c948b 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libck-connector.so:${PORTSDIR}/sysutils/consolekit -USE_GNOME= glib20 intltool gnomehier +USE_GNOME= glib20 gnomehier intltool USE_XORG= x11 sm xtst ice USE_LDCONFIG= yes USES= execinfo gettext gmake libtool:keepla pathfix \ @@ -53,61 +53,25 @@ CONFIGURE_ARGS= --localstatedir=/var \ USERS= pulse GROUPS= pulse pulse-access pulse-rt +OPTIONS_SUB= yes OPTIONS_DEFINE= JACK AVAHI GCONF ALSA SIMD OPTIONS_DEFAULT=AVAHI SIMD +JACK_CONFIGURE_ENABLE= jack +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +AVAHI_CONFIGURE_ENABLE= avahi +AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app +GCONF_CONFIGURE_ENABLE= gconf +GCONF_USE= GNOME=gconf2 +ALSA_CONFIGURE_ENABLE= alsa +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +SIMD_CONFIGURE_ENABLE= orc +SIMD_LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc PULSE_VERSION= ${PORTVERSION} PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -PLIST_SUB+= JACK="" -.else -PLIST_SUB+= JACK="@comment " -CONFIGURE_ARGS+=--disable-jack -.endif - -.if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app -PLIST_SUB+= AVAHI="" -.else -CONFIGURE_ARGS+=--disable-avahi -PLIST_SUB+= AVAHI="@comment " -.endif - -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -PLIST_SUB+= GCONF="" -.else -CONFIGURE_ARGS+=--disable-gconf -PLIST_SUB+= GCONF="@comment " -.endif - -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -PLIST_SUB+= ALSA="" -.else -CONFIGURE_ARGS+=--disable-alsa -PLIST_SUB+= ALSA="@comment " -.endif - -.if ${PORT_OPTIONS:MSIMD} -LIB_DEPENDS+= liborc-0.4.so:${PORTSDIR}/devel/orc -CONFIGURE_ARGS+=--enable-orc -.else -CONFIGURE_ARGS+=--disable-orc -.endif - .include <bsd.port.pre.mk> -# OSVERSION wasn't bumped after the MFC. So we need to use the next bump. -.if ((${OSVERSION} >= 800000) && (${OSVERSION} < 802504)) || \ - ((${OSVERSION} >= 900000) && (${OSVERSION} < 900037)) -EXTRA_PATCHES+= ${FILESDIR}/extra-src_modules_oss_module-oss.c -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/daemon/default.pa.in diff --git a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c b/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c deleted file mode 100644 index f16573727..000000000 --- a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/oss/module-oss.c.orig 2010-11-26 01:45:23.000000000 +0100 -+++ src/modules/oss/module-oss.c 2011-03-11 10:14:04.000000000 +0100 -@@ -1164,7 +1164,7 @@ int pa__init(pa_module*m) { - int fd = -1; - int nfrags, orig_frag_size, frag_size; - int mode, caps; -- pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE; -+ pa_bool_t record = TRUE, playback = TRUE, use_mmap = FALSE; - pa_sample_spec ss; - pa_channel_map map; - pa_modargs *ma = NULL; diff --git a/audio/pulseaudio/files/patch-Makefile.in b/audio/pulseaudio/files/patch-Makefile.in deleted file mode 100644 index e48dd503f..000000000 --- a/audio/pulseaudio/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2013-06-24 18:14:39.000000000 +0200 -+++ Makefile.in 2013-06-24 18:15:04.000000000 +0200 -@@ -1061,7 +1061,7 @@ - - info-am: - --install-data-am: install-cmakeDATA install-dist_bashcompletionDATA \ -+install-data-am: install-cmakeDATA \ - install-dist_vapiDATA install-pkgconfigDATA - - install-dvi: install-dvi-recursive diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index bb9fcdd43..3a96fd716 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -13,6 +13,7 @@ bin/pulseaudio bin/qpaeq bin/start-pulseaudio-kde bin/start-pulseaudio-x11 +etc/bash_completion.d/pulseaudio-bash-completion.sh etc/dbus-1/system.d/pulseaudio-system.conf @unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi etc/pulse/client.conf-dist @@ -206,6 +207,7 @@ man/man5/pulse-daemon.conf.5.gz %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-desktop-speaker.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-lineout.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker-always.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf @@ -226,6 +228,7 @@ man/man5/pulse-daemon.conf.5.gz %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-korecontroller.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio10.conf +%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf share/locale/as/LC_MESSAGES/pulseaudio.mo |