Changeset 79745

Timestamp:

06/24/11 13:14:42 (4 years ago)

Author:

jeremyhu@…

Message:

mplayer-devel: Workaround some llvm-gcc and LTO bugs to enable llvm-gcc on darwin11

Since this would also need a revbump, just bump us to the latest revisions
of mplayer and ffmpeg as well.

Location:

trunk/dports/multimedia/mplayer-devel

Files:

• Portfile (modified) (6 diffs)
• files/configure.clang.patch (added)
• files/llvm-gcc-workaround.patch (added)

trunk/dports/multimedia/mplayer-devel/Portfile

@@ -6 +6 @@
 
 name                mplayer-devel
-version             33714
+version             33720
 categories          multimedia
 maintainers         acho openmaintainer
@@ -12 +12 @@
 
 set dvdnav_ver      1228
-set ffmpeg_ver      ffc6c8a4305d25db8a5af72389a2453b17f43646
+set ffmpeg_ver      5aa8b270db2b88f136ef518b4bdf2b5dfff4a77b
 
 description         The MPlayer movie player built from SVN.
@@ -41 +41 @@
     system "svn export -r${dvdnav_ver} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src ${worksrcpath}/libdvdnav/"
     system "svn export -r${dvdnav_ver} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src ${worksrcpath}/libdvdread4/"
-    system "git clone --depth 1 git://git.videolan.org/ffmpeg.git ${worksrcpath}/ffmpeg"
+
+    # 1000 should be deep enough to find out checkout
+    system "git clone --depth 1000 git://git.videolan.org/ffmpeg.git ${worksrcpath}/ffmpeg"
     system "cd ${worksrcpath}/ffmpeg && git checkout -f ${ffmpeg_ver}"
-}
-
-platform darwin 11 {
-    configure.compiler gcc-4.2
-    #post-patch {
-    #    # MPlayer does not play well with llvm-gcc's link time optimization
-    #    reinplace "s:-O4:-O4 -fno-lto:" ${worksrcpath}/configure
-    #}
 }
 
@@ -91 +85 @@
     --disable-gif
 
-patchfiles configure.x11.patch
+# configure.clang.patch: http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1939
+patchfiles configure.x11.patch configure.clang.patch
 
 post-destroot {
@@ -270 +265 @@
 variant debug description {Compile with debugging symbols} {
     configure.args-append   --enable-debug=gdb3 --disable-altivec
-    #post-patch {
-    #    reinplace "s:-O2:-O0:g" ${worksrcpath}/configure
-    #}
+}
+
+platform darwin 9 {
+    configure.args-delete   --extra-cflags="-I${prefix}/include/lzo -I${prefix}/include"
+    configure.args-append   --extra-cflags="-fomit-frame-pointer -I${prefix}/include/lzo -I${prefix}/include"
+}
+
+platform darwin 11 {
+    # BUILD FIX TODO:
+    # clang fails to build due to some bad inline asm
+    # https://ffmpeg.org/trac/ffmpeg/ticket/303
+    # configure.compiler clang
+
+    # llvm-gcc-4.2 fails to build vf_fspp.c properly with -O2 and above
+    patchfiles-append llvm-gcc-workaround.patch
+
+    post-patch {
+        # link time optimization fails to find references for ff_mlp_firorder*
+        # For some reason -O4 -fno-lto doesn't work as well, so just use -O3
+        reinplace "s:-O4:-O3:" ${worksrcpath}/configure
+    }
 }
 
@@ -281 +294 @@
     build.env           LD=${configure.cc}
 }
-
-platform darwin 8 {
-    # Need to force use of c++ for linking when Xcode 2.2 is used since some
-    # bits of libstdc++ are needed during linking
-    build.env           LD=${configure.cxx}
-}
-
-platform darwin 9 {
-    configure.args-delete   --extra-cflags="-I${prefix}/include/lzo -I${prefix}/include"
-    configure.args-append   --extra-cflags="-fomit-frame-pointer -I${prefix}/include/lzo -I${prefix}/include"
-}