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

[jmr at macports.org]

Revision: 93400
          https://trac.macports.org/changeset/93400
Author:   jmr at macports.org
Date:     2012-05-21 13:29:28 -0700 (Mon, 21 May 2012)
Log Message:
-----------
xine-lib: more fixes to allow building with clang

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

Added Paths:
-----------
    trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h
    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	2012-05-21 19:14:46 UTC (rev 93399)
+++ trunk/dports/multimedia/xine-lib/Portfile	2012-05-21 20:29:28 UTC (rev 93400)
@@ -35,9 +35,16 @@
             port:xorg-libXvMC \
             port:xorg-xcb-util
 
-# fix "error: empty character constant"
-patchfiles  src_demuxers_demux_qt.c.diff
+# fix "error: empty character constant" and
+# "error: initializer element is not a compile-time constant"
+patchfiles  src_demuxers_demux_qt.c.diff patch-include-xine-post.h
 
+if {${configure.compiler} == "clang"} {
+    # disable use of MMX in this file; workaround for
+    # "error: clobbers must be last on the x87 stack"
+    patchfiles-append   src_post_goom_ifs.c.diff
+}
+
 # bad register name `%rax'
 universal_variant       no
 

Added: trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h
===================================================================
--- trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/patch-include-xine-post.h	2012-05-21 20:29:28 UTC (rev 93400)
@@ -0,0 +1,11 @@
+--- include/xine/post.h.orig
++++ include/xine/post.h
+@@ -397,7 +397,7 @@ static xine_post_api_parameter_t temp_p[
+ 
+ #define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \
+ { param_type, #var, sizeof(temp_s.var), \
+-  (char*)&temp_s.var-(char*)&temp_s, enumv, min, max, readonly, descr },
++  offsetof(__typeof__(temp_s), var), enumv, min, max, readonly, descr },
+ 
+ #define END_PARAM_DESCR( name ) \
+   { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \

Added: trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/src_post_goom_ifs.c.diff	2012-05-21 20:29:28 UTC (rev 93400)
@@ -0,0 +1,11 @@
+--- 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: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120521/7ae093d4/attachment-0001.html>