<!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>[125484] trunk/dports/multimedia/VLC</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/125484">125484</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-09-18 08:08:20 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC: update to version 2.1.5, dependencies, configuration, variants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCPortfile">trunk/dports/multimedia/VLC/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesqtkitpatch">trunk/dports/multimedia/VLC/files/qtkit.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaVLCPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/Portfile (125483 => 125484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/Portfile 2014-09-18 14:34:29 UTC (rev 125483)
+++ trunk/dports/multimedia/VLC/Portfile 2014-09-18 15:08:20 UTC (rev 125484)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name VLC
</span><del>-version 2.1.4
-revision 1
</del><ins>+version 2.1.5
</ins><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -34,54 +33,25 @@
</span><span class="cx"> distname vlc-${version}
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums md5 7ed67d22f7425011078772bfc62ac222 \
- sha1 53896c88947803193a21fb4619f34034bad05920 \
- rmd160 4934dea1d9399500fc1ba90e8ee9436604791cdc
-
</del><ins>+checksums md5 3941b561f590cc95ca5e795213cba2f2 \
+ sha1 7f1cb6324a04cf393896bbb5976ca9febd7b3efc \
+ rmd160 4a18210f0f01ac8dfaf166926ab10eea6d97fbae
+
</ins><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib \
</span><del>- port:a52dec \
- port:avahi \
- port:dirac \
- port:faad2 \
- path:lib/libavcodec.dylib:ffmpeg \
- port:flac \
- port:fluidsynth \
- port:gnutls \
</del><span class="cx"> port:jpeg \
</span><span class="cx"> port:lame \
</span><del>- port:libbluray \
- port:libcddb \
</del><span class="cx"> port:libcdio \
</span><del>- port:libdc1394 \
- port:libdca \
- port:libdvdnav \
- port:libdvdread \
</del><span class="cx"> port:libebml \
</span><span class="cx"> port:libgcrypt \
</span><span class="cx"> port:libid3tag \
</span><del>- port:libmad \
</del><span class="cx"> port:libmatroska \
</span><span class="cx"> port:libmpeg2 \
</span><del>- port:libogg \
- port:libopus \
- port:libpng \
- port:libsamplerate \
- port:libssh2 \
- port:libtheora \
- port:libupnp \
- port:libvorbis \
</del><span class="cx"> port:libxml2 \
</span><del>- port:lua \
- port:ncurses \
</del><span class="cx"> port:openjpeg15 \
</span><del>- port:pulseaudio \
- port:schroedinger \
</del><span class="cx"> port:taglib \
</span><span class="cx"> port:tiff \
</span><del>- port:twolame \
- port:x264
</del><span class="cx">
</span><span class="cx"> # TODO: live555 opencv FreeRDP
</span><span class="cx">
</span><span class="lines">@@ -136,105 +106,213 @@
</span><span class="cx"> livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
</span><span class="cx">
</span><span class="cx"> # Other
</span><ins>+
+depends_lib-append port:gnutls \
+ port:lua
+
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> --with-contrib=${worksrcpath}/contrib \
</span><del>- --disable-debug --disable-update-check --enable-gnutls \
- --disable-notify --disable-dbus \
- --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
</del><ins>+ --disable-debug \
+ --disable-update-check \
+ --disable-dbus \
+ --disable-growl \
+ --disable-macosx-vlc-app \
+ --disable-notify \
+ --enable-gnutls \
</ins><span class="cx"> --enable-lua
</span><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><ins>+
+depends_lib-append \
+ port:libbluray \
+ port:libcddb \
+ port:libdc1394 \
+ port:libdvdnav \
+ port:libdvdread \
+ port:libssh2
+
</ins><span class="cx"> configure.args-append \
</span><del>- --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
- --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
- --disable-libfreerdp --enable-dc1394 --disable-dv1394 --disable-opencv \
- --enable-sftp --disable-libvnc --disable-decklink
</del><ins>+ --disable-decklink \
+ --disable-dv1394 \
+ --disable-gnomevfs \
+ --disable-libfreerdp \
+ --disable-libvnc \
+ --disable-linsys \
+ --disable-macosx-eyetv \
+ --disable-macosx-qtkit \
+ --disable-macosx-avfoundation \
+ --disable-opencv \
+ --disable-realrtsp \
+ --disable-smbclient \
+ --disable-v4l2 \
+ --disable-vcdx \
+ --enable-bluray \
+ --enable-dc1394 \
+ --enable-dvdnav \
+ --enable-dvdread \
+ --enable-libcddb \
+ --enable-sftp \
+ --enable-vcd
</ins><span class="cx">
</span><span class="cx"> # Mux/Demux Plugins
</span><ins>+depends_lib-append \
+ port:libogg
+
</ins><span class="cx"> configure.args-append \
</span><del>- --disable-dvbpsi --enable-ogg --enable-mux_ogg \
- --enable-mkv --disable-mod --disable-mpc \
- --disable-sid --disable-shout
</del><ins>+ --disable-dvbpsi \
+ --disable-gme \
+ --disable-mod \
+ --disable-mpc \
+ --disable-sid \
+ --disable-shout \
+ --enable-mkv \
+ --enable-mux_ogg \
+ --enable-ogg
</ins><span class="cx">
</span><span class="cx"> # Codec Plugins
</span><ins>+
+depends_lib-append \
+ port:a52dec \
+ path:lib/libavcodec.dylib:ffmpeg \
+ port:libdca \
+ port:dirac \
+ port:faad2 \
+ port:flac \
+ port:fluidsynth \
+ port:libmad \
+ port:libopus \
+ port:libpng \
+ port:schroedinger \
+ port:libtheora \
+ port:twolame \
+ port:libvorbis \
+ port:x264
+
+
</ins><span class="cx"> configure.args-append \
</span><del>- --enable-a52 --enable-faad --enable-flac --disable-live555 \
- --enable-opus --enable-vorbis --enable-ogg --enable-mad --disable-libass \
- --enable-dca --enable-png --disable-quicktime --enable-twolame \
- --disable-speex --enable-theora --enable-x264 --enable-postproc \
- --enable-avcodec --enable-avformat --enable-swscale \
- --enable-fluidsynth --disable-kate --disable-libva \
- --disable-quicksync --disable-zvbi --disable-tiger --enable-telx \
- --enable-dirac --enable-schroedinger
</del><ins>+ --disable-crystalhd \
+ --disable-dxva2 \
+ --disable-fdkaac \
+ --disable-kate \
+ --disable-libass \
+ --disable-libva \
+ --disable-live555 \
+ --disable-omxil \
+ --disable-omxil-vout \
+ --disable-quicksync \
+ --disable-quicktime \
+ --disable-rpi-omxil \
+ --disable-speex \
+ --disable-tiger \
+ --disable-wma-fixed \
+ --disable-shine \
+ --disable-zvbi \
+ --enable-a52 \
+ --enable-avcodec \
+ --enable-avformat \
+ --enable-dca \
+ --enable-dirac \
+ --enable-faad \
+ --enable-flac \
+ --enable-fluidsynth \
+ --enable-mad \
+ --enable-opus \
+ --enable-png \
+ --enable-postproc \
+ --enable-schroedinger \
+ --enable-swscale \
+ --enable-telx \
+ --enable-theora \
+ --enable-twolame \
+ --enable-vorbis \
+ --enable-x264
</ins><span class="cx">
</span><span class="cx"> # Video Plugins
</span><ins>+
</ins><span class="cx"> configure.args-append \
</span><del>- --disable-caca --disable-sdl --disable-macosx-vout \
- --without-x --disable-xcb --disable-xvideo --disable-glx \
- --disable-fontconfig --disable-freetype --disable-fribidi \
- --disable-svg
</del><ins>+ --without-x \
+ --disable-aa \
+ --disable-caca \
+ --disable-egl \
+ --disable-fontconfig \
+ --disable-freetype \
+ --disable-fribidi \
+ --disable-gles1 \
+ --disable-gles2 \
+ --disable-glx \
+ --disable-macosx-vout \
+ --disable-sdl \
+ --disable-sdl-image \
+ --disable-svg \
+ --disable-vdpau \
+ --disable-xcb \
+ --disable-xvideo
</ins><span class="cx">
</span><span class="cx"> # Audio Plugins
</span><ins>+depends_lib-append \
+ port:libsamplerate \
+ port:pulseaudio
+
</ins><span class="cx"> configure.args-append \
</span><del>- --disable-macosx-audio --disable-jack --enable-samplerate \
- --disable-chromaprint
</del><ins>+ --disable-chromaprint \
+ --disable-jack \
+ --disable-macosx-audio \
+ --enable-pulse \
+ --enable-samplerate
</ins><span class="cx">
</span><span class="cx"> # Interface Plugins
</span><ins>+depends_lib-append \
+ port:ncurses
+
</ins><span class="cx"> configure.args-append \
</span><del>- --disable-macosx --disable-macosx-dialog-provider \
- --disable-qt --enable-ncurses --disable-skins2
</del><ins>+ --disable-macosx \
+ --disable-macosx-dialog-provider \
+ --disable-qt \
+ --disable-skins2 \
+ --enable-ncurses
</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-projectm --disable-vsxu
</del><ins>+ --disable-goom \
+ --disable-projectm \
+ --disable-vsxu
</ins><span class="cx">
</span><span class="cx"> # Service Discovery Plugins
</span><ins>+depends_lib-append \
+ port:avahi \
+ port:libupnp
+
</ins><span class="cx"> configure.args-append \
</span><del>- --enable-bonjour --enable-upnp \
- --disable-udev --disable-mtp
</del><ins>+ --disable-mtp \
+ --disable-udev \
+ --enable-bonjour \
+ --enable-upnp
</ins><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
-}
-
-variant qtkit description {Enable qtcapture and qtaudio} {
- configure.args-delete --disable-macosx-qtkit
- configure.args-append --enable-macosx-qtkit
-}
-
</del><span class="cx"> variant eyetv description {Enable eyetv plugin} {
</span><span class="cx"> configure.args-delete --disable-macosx-eyetv
</span><span class="cx"> configure.args-append --enable-macosx-eyetv
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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><ins>+variant dvb description {enable DVB Program Specific Information support} {
+ depends_lib-append port:libdvbpsi
+ configure.args-delete --disable-dvbpsi
+ configure.args-append --enable-dvbpsi
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant svg description {Enable SVG support} {
- depends_lib-append port:librsvg
- configure.args-delete --disable-svg
- configure.args-append --enable-svg
</del><ins>+variant fribidi requires osd description {Enable FriBidi Unicode support} {
+ depends_lib-append port:fribidi
+ configure.args-delete --disable-fribidi
+ configure.args-append --enable-fribidi
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant shout description {Enable Shoutcast support} {
- depends_lib-append port:libshout2
- configure.args-delete --disable-shout
- configure.args-append --enable-shout
</del><ins>+variant jack description {Enable jack plugin for audio output} {
+ depends_lib-append port:jack
+ configure.args-delete --disable-jack
+ configure.args-append --enable-jack
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant vcd description {Enable VCD support} {
- depends_lib-append port:vcdimager
- configure.args-delete --disable-vcdx
- configure.args-append --enable-vcdx
-}
-
</del><span class="cx"> variant mod description {Enable MOD demuxer support} {
</span><span class="cx"> depends_lib-append port:libmodplug
</span><span class="cx"> configure.args-delete --disable-mod
</span><span class="lines">@@ -247,22 +325,15 @@
</span><span class="cx"> configure.args-append --enable-mpc
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant dvb description {enable DVB Program Specific Information support} {
- depends_lib-append port:libdvbpsi
- configure.args-delete --disable-dvbpsi
- configure.args-append --enable-dvbpsi
-}
-
</del><span class="cx"> variant osd description {Enable onscreen display and TrueType font support} {
</span><span class="cx"> depends_lib-append port:fontconfig port:freetype
</span><span class="cx"> configure.args-delete --disable-freetype --disable-fontconfig
</span><span class="cx"> configure.args-append --enable-freetype --enable-fontconfig
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant fribidi requires osd description {Enable FriBidi Unicode support} {
- depends_lib-append port:fribidi
- configure.args-delete --disable-fribidi
- configure.args-append --enable-fribidi
</del><ins>+variant qtkit description {Enable qtcapture and qtaudio} {
+ configure.args-delete --disable-macosx-qtkit
+ configure.args-append --enable-macosx-qtkit
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant sdl description {Enable SDL/SDL-Image support} {
</span><span class="lines">@@ -271,6 +342,12 @@
</span><span class="cx"> configure.args-append --enable-sdl
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant shout description {Enable Shoutcast support} {
+ depends_lib-append port:libshout2
+ configure.args-delete --disable-shout
+ configure.args-append --enable-shout
+}
+
</ins><span class="cx"> variant smb description {Enable Samba 3 support} {
</span><span class="cx"> depends_lib-append port:samba3
</span><span class="cx"> configure.args-delete --disable-smbclient
</span><span class="lines">@@ -278,6 +355,24 @@
</span><span class="cx"> configure.ldflags-append -L${prefix}/lib/samba3
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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
+}
+
+variant svg description {Enable SVG support} {
+ depends_lib-append port:librsvg
+ configure.args-delete --disable-svg
+ configure.args-append --enable-svg
+}
+
+variant vcd description {Enable VCD support} {
+ depends_lib-append port:vcdimager
+ configure.args-delete --disable-vcdx
+ configure.args-append --enable-vcdx
+}
+
</ins><span class="cx"> variant x11 {
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:mesa \
</span><span class="lines">@@ -287,9 +382,16 @@
</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-xcb
- configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib \
- --enable-xvideo --enable-glx --enable-xcb
</del><ins>+ configure.args-delete --without-x \
+ --disable-glx \
+ --disable-xcb \
+ --disable-xvideo
+ configure.args-append --with-x \
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib \
+ --enable-glx \
+ --enable-xcb \
+ --enable-xvideo
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant qt4 description {Build using QT4 UI. This will use qt4-mac} {
</span><span class="lines">@@ -307,8 +409,13 @@
</span><span class="cx">
</span><span class="cx"> variant quartz {
</span><span class="cx"> depends_lib-append port:BGHUDAppKit
</span><del>- configure.args-delete --disable-macosx --disable-macosx-dialog-provider
- configure.args-append --enable-macosx --enable-macosx-dialog-provider
</del><ins>+ configure.args-delete --disable-macosx \
+ --disable-macosx-avfoundation \
+ --disable-macosx-dialog-provider \
+
+ configure.args-append --enable-macosx \
+ --enable-macosx-avfoundation \
+ --enable-macosx-dialog-provider
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +mod +mpc +osd +quartz
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesqtkitpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/qtkit.patch (125483 => 125484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/qtkit.patch 2014-09-18 14:34:29 UTC (rev 125483)
+++ trunk/dports/multimedia/VLC/files/qtkit.patch 2014-09-18 15:08:20 UTC (rev 125484)
</span><span class="lines">@@ -6,14 +6,3 @@
</span><span class="cx"> SUBDIRS = rtp
</span><span class="cx"> noinst_LTLIBRARIES =
</span><span class="cx">
</span><del>---- modules/access/qtsound.m
-+++ modules/access/qtsound.m
-@@ -40,7 +40,7 @@
- #include <vlc_dialog.h>
-
- //#define QTKIT_VERSION_MIN_REQUIRED 70603
--#define QTKIT_VERSION_MAX_ALLOWED 70700
-+//#define QTKIT_VERSION_MAX_ALLOWED 70700
-
- #import <QTKit/QTKit.h>
-
</del></span></pre>
</div>
</div>
</body>
</html>