[32229] trunk/dports/multimedia/MPlayer/Portfile

ecronin at macports.org ecronin at macports.org
Thu Dec 20 21:21:47 PST 2007


Revision: 32229
          http://trac.macosforge.org/projects/macports/changeset/32229
Author:   ecronin at macports.org
Date:     2007-12-20 21:21:46 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Update port to 1.0rc2 which has the side effect of fixing a lot of
Leopard/10.5 issues.

Closes #13551, #13021, and #12968

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

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2007-12-20 20:53:58 UTC (rev 32228)
+++ trunk/dports/multimedia/MPlayer/Portfile	2007-12-21 05:21:46 UTC (rev 32229)
@@ -1,11 +1,11 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+
 PortSystem          1.0
 
 name                MPlayer
-version             1.0rc1try3
-regsub -all "try." ${version} "" distversion
+version             1.0rc2
 categories          multimedia
 maintainers         gizmolabs.org:ecronin \
                     openmaintainer
@@ -30,25 +30,12 @@
                 http://www.people.virginia.edu/~drf8f/MPlayer/releases/ \
                 http://www1.mplayerhq.hu/MPlayer/releases/codecs/:codecs \
                 http://www2.mplayerhq.hu/MPlayer/releases/codecs/:codecs
-patch_sites     http://www.mplayerhq.hu/MPlayer/patches/
-patchfiles      asmrules_fix_20061231.diff \
-                cddb_fix_20070605.diff
-distname        ${name}-${distversion}
 use_bzip2       yes
 checksums       ${distname}${extract.suffix} \
-                    md5 18c05d88e22c3b815a43ca8d7152ccdc \
-                    sha1 a450c0b0749c343a8496ba7810363c9d46dfa73c \
-                    rmd160 8cea02e832aec5d9e090829d61d0f131dcc177a2 \
-                asmrules_fix_20061231.diff \
-                    md5 f0b71c38b1207c1d604be091876ac051 \
-                    sha1 84412f4bd85d64a92586ca4db7e8585d16cd1acd \
-                    rmd160 370877b45b314c9deb2d89739f8067a4a77c0844 \
-                cddb_fix_20070605.diff \
-                    md5 bd8a233ea31c6686a956387ad28c5c5c \
-                    sha1 4ed701ae65ede2f3510668be85d1efb093dc1f3c \
-                    rmd160 0bf83ef398927ef28b5bf4287f1a1e9bb3bd4454
+                    md5 7e27e535c2d267637df34898f1b91707 \
+                    sha1 e9b496f3527c552004ec6d01d6b43f196b43ce2d \
+                    rmd160 3b5cba1529856a177a5191e22f8dcc00b5a83c52
 
-
 livecheck.check     regex
 livecheck.url       http://www1.mplayerhq.hu/MPlayer/releases/
 livecheck.regex     MPlayer-(1.0rc\[0-9\]+)\.tar\.bz2
@@ -59,19 +46,13 @@
                 port:libvorbis port:lzo2 port:ncurses port:zlib
 depends_build   port:pkgconfig
 
-
-post-patch {
-    reinplace "s|-llzo|-llzo2|g" ${worksrcpath}/configure
-    reinplace \
-        "s|#include <lzo1x.h>|#include <lzoutil.h>\\\n#include <lzo1x.h>|g"\
-        ${worksrcpath}/libmpcodecs/vd_lzo.c
-}
-
 # MPlayer's ./configure REALLY does not want you to use ENV for this
 configure.cflags    {}
 configure.cxxflags  {}
 configure.cppflags  {}
 configure.ldflags   {}
+# And the assembler has issues with -pipe
+#configure.pipe      no
 
 configure.args \
         --with-extraincdir=${prefix}/include/lzo:${prefix}/include \
@@ -79,8 +60,8 @@
         --datadir=${prefix}/share/${name} \
         --confdir=${prefix}/etc/${name} \
         --mandir=${prefix}/share/man \
-        --enable-png --enable-jpeg --enable-liblzo --enable-libvorbis \
-        --enable-mad --enable-mpdvdkit --disable-faad-external \
+        --enable-gif --enable-png --enable-jpeg --enable-liblzo \
+        --enable-libvorbis --enable-mad --disable-faad-external \
         --enable-largefiles
 
 # MPlayer autodetects many support libs.  To prevent undeclared
@@ -91,10 +72,9 @@
         --disable-dvdread --disable-cdparanoia --disable-freetype \
         --disable-fontconfig --disable-unrarlib --disable-fribidi \
         --disable-enca --disable-libcdio --disable-xvid \
-        --disable-x264 --disable-nut --disable-libfame \
-        --disable-speex --disable-theora --disable-faac \
-        --disable-ladspa --disable-libdv --disable-toolame \
-        --disable-twolame --disable-xmms --disable-libdts \
+        --disable-x264 --disable-speex --disable-theora \
+        --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-esd --disable-lirc
@@ -129,7 +109,7 @@
     configure.args-append   --enable-freetype --enable-menu
 }
 
-variant fribidi \
+variant fribidi requires osd \
     description {Enable FriBidi Unicode support} {
     depends_lib-append      port:fribidi
     configure.args-delete   --disable-fribidi
@@ -137,7 +117,7 @@
 }
 
 variant lirc \
-    description {Enable Linux Infrared Remote Daemon} {
+    description {Enable Linux Infrared Remote Daemon support} {
     depends_lib-append      port:lirc
     configure.args-delete   --disable-lirc
 }
@@ -146,8 +126,7 @@
 
 variant nodvd \
     description {Disable DVD and DeCSS support} {
-    configure.args-delete   --enable-mpdvdkit
-    configure.args-append   --disable-mpdvdkit
+    configure.args-append   --disable-dvdread-internal --disable-libdvdcss-internal
 }
 
 variant smb \
@@ -178,7 +157,6 @@
     description {Enable XviD encoding} {
     depends_lib-append      port:XviD
     configure.args-delete   --disable-xvid
-    configure.args-append   --enable-xvid
 }
 
 ## Needs 20070316 snapshot of x264 or later
@@ -186,19 +164,8 @@
     description {Enable H.264 encoding} {
     depends_lib-append      port:x264
     configure.args-delete   --disable-x264
-    configure.args-append   --enable-x264
-    # upstream ./configure broken, fixed in mplayer-svn.
-    post-patch {
-        reinplace \
-            "s|if test \"\$_x264\" = yes ; then|if test \"\$_x264\" = yes ; then\\\n  _ld_x264=-lx264|g" \
-            ${worksrcpath}/configure
-    }
 }
 
-# binary_codecs replaced 'variant real'
-variant real requires binary_codecs \
-    description {Deprecated: use binary_codecs instead} {}
-
 variant binary_codecs \
     description {Enable platform-specific binary codecs} {
     if {[variant_isset darwin_powerpc]} {
@@ -259,7 +226,6 @@
     description {Enable Speex playback} {
     depends_lib-append      port:speex-devel
     configure.args-delete   --disable-speex
-    #configure.args-append   --enable-speex
 }
 
 variant faac \
@@ -345,9 +311,3 @@
     # bits of libstdc++ are needed during linking
     build.env           LD=c++
 }
-
-platform darwin i386 {
-    configure.args-append   --disable-win32 --disable-mp3lib
-}
-
-platform darwin powerpc {}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071220/9839e1ee/attachment.html


More information about the macports-changes mailing list