[50030] trunk/dports/multimedia/MPlayer

[jeremyhu at macports.org]

Revision: 50030
          http://trac.macports.org/changeset/50030
Author:   jeremyhu at macports.org
Date:     2009-04-22 22:41:59 -0700 (Wed, 22 Apr 2009)
Log Message:
-----------
mplayer: Added glx variant since glx and osx don't cooperate in MPlayer.

Modified Paths:
--------------
    trunk/dports/multimedia/MPlayer/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/MPlayer/files/
    trunk/dports/multimedia/MPlayer/files/configure.x11.patch
    trunk/dports/multimedia/MPlayer/files/qt.x11.patch

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2009-04-23 00:52:49 UTC (rev 50029)
+++ trunk/dports/multimedia/MPlayer/Portfile	2009-04-23 05:41:59 UTC (rev 50030)
@@ -6,7 +6,7 @@
 
 name                MPlayer
 version             1.0rc2
-revision            3
+revision            4
 categories          multimedia
 maintainers         ecronin \
                     openmaintainer
@@ -35,7 +35,9 @@
 patchfiles      stream_cddb_fix_20080120.diff \
                 url_fix_20080120.diff \
                 demux_mov_fix_20080129.diff \
-                demux_audio_fix_20080129.diff
+                demux_audio_fix_20080129.diff \
+                configure.x11.patch \
+                qt.x11.patch
 use_bzip2       yes
 checksums       ${distname}${extract.suffix} \
                     md5 7e27e535c2d267637df34898f1b91707 \
@@ -102,7 +104,7 @@
         --disable-faac --disable-ladspa --disable-libdv \
         --disable-toolame --disable-twolame --disable-xmms \
         --disable-musepack --disable-sdl --disable-aa \
-        --disable-caca --disable-x11 --disable-arts \
+        --disable-caca --disable-x11 --disable-gl --disable-arts \
         --disable-esd --disable-lirc
 
 post-destroot {
@@ -305,13 +307,12 @@
 
 variant x11 {
     depends_lib-append \
-	port:mesa \
 	port:xorg-libXinerama \
 	port:xorg-libXv \
 	port:xorg-libXxf86vm
 
     configure.args-delete   --disable-x11
-    configure.env-append    PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig
+    configure.args-append   --enable-x11 --enable-xv --enable-xinerama --enable-xshape 
 }
 
 variant esd \
@@ -326,6 +327,12 @@
                             --enable-macosx-bundle --enable-qtx
 }
 
+variant glx requires x11 description {Enable glx output support.  Due to a bug in Mplayer's build system, this disables OSX-specific features} {
+    depends_lib-append port:mesa
+    configure.args-delete   --disable-gl --enable-macosx --enable-macosx-finder-support --enable-macosx-bundle --enable-qtx
+    configure.args-append   --enable-gl --disable-macosx
+}
+
 platform darwin {
     post-patch {
         reinplace "s|\$\(CC\) \$\(CFLAGS\) -o|\$\(LD\) \$\(CFLAGS\) -o|g" \

Added: trunk/dports/multimedia/MPlayer/files/configure.x11.patch
===================================================================
--- trunk/dports/multimedia/MPlayer/files/configure.x11.patch	                        (rev 0)
+++ trunk/dports/multimedia/MPlayer/files/configure.x11.patch	2009-04-23 05:41:59 UTC (rev 50030)
@@ -0,0 +1,46 @@
+--- configure.orig	2009-04-22 21:48:59.000000000 -0700
++++ configure	2009-04-22 21:58:17.000000000 -0700
+@@ -3859,22 +3859,27 @@ echocheck "X11 headers presence"
+   for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
+     if test -f "$I/X11/Xlib.h" ; then
+       _x11_headers="yes"
+-      _res_comment=""
+-      break
+-    fi
+-  done
+-  for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do
+-    if test -f "$I/X11/Xlib.h" ; then
+-      _inc_extra="$_inc_extra -I$I"
+-      _x11_headers="yes"
+       _res_comment="using $I"
+       break
+     fi
+   done
++  if test $_x11_headers = "no" ; then
++    for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do
++      if test -f "$I/X11/Xlib.h" ; then
++        _inc_extra="$_inc_extra -I$I"
++        _x11_headers="yes"
++        _res_comment="using $I"
++        break
++      fi
++    done
++  fi
+ echores "$_x11_headers"
+ 
+ 
+ echocheck "X11"
++if test "$_x11" = yes ; then
++  _libs_mplayer="$_libs_mplayer -lXext -lX11"
++fi
+ if test "$_x11" = auto && test "$_x11_headers" = yes ; then
+   cat > $TMPC <<EOF
+ #include <X11/Xlib.h>
+@@ -6232,6 +6237,7 @@ fi
+ if test "$_qtx" = yes ; then
+     _def_qtx='#define USE_QTX_CODECS 1'
+     _codecmodules="qtx $_codecmodules"
++    _ld_extra="$_ld_extra -framework QuickTime -framework Carbon"
+ else
+     _def_qtx='#undef USE_QTX_CODECS'
+     _nocodecmodules="qtx $_nocodecmodules"

Added: trunk/dports/multimedia/MPlayer/files/qt.x11.patch
===================================================================
--- trunk/dports/multimedia/MPlayer/files/qt.x11.patch	                        (rev 0)
+++ trunk/dports/multimedia/MPlayer/files/qt.x11.patch	2009-04-23 05:41:59 UTC (rev 50030)
@@ -0,0 +1,30 @@
+--- libmpcodecs/ad_qtaudio.c.orig	2009-04-22 22:21:46.000000000 -0700
++++ libmpcodecs/ad_qtaudio.c	2009-04-22 22:21:53.000000000 -0700
+@@ -5,6 +5,12 @@
+ 
+ #include "config.h"
+ 
++#ifndef MACOSX
++#ifdef __APPLE__
++#define MACOSX
++#endif
++#endif
++
+ #ifdef MACOSX
+ #include <QuickTime/QuickTimeComponents.h>
+ #endif
+--- libmpcodecs/vd_qtvideo.c.orig	2009-04-22 22:20:34.000000000 -0700
++++ libmpcodecs/vd_qtvideo.c	2009-04-22 22:21:15.000000000 -0700
+@@ -4,6 +4,12 @@
+ 
+ #include "config.h"
+ 
++#ifndef MACOSX
++#ifdef __APPLE__
++#define MACOSX
++#endif
++#endif
++
+ #ifdef MACOSX
+ #include <QuickTime/ImageCodec.h>
+ #define dump_ImageDescription(x)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090422/5267e7cd/attachment-0001.html>