From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 28 17:18:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 66A7EB20;
 Thu, 28 Nov 2013 17:18:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 51F1819F7;
 Thu, 28 Nov 2013 17:18:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rASHIFe9026297;
 Thu, 28 Nov 2013 17:18:15 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rASHIFIE026295;
 Thu, 28 Nov 2013 17:18:15 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201311281718.rASHIFIE026295@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Thu, 28 Nov 2013 17:18:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335109 - head/multimedia/libxine/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Nov 2013 17:18:15 -0000

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