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

source_changes at macosforge.org source_changes at macosforge.org
Sun Jun 24 12:45:27 PDT 2007


Revision: 26463
          http://trac.macosforge.org/projects/macports/changeset/26463
Author:   pipping at macports.org
Date:     2007-06-24 12:45:27 -0700 (Sun, 24 Jun 2007)

Log Message:
-----------
maintainer update (#12157, #12158, #12159)

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

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2007-06-24 19:41:08 UTC (rev 26462)
+++ trunk/dports/multimedia/MPlayer/Portfile	2007-06-24 19:45:27 UTC (rev 26463)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 name                MPlayer
 version             1.0rc1
-revision            4
+revision            try3
 categories          multimedia
 maintainers         ecronin at gizmolabs.org \
                     openmaintainer at macports.org
@@ -29,7 +29,8 @@
                     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
+patchfiles          asmrules_fix_20061231.diff \
+                    cddb_fix_20070605.diff
 use_bzip2           yes
 
 checksums           ${distname}${extract.suffix} \
@@ -39,16 +40,27 @@
                     asmrules_fix_20061231.diff \
                         md5 f0b71c38b1207c1d604be091876ac051 \
                         sha1 84412f4bd85d64a92586ca4db7e8585d16cd1acd \
-                        rmd160 370877b45b314c9deb2d89739f8067a4a77c0844
+                        rmd160 370877b45b314c9deb2d89739f8067a4a77c0844 \
+                    cddb_fix_20070605.diff \
+                        md5 bd8a233ea31c6686a956387ad28c5c5c \
+                        sha1 4ed701ae65ede2f3510668be85d1efb093dc1f3c \
+                        rmd160 0bf83ef398927ef28b5bf4287f1a1e9bb3bd4454
 
 livecheck.check     regex
 livecheck.url       http://www1.mplayerhq.hu/MPlayer/releases/
 livecheck.regex     MPlayer-(1.0rc\[0-9\]+)\.tar\.bz2
 
 depends_lib         port:jpeg port:lame port:libiconv port:libmad \
-                    port:libpng port:libvorbis port:lzo port:ncurses \
-                    port:zlib
+                    port:libogg port:libpng port:libungif \
+                    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  {}
@@ -56,26 +68,26 @@
 configure.ldflags   {}
 
 configure.args \
-                    --with-extraincdir=${prefix}/include:${prefix}/include/cdparanoia/interface:${prefix}/include/cdparanoia/paranoia \
+                    --with-extraincdir=${prefix}/include:${prefix}/include/lzo \
                     --with-extralibdir=${prefix}/lib:${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 --disable-faad-external \
-                    --enable-largefiles
+                    --enable-mad --enable-mpdvdkit \
+                    --disable-faad-external --enable-largefiles
                     
 # 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 \
-                    --disable-dvdread --disable-mpdvdkit \
+                    --disable-dvdread \
                     --disable-cdparanoia --disable-freetype \
                     --disable-fontconfig --disable-unrarlib \
                     --disable-fribidi --disable-enca \
-                    --disable-gif --disable-libcdio --disable-xvid \
+                    --disable-libcdio --disable-xvid \
                     --disable-x264 --disable-nut --disable-libfame \
                     --disable-speex --disable-theora --disable-faac \
                     --disable-ladspa --disable-libdv --disable-toolame \
@@ -85,32 +97,37 @@
                     --disable-esd
 
 post-destroot {
-    file mkdir ${destroot}${prefix}/share/doc/${name}
+    xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
     eval file copy [glob ${worksrcpath}/DOCS/*] \
         ${destroot}${prefix}/share/doc/${name}
+    xinstall -d -m 0755 ${destroot}${prefix}/etc/${name}
+    foreach etcfile {codecs.conf dvb-menu.conf example.conf \
+                     input.conf menu.conf} {
+        xinstall -m 0644 ${worksrcpath}/etc/${etcfile} \
+            ${destroot}${prefix}/etc/${name}/${etcfile}
+    }
 }
 
 ##### Mplayer features
 
-# Install all possible languages for man pages
-variant man_all_lang {
+variant man_all_lang \
+    description {Install all possible languages for man pages} {
     configure.args-append --language=all
 }
 
+# Bundle all the font deps into one onscreen display variant
 # configure doesn't fully build up necessary flags when --enable-fontconfig
 # is used, so use autodetect instead
-variant fontconfig {
-    depends_lib-append      port:fontconfig
+variant osd \
+    description {Enable onscreen display and font support} {
+    depends_lib-append      port:fontconfig port:freetype
     configure.args-delete   --disable-fontconfig
-}
-
-variant freetype {
-    depends_lib-append      port:freetype
     configure.args-delete   --disable-freetype
-    configure.args-append   --enable-freetype
+    configure.args-append   --enable-freetype --enable-menu
 }
 
-variant fribidi {
+variant fribidi \
+    description {Enable FriBidi Unicode support} {
     depends_lib-append      port:fribidi
     configure.args-delete   --disable-fribidi
     #configure.args-append   --enable-fribidi
@@ -118,20 +135,22 @@
 
 ##### Inputs
 
-## Broken as of 10/25/06 (samba3 produces bad libsmbclient.dylib)
-#variant smb {
-#    depends_lib-append      port:samba3
-#    configure.args-delete   --disable-smb
-#    #configure.args-append   --enable-smb
-#}
+variant nodvd \
+    description {Disable DVD and DeCSS support} {
+    configure.args-delete   --enable-mpdvdkit
+    configure.args-append   --disable-mpdvdkit
+}
 
-variant dvdread {
-    depends_lib-append      port:libdvdread
-    configure.args-delete   --disable-dvdread
+variant smb \
+    description {Enable smb:// network support} {
+    depends_lib-append      port:samba3
+    configure.args-delete   --disable-smb
+    configure.args-append   --enable-smb
 }
 
 ## Broken as of 10/25/06 (version issue?)
-#variant cdparanoia {
+#variant cdparanoia 
+#    description {Enable CDDA support} {
 #    depends_lib-append      port:cdparanoia
 #    configure.args-delete   --disable-cdparanoia
 #    #configure.args-append   --enable-dvdread
@@ -139,41 +158,39 @@
 
 ##### External codecs
 
-variant gif {
-    depends_lib-append      port:libungif
-    configure.args-delete   --disable-gif
-}
-
-## Broken as of 10/25/06 (undefined symbol _read_toc)
-#variant cdio {
-#    depends_lib-append      port:libcdio
-#    configure.args-delete   --disable-libcdio
-#    #configure.args-append   --enable-libcdio
-#}
-
-variant theora {
+variant theora \
+    description {Enable OggTheora support} {
     depends_lib-append      port:libtheora
     configure.args-delete   --disable-theora
     configure.args-append   --enable-theora
 }
 
-variant xvid {
+variant xvid \
+    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
-variant x264 {
+variant x264 \
+    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 {}
+variant real requires binary_codecs \
+    description {Deprecated: use binary_codecs instead} {}
 
-variant binary_codecs {
+variant binary_codecs \
+    description {Enable platform-specific binary codecs} {
     if {[variant_isset darwin_powerpc]} {
         global mplayercodecs mplayercodecsfile
         set mplayercodecs           rp9codecs-macosx-20041107.pkg
@@ -232,61 +249,71 @@
     }
 }
 
-variant speex {
+variant speex \
+    description {Enable Speex playback} {
     depends_lib-append      port:speex-devel
     configure.args-delete   --disable-speex
     #configure.args-append   --enable-speex
 }
 
-variant faac {
+variant faac \
+    description {Enable AAC encoding} {
     depends_lib-append      port:faac
     configure.args-delete   --disable-faac
 }
 
-variant dv {
+variant dv \
+    description {Enable DV encoding} {
     depends_lib-append      port:libdv
     configure.args-delete   --disable-libdv
 }
 
-variant twolame {
+variant twolame \
+    description {Enable MPEG Audio Layer 2 encoding} {
     depends_lib-append      port:twolame
     configure.args-delete   --disable-twolame
 }
 
-variant dts {
+variant dts \
+    description {Enable non-passthrough DTS playback} {
     depends_lib-append      port:libdts
     configure.args-delete   --disable-libdts
 }
 
 ##### Outputs
 
-variant sdl {
+variant sdl \
+    description {Enable SDL video output} {
     depends_lib-append      port:libsdl
     configure.args-delete   --disable-sdl
 }
 
-variant aa {
+variant aa \
+    description {Enable animated ASCII art video output} {
     depends_lib-append      port:aalib
     configure.args-delete   --disable-aa
 }
 
-variant caca {
+variant caca \
+    description {Enable animated ASCII art video output} {
     depends_lib-append      port:libcaca
     configure.args-delete   --disable-caca
 }
 
-variant x11 requires freetype requires fontconfig {
+variant x11 {
     depends_lib-append      lib:libX11.6:XFree86
     configure.args-delete   --disable-x11
     configure.env-append    PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig
 }
 
-variant arts {
+variant arts \
+    description {Enable aRts audio output} {
     depends_lib-append      port:arts
     configure.args-delete   --disable-arts
 }
 
-variant esd {
+variant esd \
+    description {Enable EsounD audio output} {
     depends_lib-append      port:esound
     configure.args-delete   --disable-esd
 }

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


More information about the macports-changes mailing list