[56526] trunk/dports/multimedia/ffmpeg-devel

[devans at macports.org]

Revision: 56526
          http://trac.macports.org/changeset/56526
Author:   devans at macports.org
Date:     2009-08-29 06:29:46 -0700 (Sat, 29 Aug 2009)
Log Message:
-----------
ffmpeg-devel: merge r56509 from ffmpeg (fixes for 10.6), thanks to jmr.

Revision Links:
--------------
    http://trac.macports.org/changeset/56509

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

Property Changed:
----------------
    trunk/dports/multimedia/ffmpeg-devel/


Property changes on: trunk/dports/multimedia/ffmpeg-devel
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/multimedia/ffmpeg:56509

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-08-29 12:53:44 UTC (rev 56525)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-08-29 13:29:46 UTC (rev 56526)
@@ -48,12 +48,11 @@
                 port:faad2 \
                 port:XviD \
                 port:x264 \
-                port:libsdl \
+                path:lib/pkgconfig/sdl.pc:libsdl \
                 port:bzip2 \
                 port:zlib
 
 build.cmd       gmake
-configure.compiler gcc-4.0
 
 
 pre-fetch {
@@ -112,10 +111,14 @@
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
         --disable-indevs \
-        --cc=gcc-4.0
+        --cc=${configure.cc}
 
 #add --enable-libopenjpeg when problems with openjpeg.h are resolved
 
+if {[info exists build_arch] && $build_arch != ""} {
+    configure.args-append --arch=${build_arch}
+}
+
 test.run        yes
 
 #
@@ -133,6 +136,12 @@
     }
 }
 
+platform darwin 10 {
+    # ticket #20235
+    depends_lib-delete path:lib/pkgconfig/sdl.pc:libsdl
+    depends_lib-append path:lib/pkgconfig/sdl.pc:libsdl-devel
+}
+
 variant no_mmx description {disable all x86 asm optimizations} {
     configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090829/feaeb742/attachment.html>