svn commit: r335109 - head/multimedia/libxine/files

[Juergen Lock]

Author: nox
Date: Thu Nov 28 17:18:14 2013
New Revision: 335109
URL: http://svnweb.freebsd.org/changeset/ports/335109

Log:
  - Sync goom emms clang patch with the one from
    multimedia/gstreamer-plugins-good, removing #ifdef __clang__.
  - No PORTREVISION bump as there should be no functional change.
  
  Submitted by:	dim
  Obtained from:	multimedia/gstreamer-plugins-good/files/patch-gst_goom_mmx.h

Modified:
  head/multimedia/libxine/files/patch-src-post-goom-mmx.h

Modified: head/multimedia/libxine/files/patch-src-post-goom-mmx.h
==============================================================================
--- head/multimedia/libxine/files/patch-src-post-goom-mmx.h	Thu Nov 28 17:14:06 2013	(r335108)
+++ head/multimedia/libxine/files/patch-src-post-goom-mmx.h	Thu Nov 28 17:18:14 2013	(r335109)
@@ -1,32 +1,18 @@
 --- src/post/goom/mmx.h.orig
 +++ src/post/goom/mmx.h
-@@ -721,17 +721,29 @@ void zoom_filter_xmmx (int prevX, int pr
- */
- #ifdef	MMX_TRACE
- 
-+#ifdef __clang__
-+#define	emms() \
-+	{ \
-+		printf("emms()\n"); \
-+		__asm__ __volatile__ ("emms"); \
-+	}
-+#else
- #define	emms() \
+@@ -725,13 +725,13 @@ void zoom_filter_xmmx (int prevX, int pr
  	{ \
  		printf("emms()\n"); \
  		__asm__ __volatile__ ("emms" \
-                         "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
+-                        "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
++                        "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
  	}
-+#endif
  
  #else
  
-+#ifdef __clang__
-+#define	emms() __asm__ __volatile__ ("emms")
-+#else
  #define	emms() __asm__ __volatile__ ("emms"::: \
-                       "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
-+#endif
+-                      "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
++                      "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
  
  #endif