diff options
| -rw-r--r-- | audio/pulseaudio/Makefile | 19 | ||||
| -rw-r--r-- | audio/pulseaudio/distinfo | 4 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_shm.c | 19 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_tests_rtpoll-test.c | 18 | ||||
| -rw-r--r-- | audio/pulseaudio/pkg-plist | 14 |
6 files changed, 35 insertions, 50 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 15b21702b..2727931ea 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -6,7 +6,7 @@ # PORTREVISION bumps of depending ports. PORTNAME= pulseaudio -PORTVERSION= 2.0 +PORTVERSION= 4.0 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ @@ -19,6 +19,7 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ speexdsp:${PORTSDIR}/audio/speex \ fftw3:${PORTSDIR}/math/fftw3 \ fftw3f:${PORTSDIR}/math/fftw3-float \ + orc-0.4:${PORTSDIR}/devel/orc \ json.0:${PORTSDIR}/devel/json-c \ dbus-1:${PORTSDIR}/devel/dbus \ execinfo:${PORTSDIR}/devel/libexecinfo \ @@ -46,7 +47,8 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-database=simple \ --without-caps \ --disable-udev \ - --disable-gtk2 \ + --disable-gtk3 \ + --disable-neon-opt \ --disable-lirc # untested #FIXME --with-database=auto|tdb|gdbm|simple @@ -54,8 +56,8 @@ CONFIGURE_ARGS= --localstatedir=/var \ USERS= pulse GROUPS= pulse pulse-access pulse-rt -OPTIONS_DEFINE= JACK AVAHI HAL GCONF ALSA SIMD -OPTIONS_DEFAULT=AVAHI HAL GCONF SIMD +OPTIONS_DEFINE= JACK AVAHI GCONF ALSA SIMD +OPTIONS_DEFAULT=AVAHI GCONF SIMD PULSE_VERSION= ${PORTVERSION} PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} @@ -84,15 +86,6 @@ CONFIGURE_ARGS+=--disable-avahi PLIST_SUB+= AVAHI="@comment " .endif -.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 ${PORT_OPTIONS:MGCONF} USE_GNOME+= gconf2 PLIST_SUB+= GCONF="" diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index bf8aa995c..544066882 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,2 +1,2 @@ -SHA256 (pulseaudio-2.0.tar.xz) = 28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061 -SIZE (pulseaudio-2.0.tar.xz) = 1353708 +SHA256 (pulseaudio-4.0.tar.xz) = 35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae +SIZE (pulseaudio-4.0.tar.xz) = 1392072 diff --git a/audio/pulseaudio/files/patch-Makefile.in b/audio/pulseaudio/files/patch-Makefile.in new file mode 100644 index 000000000..e48dd503f --- /dev/null +++ b/audio/pulseaudio/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- 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/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c index 4dfa3a3a9..85030b5ea 100644 --- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c +++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c @@ -1,20 +1,11 @@ ---- src/pulsecore/shm.c.orig 2009-08-19 10:17:06.000000000 +0800 -+++ src/pulsecore/shm.c 2009-11-11 21:25:03.000000000 +0800 -@@ -91,7 +91,7 @@ - #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker)) +--- src/pulsecore/shm.c.orig 2013-04-14 06:42:35.000000000 +0200 ++++ src/pulsecore/shm.c 2013-06-24 17:25:58.000000000 +0200 +@@ -97,7 +97,7 @@ struct shm_marker { + #ifdef HAVE_SHM_OPEN 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 @@ - 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; - } + #endif diff --git a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c b/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c deleted file mode 100644 index 365ca8d2b..000000000 --- a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tests/rtpoll-test.c.orig 2008-01-03 20:03:03.000000000 -0500 -+++ src/tests/rtpoll-test.c 2008-01-03 20:03:25.000000000 -0500 -@@ -45,6 +45,7 @@ static int worker(pa_rtpoll_item *w) { - } - - int main(int argc, char *argv[]) { -+#ifdef SIGRTMIN - pa_rtpoll *p; - pa_rtpoll_item *i, *w; - struct pollfd *pollfd; -@@ -86,6 +87,7 @@ int main(int argc, char *argv[]) { - pa_rtpoll_item_free(w); - - pa_rtpoll_free(p); -+#endif - - return 0; - } diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index b78808fe1..a99bb44a3 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -152,8 +152,6 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.a lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.a %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so -%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.a -%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.a lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.a @@ -196,10 +194,14 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-remap-source.a +lib/pulse-%%PULSE_VERSION%%/modules/module-remap-source.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-role-ducking.a +lib/pulse-%%PULSE_VERSION%%/modules/module-role-ducking.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 @@ -260,6 +262,9 @@ libdata/pkgconfig/libpulse.pc %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-front-mic.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-headphone-mic.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-headset-mic.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic-always.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf @@ -273,8 +278,8 @@ libdata/pkgconfig/libpulse.pc %%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-lfe-on-mono.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 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf.common @@ -285,6 +290,8 @@ libdata/pkgconfig/libpulse.pc %%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/force-speaker-and-int-mic.conf +%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.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 @@ -307,6 +314,7 @@ 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/id/LC_MESSAGES/pulseaudio.mo share/locale/it/LC_MESSAGES/pulseaudio.mo share/locale/ja/LC_MESSAGES/pulseaudio.mo share/locale/kn/LC_MESSAGES/pulseaudio.mo |