Revision: 82651
http://trac.macports.org/changeset/82651
Author:
Date: 2011-08-17 09:08:11 -0700 (Wed, 17 Aug 2011)
Log Message:
-----------
ffmpeg: fix i386 build and add universal variant based on #28935
Modified Paths:
--------------
trunk/dports/multimedia/ffmpeg/Portfile
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2011-08-17 15:47:32 UTC (rev 82650)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2011-08-17 16:08:11 UTC (rev 82651)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup xcodeversion 1.0
+PortGroup muniversal 1.0
name ffmpeg
conflicts ffmpeg-devel
@@ -109,22 +110,12 @@
#add --enable-libopenjpeg when problems with openjpeg.h are resolved
-if {$build_arch != ""} {
- configure.args-append --arch=${build_arch}
- if {$build_arch == "i386" || $build_arch == "x86_64"} {
- depends_build-append port:yasm
- configure.args-append --enable-yasm
- }
-}
-
test.run yes
#
# configure isn't autoconf and they do use a dep cache
#
-universal_variant no
-
post-destroot {
file mkdir ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/doc/TODO ${destroot}${prefix}/share/doc/${name}
@@ -133,17 +124,6 @@
}
}
-platform darwin 10 {
- # ticket #20938 -- disable mmx for 32 bit intel only
- if { $build_arch == "i386" } {
- # swscale is no longer GPL only
- configure.args-delete --enable-swscale
- if { ![variant_isset no_mmx] } {
- configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
- }
- }
-}
-
platform powerpc {
# absence of altivec is not automatically detected
if {[catch {sysctl hw.vectorunit} result] || $result == 0} {
@@ -151,6 +131,27 @@
}
}
+configure.universal_args-delete --disable-dependency-tracking
+
+if {[variant_isset universal]} {
+ foreach arch ${configure.universal_archs} {
+ lappend merger_configure_args($arch) --arch=${arch}
+ lappend merger_configure_env($arch) ASFLAGS='-arch ${arch}'
+ }
+ if {[string match "*86*" ${configure.universal_archs}]} {
+ depends_build-append port:yasm
+ }
+ lappend merger_configure_args(i386) --enable-yasm
+ lappend merger_configure_args(x86_64) --enable-yasm
+} else {
+ configure.args-append --arch=${configure.build_arch}
+ configure.env-append ASFLAGS='[get_canonical_archflags]'
+ if {$build_arch == "i386" || $build_arch == "x86_64"} {
+ depends_build-append port:yasm
+ configure.args-append --enable-yasm
+ }
+}
+
variant no_mmx description {disable all x86 asm optimizations} {
configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
}
