[119216] trunk/dports/multimedia/xine-lib

[ryandesign at macports.org]

Revision: 119216
          https://trac.macports.org/changeset/119216
Author:   ryandesign at macports.org
Date:     2014-04-20 12:53:24 -0700 (Sun, 20 Apr 2014)
Log Message:
-----------
xine-lib: fix build error "clobbers must be last on the x87 stack" with clang

Modified Paths:
--------------
    trunk/dports/multimedia/xine-lib/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff

Removed Paths:
-------------
    trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff
    trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff

Modified: trunk/dports/multimedia/xine-lib/Portfile
===================================================================
--- trunk/dports/multimedia/xine-lib/Portfile	2014-04-20 19:37:03 UTC (rev 119215)
+++ trunk/dports/multimedia/xine-lib/Portfile	2014-04-20 19:53:24 UTC (rev 119216)
@@ -43,13 +43,7 @@
             port:xorg-libXvMC \
             port:xorg-xcb-util
 
-if {[string match "*clang*" ${configure.compiler}]} {
-    # disable use of MMX in these files; workaround for
-    # "error: clobbers must be last on the x87 stack"
-    # https://bugs.xine-project.org/show_bug.cgi?id=502
-    patchfiles-append   src_post_goom_ifs.c.diff
-    patchfiles-append   patch-src-post-goom-mmx.c.diff
-}
+patchfiles-append   patch-src-post-goom-mmx.h.diff
 
 # bad register name `%rax'
 universal_variant       no

Deleted: trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff	2014-04-20 19:37:03 UTC (rev 119215)
+++ trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.c.diff	2014-04-20 19:53:24 UTC (rev 119216)
@@ -1,10 +0,0 @@
---- src/post/goom/mmx.c.orig	2012-02-05 13:17:02.000000000 -0600
-+++ src/post/goom/mmx.c	2013-09-26 07:36:28.000000000 -0500
-@@ -1,6 +1,6 @@
- #include "config.h"
- 
--#ifdef HAVE_MMX
-+#if 0
- 
- #define BUFFPOINTNB 16
- #define BUFFPOINTMASK 0xffff

Added: trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/patch-src-post-goom-mmx.h.diff	2014-04-20 19:53:24 UTC (rev 119216)
@@ -0,0 +1,18 @@
+https://bugs.xine-project.org/show_bug.cgi?id=502
+http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/rev/3361d91b9fda
+--- src/post/goom/mmx.h.orig	Sun Apr 20 16:17:32 2014 +0300
++++ src/post/goom/mmx.h	Sun Apr 20 18:05:27 2014 +0300
+@@ -730,8 +730,7 @@
+ 
+ #else
+ 
+-#define	emms() __asm__ __volatile__ ("emms"::: \
+-                      "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
++#define	emms() __asm__ __volatile__ ("emms")
+ 
+ #endif
+ 
+
+
+
+

Deleted: trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff	2014-04-20 19:37:03 UTC (rev 119215)
+++ trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff	2014-04-20 19:53:24 UTC (rev 119216)
@@ -1,11 +0,0 @@
---- src/post/goom/ifs.c.orig	2009-12-01 08:29:12.000000000 +1100
-+++ src/post/goom/ifs.c	2012-05-22 06:21:56.000000000 +1000
-@@ -517,7 +517,7 @@ static void ifs_update (PluginInfo *goom
- 	points = draw_ifs (goomInfo, &nbpt, fx_data);
- 	nbpt--;
- 
--#ifdef HAVE_MMX
-+#if 0
- 	movd_m2r (couleursl, mm1);
- 	punpckldq_r2r (mm1, mm1);
- 	for (i = 0; i < nbpt; i += increment) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140420/e8286573/attachment.html>