<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117408] trunk/dports/multimedia/VLC-devel/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117408">117408</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-02-25 11:32:23 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC-devel: Simplify variants and update dependencies (#41725)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCdevelPortfile">trunk/dports/multimedia/VLC-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaVLCdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/Portfile (117407 => 117408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/Portfile 2014-02-25 18:28:14 UTC (rev 117407)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-02-25 19:32:23 UTC (rev 117408)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name VLC-devel
</span><span class="cx"> version 2.1.99
</span><del>-revision 5
</del><ins>+revision 6
</ins><span class="cx">
</span><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,14 @@
</span><span class="cx"> port:fluidsynth port:libsamplerate port:libupnp \
</span><span class="cx"> port:avahi path:lib/libavcodec.dylib:ffmpeg \
</span><span class="cx"> port:openjpeg15 port:libbluray \
</span><del>- port:libdc1394 port:libmpeg2
</del><ins>+ port:libdc1394 port:libmpeg2 port:dirac port:libass port:libsdl \
+ port:libsdl_image port:schroedinger port:speex port:libmodplug \
+ port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi \
+ port:XviD port:bzip2 port:gettext port:glib2 port:gmp \
+ port:libgpg-error port:libiconv port:libidn port:libsndfile \
+ port:libusb port:nettle port:openssl port:orc port:p11-kit \
+ port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \
+ port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender
</ins><span class="cx">
</span><span class="cx"> # TODO: live555 opencv FreeRDP
</span><span class="cx">
</span><span class="lines">@@ -121,38 +128,37 @@
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --with-contrib=${worksrcpath}/contrib \
</span><span class="cx"> --disable-debug --disable-update-check --enable-gnutls \
</span><del>- --disable-notify --disable-telepathy --disable-dbus \
</del><ins>+ --disable-notify --disable-dbus --enable-lua \
</ins><span class="cx"> --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
</span><del>- --enable-libproxy --enable-lua
</del><span class="cx">
</span><span class="cx"> # Input Plugins
</span><span class="cx"> # build fails when FreeRDP is installed
</span><span class="cx"> # build fails when opencv is installed
</span><span class="cx"> configure.args-append \
</span><del>- --enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \
</del><ins>+ --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
</ins><span class="cx"> --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
</span><del>- --disable-freerdp --disable-opencv \
</del><ins>+ --disable-libfreerdp --disable-opencv \
</ins><span class="cx"> --enable-sftp
</span><span class="cx">
</span><span class="cx"> # Mux/Demux Plugins
</span><span class="cx"> configure.args-append \
</span><del>- --disable-dvbpsi --enable-ogg --enable-mux_ogg \
- --enable-mkv --disable-mod --disable-mpc --disable-shout
</del><ins>+ --enable-dvbpsi --enable-ogg --enable-mux_ogg \
+ --enable-mkv --enable-mod --enable-mpc --disable-shout
</ins><span class="cx">
</span><span class="cx"> # Codec Plugins
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --enable-a52 --enable-faad --enable-flac --disable-live555 \
</span><del>- --enable-opus --enable-vorbis --enable-ogg --enable-mad --disable-libass \
</del><ins>+ --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
</ins><span class="cx"> --enable-dca --enable-png --disable-quicktime --enable-twolame \
</span><del>- --disable-speex --enable-theora --enable-x264 --enable-postproc \
</del><ins>+ --enable-speex --enable-theora --enable-x264 --enable-postproc \
</ins><span class="cx"> --enable-avcodec --enable-avformat --enable-swscale \
</span><del>- --enable-fluidsynth
</del><ins>+ --disable-fluidsynth --enable-dirac --enable-schroedinger
</ins><span class="cx">
</span><span class="cx"> # Video Plugins
</span><span class="cx"> configure.args-append \
</span><del>- --disable-caca --disable-sdl --disable-macosx-vout \
</del><ins>+ --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
</ins><span class="cx"> --without-x --disable-xcb --disable-xvideo --disable-glx \
</span><del>- --disable-fontconfig --disable-freetype --disable-fribidi \
</del><ins>+ --enable-freetype --enable-fontconfig --enable-fribidi \
</ins><span class="cx"> --disable-svg
</span><span class="cx">
</span><span class="cx"> # Audio Plugins
</span><span class="lines">@@ -162,20 +168,20 @@
</span><span class="cx"> # Interface Plugins
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --disable-macosx --disable-macosx-dialog-provider \
</span><del>- --disable-qt4 --enable-ncurses --disable-skins2
</del><ins>+ --disable-qt --enable-ncurses --disable-skins2
</ins><span class="cx">
</span><span class="cx"> # Visualisations and Video Filter Plugins
</span><span class="cx"> configure.args-append \
</span><del>- --disable-goom --disable-glspectrum
</del><ins>+ --disable-goom
</ins><span class="cx">
</span><span class="cx"> # Service Discovery Plugins
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --enable-bonjour --enable-upnp
</span><span class="cx">
</span><del>-variant jack description {Enable jack plugin for audio output} {
- depends_lib-append port:jack
- configure.args-delete --disable-jack
- configure.args-append --enable-jack
</del><ins>+variant jack description {Enable jack and fluidsynth plugins for audio output} {
+ depends_lib-append port:jack port:fluidsynth port:portaudio
+ configure.args-delete --disable-jack --disable-fluidsynth
+ configure.args-append --enable-jack --enable-fluidsynth
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant qtkit description {Enable qtcapture and qtaudio} {
</span><span class="lines">@@ -183,24 +189,13 @@
</span><span class="cx"> configure.args-append --enable-macosx-qtkit
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant eyetv description {Enable eyetv plugin} {
- configure.args-delete --disable-macosx-eyetv
- configure.args-append --enable-macosx-eyetv
-}
-
-variant speex description {Enable Speex decoder support} {
- depends_lib-append path:lib/libspeex.dylib:speex
- configure.args-delete --disable-speex
- configure.args-append --enable-speex
-}
-
</del><span class="cx"> variant svg description {Enable SVG support} {
</span><span class="cx"> depends_lib-append port:librsvg
</span><span class="cx"> configure.args-delete --disable-svg
</span><span class="cx"> configure.args-append --enable-svg
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant shout description {Enable Shoutcast support} {
</del><ins>+variant shout description {Enable Shoutcast/Icecast streaming output support} {
</ins><span class="cx"> depends_lib-append port:libshout2
</span><span class="cx"> configure.args-delete --disable-shout
</span><span class="cx"> configure.args-append --enable-shout
</span><span class="lines">@@ -224,50 +219,14 @@
</span><span class="cx"> # configure.args-append --enable-vcdx
</span><span class="cx"> #}
</span><span class="cx">
</span><del>-variant mod description {Enable MOD demuxer support} {
- depends_lib-append port:libmodplug
- configure.args-delete --disable-mod
- configure.args-append --enable-mod
-}
-
-variant mpc description {enable Musepack Decoder library support} {
- depends_lib-append port:libmpcdec
- configure.args-delete --disable-mpc
- configure.args-append --enable-mpc
-}
-
-variant dvb description {enable DVB Program Specific Information support} {
- depends_lib-append port:libdvbpsi
- configure.args-delete --disable-dvbpsi
- configure.args-append --enable-dvbpsi
-}
-
-variant osd description {Enable onscreen display and TrueType font support} {
- depends_lib-append port:fontconfig port:freetype
- configure.args-delete --disable-freetype --disable-fontconfig
- configure.args-append --enable-freetype --enable-fontconfig
-}
-
-variant fribidi requires osd description {Enable FriBidi Unicode support} {
- depends_lib-append port:fribidi
- configure.args-delete --disable-fribidi
- configure.args-append --enable-fribidi
-}
-
-variant sdl description {Enable SDL/SDL-Image support} {
- depends_lib-append port:libsdl port:libsdl_image
- configure.args-delete --disable-sdl
- configure.args-append --enable-sdl
-}
-
-variant smb description {Enable Samba 3 support} {
</del><ins>+variant smb description {Enable Samba 3 input support} {
</ins><span class="cx"> depends_lib-append port:samba3
</span><del>- configure.args-delete --disable-smb
- configure.args-append --enable-smb
</del><ins>+ configure.args-delete --disable-smbclient
+ configure.args-append --enable-smbclient
</ins><span class="cx"> configure.ldflags-append -L${prefix}/lib/samba3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant x11 {
</del><ins>+variant x11 description {Build using X11 UI. Use at own risk} {
</ins><span class="cx"> depends_lib-append \
</span><span class="cx"> port:mesa \
</span><span class="cx"> port:xorg-libXinerama \
</span><span class="lines">@@ -276,14 +235,14 @@
</span><span class="cx"> port:xorg-xcb-util \
</span><span class="cx"> port:xorg-xcb-util-keysyms
</span><span class="cx">
</span><del>- configure.args-delete --without-x --disable-xvideo --disable-glx --disable-glspectrum --disable-xcb
</del><ins>+ configure.args-delete --without-x --disable-xvideo --disable-glx --disable-xcb
</ins><span class="cx"> configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib \
</span><del>- --enable-xvideo --enable-glx --enable-glspectrum --enable-xcb
</del><ins>+ --enable-xvideo --enable-glx --enable-xcb
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant qt4 description {Build using QT4 UI. This will use qt4-mac} {
- configure.args-delete --disable-qt4
- configure.args-append --enable-qt4
</del><ins>+variant qt4 description {Build using QT4 UI. This will use qt4-mac. Experimental} {
+ configure.args-delete --disable-qt
+ configure.args-append --enable-qt
</ins><span class="cx">
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="lines">@@ -300,10 +259,8 @@
</span><span class="cx"> configure.args-append --enable-macosx --enable-macosx-dialog-provider
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +mod +mpc +osd +quartz
-
</del><span class="cx"> variant huge \
</span><del>- requires dvb eyetv fribidi jack mod mpc osd sdl shout speex svg vcd \
</del><ins>+ requires jack shout svg vcd \
</ins><span class="cx"> description {Enable all variants except quartz, qt4, smb, and x11} {}
</span><span class="cx">
</span><span class="cx"> variant full \
</span><span class="lines">@@ -311,14 +268,13 @@
</span><span class="cx"> description {Enable all variants} {}
</span><span class="cx">
</span><span class="cx"> platform macosx {
</span><del>- default_variants-append +qtkit
</del><ins>+ default_variants-append +quartz +qtkit
</ins><span class="cx">
</span><span class="cx"> configure.args-delete \
</span><del>- --disable-macosx-vout --disable-macosx-audio \
</del><ins>+ --disable-macosx-vout --disable-macosx-audio --disable-macosx-eyetv
</ins><span class="cx">
</span><span class="cx"> configure.args-append \
</span><del>- --enable-macosx-vout --enable-macosx-audio \
- --with-macosx-sdk=/
</del><ins>+ --enable-macosx-vout --enable-macosx-audio --enable-macosx-eyetv
</ins><span class="cx">
</span><span class="cx"> if {[variant_isset qt4] || [variant_isset quartz]} {
</span><span class="cx"> configure.args-delete --disable-macosx-vlc-app
</span><span class="lines">@@ -328,14 +284,14 @@
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s/Appkit/AppKit/" ${worksrcpath}/configure.ac
</span><span class="cx"> reinplace "/Sparkle.framework/d" \
</span><del>- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</del><ins>+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</ins><span class="cx"> reinplace "/SDKROOT/d" \
</span><del>- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</del><ins>+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</ins><span class="cx"> reinplace "/Growl.framework/d" \
</span><span class="cx"> ${worksrcpath}/extras/package/macosx/package.mak
</span><span class="cx">
</span><span class="cx"> reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
</span><del>- ${worksrcpath}/Makefile.am
</del><ins>+ ${worksrcpath}/Makefile.am
</ins><span class="cx">
</span><span class="cx"> reinplace "/argv/s/environ/*_NSGetEnviron()/" \
</span><span class="cx"> ${worksrcpath}/modules/misc/inhibit/xdg.c \
</span><span class="lines">@@ -355,7 +311,7 @@
</span><span class="cx"> eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span><span class="cx">
</span><span class="cx"> if {[variant_isset qt4] || [variant_isset quartz]} {
</span><del>- file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
</del><ins>+ file copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
</ins><span class="cx">
</span><span class="cx"> # These are already in ${prefix}, so we don't need to bundle them as well
</span><span class="cx"> file delete -force ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
</span></span></pre>
</div>
</div>
</body>
</html>