[66366] trunk/dports/multimedia/VLC/Portfile

[mnick at macports.org]

Revision: 66366
          http://trac.macports.org/changeset/66366
Author:   mnick at macports.org
Date:     2010-04-10 03:34:53 -0700 (Sat, 10 Apr 2010)
Log Message:
-----------
add hard dependency on live555 and remove its variant (closes #22644)

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

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2010-04-10 09:55:17 UTC (rev 66365)
+++ trunk/dports/multimedia/VLC/Portfile	2010-04-10 10:34:53 UTC (rev 66366)
@@ -1,11 +1,12 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
+# -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id $
 
 PortSystem          1.0
 
 name                VLC
 version             1.0.5
-revision        1
+revision            2
 
 categories          multimedia
 
@@ -35,7 +36,8 @@
                 port:libvorbis port:libmatroska port:libid3tag \
                 port:ncurses port:lua port:libpng port:jpeg \
                 port:libdvdplay port:libdvdnav path:lib/libavcodec.dylib:ffmpeg \
-                port:gnutls port:taglib port:libxml2 port:faad2
+                port:gnutls port:taglib port:libxml2 port:faad2 \
+                port:live555
 
 pre-fetch {
     if {"darwin" == ${os.platform} && ${os.major} < 9} {
@@ -65,15 +67,16 @@
 # VLC currently doesn't build with 10.6sdk, force 10.5sdk (#21487)
 configure.args-append   --disable-macosx-defaults \
     --enable-release --enable-macosx --enable-macosx-audio --enable-a52 --enable-cddax \
-    --enable-dvdnav --enable-dvdread --enable-faad --enable-flac \
+    --enable-dvdnav --enable-dvdread --enable-faad --enable-flac --enable-live555 \
     --enable-vorbis --enable-ogg --enable-mad --disable-libass --enable-asademux \
     --enable-dca --enable-gnutls --enable-ncurses --enable-png --enable-realrtsp \
     --with-macosx-version-min=10.5 \
     --with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk \
+    --with-live555-tree=${prefix}/lib/live \
     --disable-debug --disable-x11 --disable-xvideo --disable-glx --disable-xinerama \
     --disable-xcb --disable-xvmc --disable-qt4 --disable-quicktime \
     --disable-skins2 --disable-notify --disable-telepathy --disable-twolame \
-    --disable-speex --disable-theora --disable-x264 --disable-live555 --disable-dvbpsi \
+    --disable-speex --disable-theora --disable-x264 --disable-dvbpsi \
     --disable-vcdx  --disable-fontconfig --disable-freetype \
     --disable-dbus --disable-bonjour --disable-fribidi --disable-goom \
     --disable-growl --disable-sdl --disable-caca --disable-smb \
@@ -97,13 +100,6 @@
     configure.args-append   --enable-twolame
 }
 
-variant live555 description {Enable Live555 streaming media support} {
-    depends_lib-append      port:live555
-    configure.args-delete   --disable-live555
-    configure.args-append   --enable-live555 \
-                            --with-live555-tree=${prefix}/lib/live
-}
-
 variant speex description {Enable Speex decoder support} {
     depends_lib-append      path:lib/libspeex.dylib:speex
     configure.args-delete   --disable-speex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100410/95ae41f2/attachment.html>