Revision: 117566 https://trac.macports.org/changeset/117566 Author: devans@macports.org Date: 2014-03-03 14:39:47 -0800 (Mon, 03 Mar 2014) Log Message: ----------- devans/macports/dports: update pulseaudio to version 5.0 for testing. Modified Paths: -------------- users/devans/dports/audio/pulseaudio/Portfile Added Paths: ----------- users/devans/dports/audio/pulseaudio/files/autogen.sh users/devans/dports/audio/pulseaudio/files/patch-man-Makefile.am.diff Removed Paths: ------------- users/devans/dports/audio/pulseaudio/files/patch-no-inline-asm.diff Modified: users/devans/dports/audio/pulseaudio/Portfile =================================================================== --- users/devans/dports/audio/pulseaudio/Portfile 2014-03-03 22:14:59 UTC (rev 117565) +++ users/devans/dports/audio/pulseaudio/Portfile 2014-03-03 22:39:47 UTC (rev 117566) @@ -7,7 +7,7 @@ PortSystem 1.0 name pulseaudio -version 4.99.3 +version 5.0 license LGPL-2.1 categories audio maintainers devans openmaintainer @@ -27,11 +27,15 @@ use_xz yes -checksums rmd160 f22529a4e23366d7231f17f5805abf54b337f1df \ - sha256 f2171578a7445212c41f3eec5a9a42a8a3ca33d149cff13f4e5ed3be40de19e4 +checksums rmd160 4ba13e92c58f8ada4542d521131094a55e3b6991 \ + sha256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 depends_build port:pkgconfig \ - port:intltool + port:intltool \ + port:autoconf \ + port:automake \ + port:libtool \ + port:p5.16-xml-parser depends_lib port:libiconv \ port:json-c \ @@ -57,9 +61,17 @@ } } -# https://bugs.freedesktop.org/show_bug.cgi?id=55733 and <rdar://problem/14653996> -patchfiles patch-no-inline-asm.diff +patchfiles patch-man-Makefile.am.diff +# reconfigure with our intltool.m4 using upstream autogen.sh + +post-patch { + xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} + reinplace "s|@@MP_PERL@@|${prefix}/bin/perl5.16|" ${worksrcpath}/man/Makefile.am +} + +configure.cmd ./autogen.sh + configure.args --with-mac-sysroot=/ \ --with-mac-version-min=$macosx_deployment_target \ --without-caps \ Added: users/devans/dports/audio/pulseaudio/files/autogen.sh =================================================================== --- users/devans/dports/audio/pulseaudio/files/autogen.sh (rev 0) +++ users/devans/dports/audio/pulseaudio/files/autogen.sh 2014-03-03 22:39:47 UTC (rev 117566) @@ -0,0 +1,23 @@ +#!/bin/sh + +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +# Only there to make jhbuild happy + +NOCONFIGURE=1 ./bootstrap.sh + +exec ./configure "$@" Added: users/devans/dports/audio/pulseaudio/files/patch-man-Makefile.am.diff =================================================================== --- users/devans/dports/audio/pulseaudio/files/patch-man-Makefile.am.diff (rev 0) +++ users/devans/dports/audio/pulseaudio/files/patch-man-Makefile.am.diff 2014-03-03 22:39:47 UTC (rev 117566) @@ -0,0 +1,11 @@ +--- man/Makefile.am.orig 2014-03-03 12:23:46.000000000 -0800 ++++ man/Makefile.am 2014-03-03 12:24:32.000000000 -0800 +@@ -63,7 +63,7 @@ + $(dist_man_MANS) + + %: %.xml Makefile +- $(AM_V_GEN) perl $(srcdir)/xmltoman $< > $@ || rm -f $@ ++ $(AM_V_GEN) @@MP_PERL@@ $(srcdir)/xmltoman $< > $@ || rm -f $@ + + endif + Deleted: users/devans/dports/audio/pulseaudio/files/patch-no-inline-asm.diff =================================================================== --- users/devans/dports/audio/pulseaudio/files/patch-no-inline-asm.diff 2014-03-03 22:14:59 UTC (rev 117565) +++ users/devans/dports/audio/pulseaudio/files/patch-no-inline-asm.diff 2014-03-03 22:39:47 UTC (rev 117566) @@ -1,42 +0,0 @@ -diff -ur src/pulsecore.orig/svolume_mmx.c src/pulsecore/svolume_mmx.c ---- src/pulsecore.orig/svolume_mmx.c 2013-08-08 09:37:04.000000000 -0700 -+++ src/pulsecore/svolume_mmx.c 2013-08-08 09:37:24.000000000 -0700 -@@ -34,7 +34,7 @@ - - #include "sample-util.h" - --#if defined (__i386__) || defined (__amd64__) -+#if (defined (__i386__) && !defined(__APPLE__)) || defined (__amd64__) - /* in s: 2 int16_t samples - * in v: 2 int32_t volumes, fixed point 16:16 - * out s: contains scaled and clamped int16_t samples. -@@ -243,7 +243,7 @@ - #endif /* defined (__i386__) || defined (__amd64__) */ - - void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) { --#if defined (__i386__) || defined (__amd64__) -+#if (defined (__i386__) && !defined(__APPLE__)) || defined (__amd64__) - if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) { - pa_log_info("Initialising MMX optimized volume functions."); - -diff -ur src/pulsecore.orig/svolume_sse.c src/pulsecore/svolume_sse.c ---- src/pulsecore.orig/svolume_sse.c 2013-08-08 09:37:04.000000000 -0700 -+++ src/pulsecore/svolume_sse.c 2013-08-08 09:44:15.000000000 -0700 -@@ -34,7 +34,7 @@ - - #include "sample-util.h" - --#if defined (__i386__) || defined (__amd64__) -+#if (defined (__i386__) && !defined(__APPLE__)) || defined (__amd64__) - - #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \ - " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \ -@@ -255,7 +255,7 @@ - #endif /* defined (__i386__) || defined (__amd64__) */ - - void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) { --#if defined (__i386__) || defined (__amd64__) -+#if (defined (__i386__) && !defined(__APPLE__)) || defined (__amd64__) - if (flags & PA_CPU_X86_SSE2) { - pa_log_info("Initialising SSE2 optimized volume functions."); -