[49661] trunk/dports/multimedia

[devans at macports.org]

Revision: 49661
          http://trac.macports.org/changeset/49661
Author:   devans at macports.org
Date:     2009-04-14 17:48:40 -0700 (Tue, 14 Apr 2009)
Log Message:
-----------
ffmpeg/ffmpeg-devel: 
    * enable auto configuration of x86 asm optimizations by default
    * check for required XCode >= 3.1 and abort with message if not present
    * add +no_mmx variant to disable all x86 asm optimizations if desired.  

Closes #19314.

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/multimedia/ffmpeg-devel/Portfile

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2009-04-14 22:52:53 UTC (rev 49660)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2009-04-15 00:48:40 UTC (rev 49661)
@@ -5,7 +5,7 @@
 
 name            ffmpeg
 version         0.5
-revision        1
+revision        2
 epoch           1
 categories      multimedia
 maintainers     devans openmaintainer
@@ -74,6 +74,22 @@
 build.cmd       gmake
 configure.compiler gcc-4.0
 
+#
+# enable auto configure of mmx and related Intel optimizations by default
+# requires XCode 3.1.2 or better on Leopard
+#
+
+pre-extract {
+    if {"darwin" == ${os.platform} && 9 == ${os.major}} {
+        set minimum_xcodeversion 3.1
+        set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+        if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+            ui_error "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
+        }
+    }
+}
+
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
         --disable-vhook \
@@ -90,7 +106,6 @@
         --enable-libx264 \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
-        --disable-mmx \
         --cc=gcc-4.0
 
 #add --enable-libopenjpeg when problems with openjpeg.h are resolved
@@ -111,16 +126,8 @@
     }
 }
 
-#
-# comments concerning mmx problems may be out of date
-# needs testing on i386 platform to verify
-#
-
-variant mmx description {enable mmx optimizations ; may not build in gcc-4.2 or xcode 3.0 gcc-4.0} {
-# make no-mmx default and allow mmx enabling for the brave.
-    configure.args-delete --disable-mmx
-# Fix Leopard problems by disabling the cavs decoder for now (is this still required?)
-    configure.args-append --disable-decoder=cavs
+variant no_mmx description {disable all x86 asm optimizations} {
+    configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
 }
 
 variant no_gpl description {disallow use of GPL code, license will be LGPL} {

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-04-14 22:52:53 UTC (rev 49660)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-04-15 00:48:40 UTC (rev 49661)
@@ -7,6 +7,7 @@
 set svn_rev     18405
 set swscale_rev 29154
 version         ${svn_rev}
+revision        1
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -73,6 +74,22 @@
     }
 }
 
+#
+# enable auto configure of mmx and related Intel optimizations by default
+# requires XCode 3.1 or better on Leopard
+#
+
+pre-extract {
+    if {"darwin" == ${os.platform} && 9 == ${os.major}} {
+        set minimum_xcodeversion 3.1
+        set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+        if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+            ui_error "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
+        }
+    }
+}
+
 extract {
     file copy ${distpath}/${svn_rev}/trunk ${worksrcpath}
 }
@@ -94,7 +111,6 @@
         --enable-libx264 \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
-        --disable-mmx \
         --disable-indevs \
         --cc=gcc-4.0
 
@@ -117,16 +133,8 @@
     }
 }
 
-#
-# comments concerning mmx problems may be out of date
-# needs testing on i386 platform to verify
-#
-
-variant mmx description {enable mmx optimizations ; may not build in gcc-4.2 or xcode 3.0 gcc-4.0} {
-# make no-mmx default and allow mmx enabling for the brave.
-    configure.args-delete --disable-mmx
-# Fix Leopard problems by disabling the cavs decoder for now (is this still required?)
-    configure.args-append --disable-decoder=cavs
+variant no_mmx description {disable all x86 asm optimizations} {
+    configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
 }
 
 variant no_gpl description {disallow use of GPL code, license will be LGPL} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090414/0201a367/attachment.html>