[109144] trunk/dports/audio/pulseaudio
devans at macports.org
devans at macports.org
Thu Aug 8 10:12:20 PDT 2013
Revision: 109144
https://trac.macports.org/changeset/109144
Author: devans at macports.org
Date: 2013-08-08 10:12:20 -0700 (Thu, 08 Aug 2013)
Log Message:
-----------
pulseaudio: also disable inline SSE asm, fixes universal build, muniversal no longer necessary.
Modified Paths:
--------------
trunk/dports/audio/pulseaudio/Portfile
Added Paths:
-----------
trunk/dports/audio/pulseaudio/files/patch-no-inline-asm.diff
Removed Paths:
-------------
trunk/dports/audio/pulseaudio/files/no-buggy-i386-asm.patch
Modified: trunk/dports/audio/pulseaudio/Portfile
===================================================================
--- trunk/dports/audio/pulseaudio/Portfile 2013-08-08 15:10:19 UTC (rev 109143)
+++ trunk/dports/audio/pulseaudio/Portfile 2013-08-08 17:12:20 UTC (rev 109144)
@@ -5,11 +5,10 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=67795
PortSystem 1.0
-PortGroup muniversal 1.0
name pulseaudio
version 4.0
-revision 2
+revision 3
license LGPL-2.1
categories audio
maintainers devans openmaintainer
@@ -50,7 +49,7 @@
port:orc
# https://bugs.freedesktop.org/show_bug.cgi?id=55733 and <rdar://problem/14653996>
-patchfiles no-buggy-i386-asm.patch
+patchfiles patch-no-inline-asm.diff
configure.args --with-mac-sysroot=/ \
--with-mac-version-min=$macosx_deployment_target \
Deleted: trunk/dports/audio/pulseaudio/files/no-buggy-i386-asm.patch
===================================================================
--- trunk/dports/audio/pulseaudio/files/no-buggy-i386-asm.patch 2013-08-08 15:10:19 UTC (rev 109143)
+++ trunk/dports/audio/pulseaudio/files/no-buggy-i386-asm.patch 2013-08-08 17:12:20 UTC (rev 109144)
@@ -1,20 +0,0 @@
---- src/pulsecore/svolume_mmx.c 2012-09-26 04:27:01.000000000 -0700
-+++ src/pulsecore/svolume_mmx.c 2013-08-05 09:03:53.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 @@ static void pa_volume_s16re_mmx(int16_t
- #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.");
-
Added: trunk/dports/audio/pulseaudio/files/patch-no-inline-asm.diff
===================================================================
--- trunk/dports/audio/pulseaudio/files/patch-no-inline-asm.diff (rev 0)
+++ trunk/dports/audio/pulseaudio/files/patch-no-inline-asm.diff 2013-08-08 17:12:20 UTC (rev 109144)
@@ -0,0 +1,42 @@
+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.");
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130808/44dd5c9f/attachment-0001.html>
More information about the macports-changes
mailing list