svn commit: r316235 - head/audio/pulseaudio/files

[Koop Mast]

Author: kwm
Date: Mon Apr 22 15:11:27 2013
New Revision: 316235
URL: http://svnweb.freebsd.org/changeset/ports/316235

Log:
  Fix the build on 10-i386
  
  Reported by:	miwi

Added:
  head/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c   (contents, props changed)
Modified:
  head/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c   (contents, props changed)

Modified: head/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c
==============================================================================
--- head/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c	Mon Apr 22 15:10:48 2013	(r316234)
+++ head/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c	Mon Apr 22 15:11:27 2013	(r316235)
@@ -1,20 +1,26 @@
---- src/pulsecore/svolume_mmx.c.orig	2011-06-23 17:18:54.484125000 -0300
-+++ src/pulsecore/svolume_mmx.c	2012-01-04 23:36:03.000000000 -0200
-@@ -154,7 +154,7 @@
+--- src/pulsecore/svolume_mmx.c.orig	2011-06-23 20:18:54.484125000 +0000
++++ src/pulsecore/svolume_mmx.c	2013-04-18 09:22:42.000000000 +0000
+@@ -154,9 +154,9 @@
          "6:                             \n\t"
          " emms                          \n\t"
  
 -        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
 +        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
  #if defined (__i386__)
-         : "m" ((pa_reg_x86)channels)
+-        : "m" ((pa_reg_x86)channels)
++        : "m" (channels)
  #else
-@@ -235,7 +235,7 @@
+         : "r" ((pa_reg_x86)channels)
+ #endif
+@@ -235,9 +235,9 @@
          "6:                             \n\t"
          " emms                          \n\t"
  
 -        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
 +        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
  #if defined (__i386__)
-         : "m" ((pa_reg_x86)channels)
+-        : "m" ((pa_reg_x86)channels)
++        : "m" (channels)
  #else
+         : "r" ((pa_reg_x86)channels)
+ #endif

Added: head/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c	Mon Apr 22 15:11:27 2013	(r316235)
@@ -0,0 +1,20 @@
+--- src/pulsecore/svolume_sse.c.orig	2013-04-19 14:02:51.000000000 +0000
++++ src/pulsecore/svolume_sse.c	2013-04-19 14:03:14.000000000 +0000
+@@ -155,7 +155,7 @@
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
+ #if defined (__i386__)
+-        : "m" ((pa_reg_x86)channels)
++        : "m" (channels)
+ #else
+         : "r" ((pa_reg_x86)channels)
+ #endif
+@@ -249,7 +249,7 @@
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
+ #if defined (__i386__)
+-        : "m" ((pa_reg_x86)channels)
++        : "m" (channels)
+ #else
+         : "r" ((pa_reg_x86)channels)
+ #endif