[88580] trunk/dports/multimedia/mplayer2

[cal at macports.org]

Revision: 88580
          http://trac.macports.org/changeset/88580
Author:   cal at macports.org
Date:     2012-01-04 09:31:44 -0800 (Wed, 04 Jan 2012)
Log Message:
-----------
mplayer2: Clean up ffmpeg's configure, disable universal variant as it breaks at inline assembly

Modified Paths:
--------------
    trunk/dports/multimedia/mplayer2/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch

Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer2/Portfile	2012-01-04 17:09:51 UTC (rev 88579)
+++ trunk/dports/multimedia/mplayer2/Portfile	2012-01-04 17:31:44 UTC (rev 88580)
@@ -58,9 +58,8 @@
                         port:x264
 
 use_configure           no
+universal_variant       no
 
-variant universal {}
-
 set mplayercflags      "--disable-smb \
                         --enable-menu \
                         --enable-macosx-finder \
@@ -95,6 +94,12 @@
                         --enable-libfaac \
                         --enable-nonfree"
 
+configure.cppflags-append \
+                        -I${prefix}/include/dirac \
+                        -I${prefix}/include/schroedinger-1.0
+
+patchfiles              no-cflags-in-cpp-ffmpeg-mt-configure.patch
+
 if {${configure.compiler} == "clang"} {
     patchfiles-append   clang-compatibility-mplayer-configure.patch
 }

Added: trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch
===================================================================
--- trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch	                        (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/no-cflags-in-cpp-ffmpeg-mt-configure.patch	2012-01-04 17:31:44 UTC (rev 88580)
@@ -0,0 +1,11 @@
+--- ffmpeg-mt/configure.orig	2012-01-04 17:47:02.000000000 +0100
++++ ffmpeg-mt/configure	2012-01-04 17:47:09.000000000 +0100
+@@ -581,7 +581,7 @@
+     log check_cpp "$@"
+     cat > $TMPC
+     log_file $TMPC
+-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
++    check_cmd $cc $CPPFLAGS "$@" -E -o $TMPO $TMPC
+ }
+ 
+ check_as(){
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120104/65ecabb5/attachment-0001.html>