[50035] trunk/dports/multimedia/mplayer-devel

[jeremyhu at macports.org]

Revision: 50035
          http://trac.macports.org/changeset/50035
Author:   jeremyhu at macports.org
Date:     2009-04-22 23:48:21 -0700 (Wed, 22 Apr 2009)
Log Message:
-----------
mplayer-devel: There is no arts, fix X11 deps, make glx variant.

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

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

Modified: trunk/dports/multimedia/mplayer-devel/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer-devel/Portfile	2009-04-23 06:38:16 UTC (rev 50034)
+++ trunk/dports/multimedia/mplayer-devel/Portfile	2009-04-23 06:48:21 UTC (rev 50035)
@@ -56,15 +56,17 @@
 configure.pipe      no
 
 configure.args \
+        --extra-cflags="-I${prefix}/include/lzo -I${prefix}/include" \
+	--extra-ldflags="-L${prefix}/lib -L${prefix}/lib/samba3" \
         --datadir=${prefix}/share/${name} \
         --confdir=${prefix}/etc/${name} \
         --mandir=${prefix}/share/man \
         --enable-png --enable-jpeg --enable-liblzo \
         --enable-libvorbis --enable-mad \
         --enable-largefiles
-		
+
 configure.args-append \
-    --disable-smb --disable-live --disable-dvdnav \
+	--disable-smb --disable-live --disable-dvdnav \
 	--disable-dvdread --disable-cdparanoia --disable-freetype \
 	--disable-fontconfig --disable-fribidi \
 	--disable-enca --disable-libcdio --disable-xvid \
@@ -72,10 +74,12 @@
 	--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 --disable-mng --disable-libdirac-lavc \
 	--disable-libschroedinger-lavc
 
+patchfiles configure.x11.patch
+
 post-destroot {
     xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
     eval file copy [glob ${worksrcpath}/DOCS/*] \
@@ -225,17 +229,15 @@
 }
 
 variant x11 {
-    depends_lib-append      lib:libX11.6:XFree86
+    depends_lib-append \
+        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 arts \
-    description {Enable aRts audio output} {
-    depends_lib-append      port:arts
-    configure.args-delete   --disable-arts
-}
-
 variant esd \
     description {Enable EsounD audio output} {
     depends_lib-append      port:esound
@@ -247,6 +249,12 @@
                             --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 {
     build.env           LD=cc
 }

Added: trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch
===================================================================
--- trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch	                        (rev 0)
+++ trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch	2009-04-23 06:48:21 UTC (rev 50035)
@@ -0,0 +1,20 @@
+--- 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"
+ 
+ 
+ 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>
+@@ -6760,6 +6763,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"
+     darwin || win32 || _qtx_emulation=yes
+ else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090422/115b06c1/attachment.html>