Changeset 79717

Timestamp:

06/23/11 15:00:58 (4 years ago)

Author:

jeremyhu@…

Message:

mplayer-devel: Update to revision 33714, fix build on Lion

This addresses all the asm fixes I submitted as well as others. Unfortunately,
it still fails to build with llvm-gcc, so using gcc-4.2 on Lion until we figure
out the rest of the issues.

Location:

trunk/dports/multimedia/mplayer-devel

Files:

• Portfile (modified) (4 diffs)
• files/configure.x11.patch (modified) (2 diffs)
• files/dsputil-mmx.patch (deleted)
• files/mp3lib-sse.patch (deleted)
• files/yadif.patch (deleted)

trunk/dports/multimedia/mplayer-devel/Portfile

@@ -6 +6 @@
 
 name                mplayer-devel
-version             31034
-revision            3
+version             33714
 categories          multimedia
 maintainers         acho openmaintainer
 platforms           darwin
 
-set dvdnav_ver      1191
-set ffmpeg_ver      22866
+set dvdnav_ver      1228
+set ffmpeg_ver      ffc6c8a4305d25db8a5af72389a2453b17f43646
 
 description         The MPlayer movie player built from SVN.
@@ -41 +40 @@
     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 "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavcodec ${worksrcpath}/libavcodec/"
-    system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavutil ${worksrcpath}/libavutil/"
-    system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavformat ${worksrcpath}/libavformat/"
-    system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libpostproc ${worksrcpath}/libpostproc/"
-}
+    system "git clone --depth 1 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
+    #}
+}
+
 # Do not use the following environment variables, otherwise the build phase
 # will fail.
@@ -65 +71 @@
     --mandir=${prefix}/share/man \
     --enable-png --enable-jpeg --enable-liblzo \
-    --enable-theora --enable-libvorbis --enable-mad \
-    --enable-largefiles
-
+    --enable-theora --enable-libvorbis --enable-mad
+
+# MPlayer autodetects many support libs.  To prevent undeclared
+# dependencies, explicitly disable everything optional first.
+# Later, let autodetect do its magic not explicit --enable
 configure.args-append \
     --disable-smb --disable-live --disable-dvdnav \
@@ -82 +90 @@
     --disable-gif
 
-patchfiles configure.x11.patch yadif.patch mp3lib-sse.patch dsputil-mmx.patch
+patchfiles configure.x11.patch
 
 post-destroot {

trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch

@@ -1 @@
---- configure.orig      2009-04-12 10:07:30.000000000 -0700
-+++ configure   2009-04-22 22:53:09.000000000 -0700
-@@ -4196,6 +4196,9 @@ echores "$_x11_headers"
+--- configure.orig      2011-06-23 11:42:26.000000000 -0700
++++ configure   2011-06-23 13:34:17.000000000 -0700
+@@ -4297,6 +4297,9 @@ echores "$_x11_headers"
  
  
@@ -9 +9 @@
 +fi
  if test "$_x11" = auto && test "$_x11_headers" = yes ; then
-   cat > $TMPC <<EOF
- #include <X11/Xlib.h>
-@@ -6760,6 +6763,7 @@ fi
+   for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
+            -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
+@@ -6777,6 +6780,7 @@ fi
  if test "$_qtx" = yes ; then
      def_qtx='#define CONFIG_QTX_CODECS 1'
      win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1'
 +    darwin && extra_ldflags="$extra_ldflags -framework Carbon -framework QuickTime" && def_quicktime='#define CONFIG_QUICKTIME 1'
-     _codecmodules="qtx $_codecmodules"
+     codecmodules="qtx $codecmodules"
      darwin || win32 || _qtx_emulation=yes
  else