<!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>[146098] 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/146098">146098</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-02-27 02:27:22 -0800 (Sat, 27 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC: update to version 2.2.2, add libVLC; major rewrite (maintainer, closes #49051)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCPortfile">trunk/dports/multimedia/VLC/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesPR34741no__clang_version__patch">trunk/dports/multimedia/VLC/files/PR-34741-no__clang_version__.patch</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesbuildfixpackagemakpatch">trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesconfigureacnoarchpatch">trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesnosparklepatch">trunk/dports/multimedia/VLC/files/no-sparkle.patch</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchvlcformacportsdiff">trunk/dports/multimedia/VLC/files/patch-vlc-for-macports.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesstatic_assertpatch">trunk/dports/multimedia/VLC/files/static_assert.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCfilespatchforlua52diff">trunk/dports/multimedia/VLC/files/patch-for-lua52.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchnoopencv_examplediff">trunk/dports/multimedia/VLC/files/patch-no-opencv_example.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchopencv_includesdiff">trunk/dports/multimedia/VLC/files/patch-opencv_includes.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchsimplepreferencesdiff">trunk/dports/multimedia/VLC/files/patch-simplepreferences.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchvlcnoO4diff">trunk/dports/multimedia/VLC/files/patch-vlc-no-O4.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchvlcnoqt5diff">trunk/dports/multimedia/VLC/files/patch-vlc-no-qt5.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchvlcqtconfigureacdiff">trunk/dports/multimedia/VLC/files/patch-vlc-qt-configureac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCfilesclass_structpatch">trunk/dports/multimedia/VLC/files/class_struct.patch</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchbluraynoatomicsdiff">trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchffmpeg24diff">trunk/dports/multimedia/VLC/files/patch-ffmpeg-2.4.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchlua53diff">trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchvlcqt4macdiff">trunk/dports/multimedia/VLC/files/patch-vlc-qt4mac.diff</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 (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/Portfile 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/Portfile 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -3,60 +3,147 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><ins>+# TODO
+# if {[file exists ${prefix}/etc/macports/locales.tcl]} {
+# # experimental feature to cut down the NLS/locale files, which take up over 50% of
+# # the install footprint for VLC. This feature loads the locale_select PortGroup
+# # if its configuration file exist; a variant is then added which prunes all translations from
+# # ${destroot}${prefix}/share/locale except those whitelisted in etc/macports/locales.tcl .
+# PortGroup locale_select 1.0
+# }
+
</ins><span class="cx"> name VLC
</span><del>-version 2.1.5
-revision 8
-categories multimedia
</del><ins>+version 2.2.2
</ins><span class="cx">
</span><del>-maintainers gmail.com:rjvbertin openmaintainer
</del><ins>+categories multimedia devel
+maintainers nomaintainer
+
</ins><span class="cx"> description VLC is a cross-platform media player and streaming server
</span><span class="cx"> long_description VLC media player is a highly portable multimedia player for \
</span><span class="cx"> various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \
</span><span class="cx"> mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \
</span><span class="cx"> It can also be used as a server to stream in unicast or multicast \
</span><span class="cx"> in IPv4 or IPv6 on a high-bandwidth network.
</span><del>-license GPL
</del><span class="cx">
</span><del>-platforms darwin
-conflicts VLC-devel
-
</del><span class="cx"> homepage http://www.videolan.org
</span><span class="cx">
</span><del>-# http://git.videolan.org/?p=vlc.git
-# http://git.videolan.org/?p=vlc.git;a=forks
-#fetch.type git
-#git.url git://git.videolan.org/vlc/vlc-2.1.git
-#git.url git://git.videolan.org/vlc.git
-#git.branch edd88358218f273fddde646a172a2104796d46c2
</del><ins>+subport lib${name} {
+ maintainers gmail.com:rjvbertin openmaintainer
+ description the core engine and interface to VLC's multimedia framework
+ long_description libVLC is the core engine and the interface to the multimedia \
+ framework on which VLC media player is based. It allows developers \
+ to create a wide range of multimedia applications using the VLC features.
+ conflicts ${name} VLC-devel libVLC-devel
+ homepage http://www.videolan.org/vlc/libvlc.html
+}
</ins><span class="cx">
</span><ins>+if {${subport} eq ${name}} {
+ conflicts lib${name} libVLC-devel VLC-devel
+}
+
+license GPL-2
+
+platforms darwin
+
</ins><span class="cx"> master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
</span><span class="cx"> distname vlc-${version}
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums md5 3941b561f590cc95ca5e795213cba2f2 \
- sha1 7f1cb6324a04cf393896bbb5976ca9febd7b3efc \
- rmd160 4a18210f0f01ac8dfaf166926ab10eea6d97fbae
</del><ins>+checksums rmd160 ff302536334622427e06250457c74f061d4329f8 \
+ sha256 9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5
</ins><span class="cx">
</span><ins>+# Enable HFS compression.
+depends_extract-append port:libarchive
+extract.post_args "| bsdtar -x --hfsCompression"
+
</ins><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-depends_lib \
</del><ins>+depends_lib port:a52dec \
+ port:avahi \
+ port:bzip2 \
+ port:faad2 \
+ path:lib/libavcodec.dylib:ffmpeg \
+ port:flac \
+ port:fluidsynth \
+ port:fontconfig \
+ port:freetype \
+ port:fribidi \
+ port:gettext \
+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:gmp \
+ port:gnutls \
</ins><span class="cx"> port:jpeg \
</span><span class="cx"> port:lame \
</span><ins>+ port:libass \
+ port:libbluray \
+ port:libcddb \
</ins><span class="cx"> port:libcdio \
</span><ins>+ port:libdc1394 \
+ port:libdca \
+ port:libdvbpsi \
+ port:libdvdnav \
+ port:libdvdread \
</ins><span class="cx"> port:libebml \
</span><span class="cx"> port:libgcrypt \
</span><ins>+ port:libgpg-error \
+ port:libiconv \
</ins><span class="cx"> port:libid3tag \
</span><ins>+ port:libidn \
+ port:libmad \
</ins><span class="cx"> port:libmatroska \
</span><ins>+ port:libmodplug \
+ port:libmpcdec \
</ins><span class="cx"> port:libmpeg2 \
</span><ins>+ port:libmtp \
+ port:libogg \
+ port:libopus \
+ port:libpng \
+ port:libproxy \
+ port:libsamplerate \
+ port:libsdl \
+ port:libsdl_image \
+ port:libsndfile \
+ port:libssh2 \
+ port:libtheora \
+ port:libupnp \
+ port:libusb \
+ port:libvorbis \
</ins><span class="cx"> port:libxml2 \
</span><ins>+ port:live555 \
+ port:ncurses \
</ins><span class="cx"> port:nettle \
</span><ins>+ port:opencv \
</ins><span class="cx"> port:openjpeg15 \
</span><ins>+ port:openssl \
+ port:orc \
+ port:p11-kit \
+ port:readline \
+ port:schroedinger \
+ port:speex \
</ins><span class="cx"> port:taglib \
</span><span class="cx"> port:tiff \
</span><ins>+ port:twolame \
+ port:vcdimager \
+ port:x264
</ins><span class="cx">
</span><del>-# TODO: live555 opencv FreeRDP
</del><ins>+# the +qt5 and/or +qt4 variants of port:opencv currently lead to build errors
+pre-configure {
+ if {![active_variants opencv "" {qt4 qt5}]} {
+ ui_error "${subport} cannot currently be built against port:opencv with the qt4 or qt5 variant.\
+ Install port:opencv without either qt variant and try again. This is only a build conflict; \
+ after building you can reactivate your preferred opencv variant"
+ return -code error "Install or activate port:opencv without a qt variant before building ${subport}"
+ }
+}
</ins><span class="cx">
</span><ins>+# VLC 2.2.2 should have full Lua 5.3 compatibility, for now, depend on port:lua52
+# That requires the patch-for-lua52.diff which is appended to patchfiles below.
+# update 2.2.2 : lua 5.3 gives compiler syntax errors so we stick with 5.2 for now.
+depends_lib-append port:lua52
+# depends_lib-append port:lua
+
</ins><span class="cx"> # VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
</span><span class="cx"> universal_variant no
</span><span class="cx"> supported_archs x86_64
</span><span class="lines">@@ -73,22 +160,15 @@
</span><span class="cx"> patchfiles buildfix-package.mak.patch \
</span><span class="cx"> configure.ac-no-arch.patch \
</span><span class="cx"> PR-34741-no__clang_version__.patch \
</span><del>- class_struct.patch \
- qtkit.patch \
</del><span class="cx"> static_assert.patch \
</span><span class="cx"> no-sparkle.patch \
</span><del>- patch-ffmpeg-2.4.diff
</del><ins>+ patch-vlc-no-O4.diff \
+ patch-opencv_includes.diff
</ins><span class="cx">
</span><del>-# upgrade of lua from 5.2 to 5.3 introduced API deprecations that broke build
-# apply upstream 5.3 compatibility patch (#49405)
</del><ins>+# The opencv example apparently builds on 10.11 but I'm having issues with it on 10.9
+# it doesn't appear to be indispensable, so simply skip it.
+patchfiles-append patch-no-opencv_example.diff
</ins><span class="cx">
</span><del>-patchfiles-append patch-lua-5.3.diff
-
-# Xcode 7.0+ introduces C11 native atomics that break the bluray module
-# patch to disable native atomics for this module and fall back to VLC's backup implementation (#49178)
-
-patchfiles-append patch-bluray-no-atomics.diff
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s:librsvg-2/librsvg:librsvg:" \
</span><span class="cx"> ${worksrcpath}/modules/text_renderer/svg.c
</span><span class="lines">@@ -112,6 +192,9 @@
</span><span class="cx"> # gl.c:121:3: error: Platform not recognized.
</span><span class="cx"> configure.cppflags-append -D__unix__=1
</span><span class="cx">
</span><ins>+# live555 is installed to a weird location
+configure.cppflags-append -I${prefix}/lib/live/liveMedia/include
+
</ins><span class="cx"> build.target all
</span><span class="cx"> destroot.target install
</span><span class="cx">
</span><span class="lines">@@ -119,288 +202,111 @@
</span><span class="cx"> livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
</span><span class="cx">
</span><span class="cx"> # Other
</span><del>-
-depends_lib-append port:gnutls \
- port:lua
-
</del><span class="cx"> configure.args-append \
</span><span class="cx"> --with-contrib=${worksrcpath}/contrib \
</span><del>- --enable-shared \
- --disable-debug \
- --disable-update-check \
- --disable-dbus \
- --disable-growl \
- --disable-macosx-vlc-app \
- --disable-notify \
- --enable-gnutls \
- --enable-lua
</del><ins>+ --disable-debug --disable-update-check --enable-gnutls \
+ --disable-notify --disable-dbus --enable-lua \
+ --disable-gnomevfs --disable-growl --disable-macosx-vlc-app
</ins><span class="cx">
</span><span class="cx"> # Input Plugins
</span><del>-# build fails when FreeRDP is installed
-# build fails when opencv is installed
-
-depends_lib-append \
- port:libbluray \
- port:libcddb \
- port:libdc1394 \
- port:libdvdnav \
- port:libdvdread \
- port:libssh2
-
</del><span class="cx"> configure.args-append \
</span><del>- --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
</del><ins>+ --enable-dvdnav --enable-dvdread --disable-smbclient --enable-vcdx \
+ --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
+ --disable-freerdp --enable-opencv --enable-sftp
</ins><span class="cx">
</span><span class="cx"> # Mux/Demux Plugins
</span><del>-depends_lib-append \
- port:libogg
-
</del><span class="cx"> configure.args-append \
</span><del>- --disable-dvbpsi \
- --disable-gme \
- --disable-mod \
- --disable-mpc \
- --disable-sid \
- --disable-shout \
- --enable-mkv \
- --enable-mux_ogg \
- --enable-ogg
</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><del>-
-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:libvpx \
- port:schroedinger \
- port:libtheora \
- port:twolame \
- port:libvorbis \
- port:x264
-
-
</del><span class="cx"> configure.args-append \
</span><del>- --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
</del><ins>+ --enable-a52 --enable-faad --enable-flac --enable-live555 \
+ --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
+ --enable-dca --enable-png --disable-quicktime --enable-twolame \
+ --enable-speex --enable-theora --enable-x264 --enable-postproc \
+ --enable-avcodec --enable-avformat --enable-swscale \
+ --disable-fluidsynth --enable-schroedinger
</ins><span class="cx">
</span><del>-# Video Plugins
-
</del><ins>+# Video Plugins. We do our best to deactivate X11 and disable its auto-detection by
+# claiming the headers and libs are somewhere they're not.
</ins><span class="cx"> configure.args-append \
</span><del>- --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
</del><ins>+ --disable-caca --enable-sdl --enable-sdl-image \
+ --without-x --disable-xcb --disable-xvideo --disable-glx \
+ --x-includes=${destroot} --x-libraries=${destroot} \
+ --enable-freetype --enable-fontconfig --enable-fribidi \
+ --disable-svg
</ins><span class="cx">
</span><span class="cx"> # Audio Plugins
</span><del>-depends_lib-append \
- port:libsamplerate
-
</del><span class="cx"> configure.args-append \
</span><del>- --disable-chromaprint \
- --disable-macosx-audio \
- --enable-samplerate \
</del><span class="cx"> --disable-jack \
</span><ins>+ --enable-samplerate \
</ins><span class="cx"> --disable-pulse
</span><span class="cx">
</span><span class="cx"> # Interface Plugins
</span><del>-depends_lib-append \
- port:ncurses
-
</del><span class="cx"> configure.args-append \
</span><span class="cx"> --disable-macosx \
</span><span class="cx"> --disable-macosx-dialog-provider \
</span><span class="cx"> --disable-qt \
</span><del>- --disable-skins2 \
- --enable-ncurses
</del><ins>+ --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-projectm \
- --disable-vsxu
</del><ins>+ --disable-goom
</ins><span class="cx">
</span><span class="cx"> # Service Discovery Plugins
</span><del>-depends_lib-append \
- port:avahi \
- port:libupnp
-
</del><span class="cx"> configure.args-append \
</span><del>- --disable-mtp \
- --disable-udev \
</del><span class="cx"> --enable-bonjour \
</span><span class="cx"> --enable-upnp
</span><span class="cx">
</span><ins>+# 20150209: Jack really would require a newer variant than what's currently in MacPorts
+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"> variant dbus description {Enable DBus support} {
</span><span class="cx"> depends_lib-append port:dbus
</span><del>- configure.args-delete --disable-dbus
- configure.args-append --enable-dbus
</del><ins>+ configure.args-replace --disable-dbus --enable-dbus
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant pulse description {Enable PulseAudio support} {
- depends_lib-append port:pulseaudio
- configure.args-delete --disable-pulse
- configure.args-append --enable-pulse
-}
-
-variant eyetv description {Enable eyetv plugin} {
- configure.args-delete --disable-macosx-eyetv
- configure.args-append --enable-macosx-eyetv
-}
-
-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 fribidi requires osd description {Enable FriBidi Unicode support} {
- depends_lib-append port:fribidi
- configure.args-delete --disable-fribidi
- configure.args-append --enable-fribidi
-}
-
-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 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 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
-}
-
</del><span class="cx"> variant qtkit description {Enable qtcapture and qtaudio} {
</span><del>- configure.args-delete --disable-macosx-qtkit
- configure.args-append --enable-macosx-qtkit
</del><ins>+ configure.args-replace --disable-macosx-qtkit --enable-macosx-qtkit
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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
</del><ins>+variant svg description {Enable SVG support} {
+ depends_lib-append port:librsvg
+ configure.args-replace --disable-svg --enable-svg
</ins><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><del>- configure.args-delete --disable-shout
- configure.args-append --enable-shout
</del><ins>+ configure.args-replace --disable-shout --enable-shout
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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-smbclient
- configure.args-append --enable-smbclient
</del><ins>+ configure.args-replace --disable-smbclient --enable-smbclient
</ins><span class="cx"> configure.ldflags-append -L${prefix}/lib/samba3
</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 pulse description {Enable PulseAudio support} {
+ depends_lib-append port:pulseaudio
+ configure.args-replace --disable-pulse --enable-pulse
</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
-}
-
-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 x11 {
</span><span class="cx"> depends_lib-append \
</span><ins>+ port:xorg-libX11 \
+ port:xorg-libXau \
+ port:xorg-libXdmcp \
+ port:xorg-libXext \
+ port:xorg-libXrandr \
+ port:xorg-libxcb \
+ port:xrender \
+ port:XviD \
</ins><span class="cx"> port:mesa \
</span><span class="cx"> port:xorg-libXinerama \
</span><span class="cx"> port:xorg-libXv \
</span><span class="lines">@@ -408,73 +314,82 @@
</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-glx \
- --disable-xcb \
- --disable-xvideo
- configure.args-append --with-x \
- --x-include=${prefix}/include \
- --x-lib=${prefix}/lib \
- --enable-glx \
- --enable-xcb \
- --enable-xvideo
</del><ins>+ configure.args-delete --without-x --disable-xvideo --disable-glx --disable-xcb \
+ --x-includes=${destroot} --x-libraries=${destroot}
+ configure.args-append --with-x --enable-xvideo --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-qt
- configure.args-append --enable-qt
- patchfiles-append patch-vlc-qt4mac.diff
</del><ins>+if {${subport} ne "lib${name}"} {
+ variant qt4 conflicts qt5 description {Build using Qt4 UI. This will use qt4-mac. Experimental and probably dysfunctional} {
+ patchfiles-append patch-vlc-no-qt5.diff \
+ patch-vlc-qt-configureac.diff \
+ patch-simplepreferences.diff
</ins><span class="cx">
</span><del>- PortGroup qt4 1.0
</del><ins>+ configure.args-replace --disable-qt --enable-qt
</ins><span class="cx">
</span><del>- post-activate {
- if {![variant_isset quartz]} {
- ui_info "The qt4 interface module for VLC is not very stable. If you encounter bugs with it, please file them with VLC and not MacPorts."
- }
</del><ins>+ PortGroup qt4 1.0
</ins><span class="cx"> }
</span><ins>+ variant qt5 conflicts qt4 description {Build using Qt5 UI. This will use qt5-mac. Experimental and probably dysfunctional} {
+ patchfiles-append patch-vlc-qt-configureac.diff \
+ patch-simplepreferences.diff
+
+ configure.args-replace --disable-qt --enable-qt
+
+ PortGroup qt5 1.0
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant quartz {
</span><ins>+ depends_lib-delete port:libsamplerate
+ depends_lib-append port:BGHUDAppKit
+
</ins><span class="cx"> patchfiles-append patch-vlc-for-macports.diff
</span><span class="cx">
</span><del>- depends_lib-append port:BGHUDAppKit
- depends_lib-delete port:libsamplerate
</del><span class="cx"> configure.args-delete --disable-macosx \
</span><del>- --disable-macosx-avfoundation \
- --enable-samplerate
-
- configure.args-append --enable-macosx \
- --enable-macosx-avfoundation
</del><ins>+ --enable-samplerate \
+ --disable-realrtsp
+ configure.args-append --enable-macosx
</ins><span class="cx"> # taken from VLC's own configure.sh script for OS X:
</span><span class="cx"> configure.args-append --disable-samplerate \
</span><span class="cx"> --enable-merge-ffmpeg \
</span><del>- --enable-realrtsp \
- --enable-libass
</del><ins>+ --enable-realrtsp
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +mod +mpc +osd +quartz
</del><ins>+# FreeRDP currently doesn't build with CMake >= 3.1 (#47389)
+variant freerdp description {Build the FreeRDP support; currently dysfunctional} {
+ depends_lib-append port:FreeRDP
+ # access/rdp.c:45:11: fatal error: 'freerdp/version.h' file not found
+ configure.cppflags-append -DFREERDP_INTERFACE_VERSION \
+ -DFREERDP_VERSION_MAJOR=1 \
+ -DFREERDP_VERSION_MINOR=1
+ configure.args-replace --disable-freerdp --enable-freerdp
+}
</ins><span class="cx">
</span><span class="cx"> variant huge \
</span><del>- requires dvb eyetv fribidi jack mod mpc osd sdl shout speex svg vcd pulse \
- description {Enable all variants except quartz, qt4, smb, and x11} {}
</del><ins>+ requires jack shout svg \
+ description {Enable all variants except quartz, smb, freerdp and x11} {}
</ins><span class="cx">
</span><del>-variant full \
- requires huge qt4 quartz smb x11 \
- description {Enable all variants} {}
</del><ins>+if {${subport} ne "lib${name}"} {
+ variant full \
+ requires huge quartz smb x11 \
+ description {Enable all variants except x11 (and except freerdp, currently)} {}
+} else {
+ variant full \
+ requires huge quartz smb \
+ description {Enable all variants (except freerdp, currently)} {}
+}
</ins><span class="cx">
</span><ins>+# this patchfile can probably go with VLC 2.2.2, or should be reviewed then.
+# update 2.2.2 : lua 5.3 gives compiler syntax errors so we stick with 5.2 for now.
+patchfiles-append patch-for-lua52.diff
+
</ins><span class="cx"> platform macosx {
</span><del>- default_variants-append +qtkit
</del><ins>+ default_variants-append +quartz +qtkit
</ins><span class="cx">
</span><del>- configure.args-delete \
- --disable-macosx-vout --disable-macosx-audio \
</del><ins>+ configure.args-replace --disable-macosx-eyetv --enable-macosx-eyetv
</ins><span class="cx">
</span><del>- configure.args-append \
- --enable-macosx-vout --enable-macosx-audio \
- --with-macosx-sdk=/
-
- if {[variant_isset qt4] || [variant_isset quartz]} {
- configure.args-delete --disable-macosx-vlc-app
- configure.args-append --enable-macosx-vlc-app
</del><ins>+ if {${subport} ne "lib${name}"} {
+ configure.args-replace --disable-macosx-vlc-app --enable-macosx-vlc-app
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -497,7 +412,9 @@
</span><span class="cx"> ${worksrcpath}/modules/misc/inhibit/xdg.c \
</span><span class="cx"> ${worksrcpath}/modules/stream_filter/decomp.c
</span><span class="cx">
</span><del>- ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
</del><ins>+ if {![file exists ${worksrcpath}/contrib/BGHUDAppKit.framework]} {
+ ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
+ }
</ins><span class="cx">
</span><span class="cx"> # To trick configure
</span><span class="cx"> file mkdir "${worksrcpath}/contrib/lib"
</span><span class="lines">@@ -506,30 +423,45 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span><span class="cx">
</span><del>- if {[variant_isset qt4] || [variant_isset quartz]} {
- file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
</del><ins>+ if {[variant_isset qt4] || [variant_isset qt5] || [variant_isset quartz]} {
+ if {${subport} ne "lib${name}"} {
+ copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
</ins><span class="cx">
</span><del>- # These are already in ${prefix}, so we don't need to bundle them as well
- file delete -force ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
- file delete -force ${destroot}${applications_dir}/VLC.app/Contents/lib
</del><ins>+ # These are already in ${prefix}, so we don't need to bundle them as well
+ delete ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
+ delete ${destroot}${applications_dir}/VLC.app/Contents/lib
</ins><span class="cx">
</span><del>- # There's no need to install these into the bundle and the prefix
- file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include
- file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
- file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</del><ins>+ # There's no need to install these into the bundle and the prefix
+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include
+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale
+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</ins><span class="cx">
</span><del>- # http://trac.macports.org/ticket/35131
- ln -s ${prefix}/lib ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
- ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
- # the vlc executable needs to be started with a full path to the app bundle executable
- # or else the Mac OS X interface will hang beyond even a ^C or ^\ :
- file delete ${destroot}${prefix}/bin/vlc
- set vlc [open "${workpath}/vlc" "w"]
- puts ${vlc} "#!/bin/sh"
- puts ${vlc} ""
- puts ${vlc} "exec ${applications_dir}/VLC.app/Contents/MacOS/VLC \"$@\""
- close ${vlc}
- xinstall -m 755 ${workpath}/vlc ${destroot}${prefix}/bin
</del><ins>+ # http://trac.macports.org/ticket/35131
+ ln -s ${prefix}/lib ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
+ ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
+ ln -s ${prefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
+ ln -s ${prefix}/share/locale ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale
+
+ # the vlc executable needs to be started with a full path to the app bundle executable
+ # or else the Mac OS X interface will hang beyond even a ^C or ^\ :
+ move ${destroot}${prefix}/bin/vlc ${destroot}${prefix}/bin/vlc.exe
+ system "echo \"#!/bin/sh\nexec \\\"${applications_dir}/VLC.app/Contents/MacOS/VLC\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/vlc"
+ system "chmod 755 ${destroot}${prefix}/bin/vlc"
+ } else {
+ delete ${destroot}${prefix}/bin
+ delete ${destroot}${prefix}/share/applications
+ delete ${destroot}${prefix}/share/man
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ post-activate {
+ if {[variant_isset qt4] || [variant_isset qt5]} {
+ notes-append "The Qt interface modules for VLC are currently dysfunctional. If you encounter bugs with them, please file them with VLC and not MacPorts."
+ }
+ system "${prefix}/lib/vlc/vlc-cache-gen -f ${prefix}/lib/vlc"
+ }
</ins><span class="cx"> }
</span><ins>+
+# kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesPR34741no__clang_version__patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/PR-34741-no__clang_version__.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/PR-34741-no__clang_version__.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/PR-34741-no__clang_version__.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,14 +1,19 @@
</span><del>---- modules/gui/macosx/about.m.orig 2014-02-21 06:00:00.000000000 -0800
-+++ modules/gui/macosx/about.m 2014-06-23 03:54:01.000000000 -0700
-@@ -101,8 +101,10 @@
</del><ins>+--- modules/gui/macosx/about.m.orig 2014-02-25 11:36:09.000000000 -0800
++++ modules/gui/macosx/about.m 2014-02-25 12:06:29.000000000 -0800
+@@ -101,10 +101,14 @@ static VLAboutBox *_o_sharedInstance = n
</ins><span class="cx">
</span><span class="cx"> /* setup the creator / revision field */
</span><span class="cx"> NSString *compiler;
</span><span class="cx"> -#ifdef __clang__
</span><span class="cx"> +#ifdef __clang_version__
</span><span class="cx"> compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
</span><del>-+#elif defined(__clang__)
</del><ins>+-#else
++#elif defined(__clang__)
</ins><span class="cx"> + compiler = [NSString stringWithFormat:@"clang"];
</span><del>- #else
</del><ins>++#elif defined(__llvm__)
</ins><span class="cx"> compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
</span><ins>++#else
++ compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__];
</ins><span class="cx"> #endif
</span><ins>+ [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]];
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesbuildfixpackagemakpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,16 +1,8 @@
</span><del>-commit 5c374517726f0fd16e4bdbb46227d2633130dd4c
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed May 2 15:37:28 2012 -0700
-
- Don't make install during make
-
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-
-diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
-index f7abcd2..77e1c20 100644
</del><ins>+diff --git extras/package/macosx/package.mak extras/package/macosx/package.mak
+index 40e4fe5..0f381dd 100644
</ins><span class="cx"> --- extras/package/macosx/package.mak
</span><span class="cx"> +++ extras/package/macosx/package.mak
</span><del>-@@ -25,10 +25,10 @@ VLC.app: VLC-tmp
</del><ins>+@@ -26,10 +26,10 @@ VLC.app: VLC-tmp
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> VLC-tmp: vlc
</span><span class="lines">@@ -23,12 +15,12 @@
</span><span class="cx"> mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
</span><span class="cx"> cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
</span><span class="cx"> mkdir -p $(abs_top_builddir)/tmp/extras/package/macosx/vlc.xcodeproj/
</span><del>-@@ -47,7 +47,7 @@ VLC-tmp: vlc
- cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@
- mkdir -p $@/Contents/Frameworks && cp -R -L $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
</del><ins>+@@ -49,7 +49,7 @@ VLC-tmp: vlc
+ cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $@
+ mkdir -p $@/Contents/Frameworks && cp -R $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
</ins><span class="cx"> mkdir -p $@/Contents/MacOS/share/locale/
</span><span class="cx"> - cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span class="cx"> + cp -r "$(top_builddir)/tmp/destdir$(prefix)/lib/vlc/lua" "$(top_builddir)/tmp/destdir$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span class="cx"> mkdir -p $@/Contents/MacOS/include/
</span><del>- cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
</del><ins>+ (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) | $(AMTAR) -x -C $@/Contents/MacOS/include/
</ins><span class="cx"> $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesclass_structpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/class_struct.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/class_struct.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/class_struct.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
-index 7c8a3c1..80b3e45 100644
---- modules/demux/mkv/chapter_command.hpp
-+++ modules/demux/mkv/chapter_command.hpp
-@@ -35,7 +35,7 @@ const binary MATROSKA_DVD_LEVEL_PG = 0x18;
- const binary MATROSKA_DVD_LEVEL_PTT = 0x10;
- const binary MATROSKA_DVD_LEVEL_CN = 0x08;
-
--class demux_sys_t;
-+struct demux_sys_t;
-
- class chapter_codec_cmds_c
- {
-diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
-index 3cb5f60..4412044 100644
---- modules/demux/mkv/demux.hpp
-+++ modules/demux/mkv/demux.hpp
-@@ -326,7 +326,7 @@ private:
- };
-
-
--class demux_sys_t
-+struct demux_sys_t
- {
- public:
- demux_sys_t( demux_t & demux )
-diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
-index c2d5478..6086f17 100644
---- modules/demux/mkv/mkv.cpp
-+++ modules/demux/mkv/mkv.cpp
-@@ -73,7 +73,7 @@ vlc_module_begin ()
- add_shortcut( "mka", "mkv" )
- vlc_module_end ()
-
--class demux_sys_t;
-+struct demux_sys_t;
-
- static int Demux ( demux_t * );
- static int Control( demux_t *, int, va_list );
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesconfigureacnoarchpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,30 +1,33 @@
</span><del>---- configure.ac.orig 2014-02-21 06:00:00.000000000 -0800
-+++ configure.ac 2014-06-23 03:42:50.000000000 -0700
-@@ -127,33 +127,12 @@
</del><ins>+diff --git configure.ac configure.ac
+index 318cad4..9350f90 100644
+--- configure.ac
++++ configure.ac
+@@ -144,22 +144,11 @@ case "${host_os}" in
+ SYS=dragonfly
</ins><span class="cx"> ;;
</span><span class="cx"> darwin*)
</span><del>-
</del><ins>+-
</ins><span class="cx"> - dnl Force gcc "-arch" flag
</span><span class="cx"> - ARCH_flag=""
</span><del>-- case "${host}" in
-- i?86*)
</del><ins>+ case "${host}" in
+ i?86*)
</ins><span class="cx"> - ARCH_flag="-arch i386"
</span><del>-- ;;
</del><ins>+ YASMFLAGS="-f macho32"
+ ;;
</ins><span class="cx"> - ppc64*)
</span><span class="cx"> - ARCH_flag="-arch ppc64"
</span><span class="cx"> - ;;
</span><span class="cx"> - ppc*)
</span><span class="cx"> - ARCH_flag="-arch ppc"
</span><span class="cx"> - ;;
</span><del>-- x86_64*)
</del><ins>+ x86_64*)
</ins><span class="cx"> - ARCH_flag="-arch x86_64"
</span><del>-- ;;
-- arm*)
-- ac_cv_c_bigendian="no"
-- ac_cv_c_attribute_packed="no"
-- ;;
-- esac
--
</del><ins>+ YASMFLAGS="-f macho64"
+ ;;
+ arm*)
+@@ -169,11 +158,10 @@ case "${host_os}" in
+ esac
+
</ins><span class="cx"> SYS=darwin
</span><span class="cx"> - CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
</span><span class="cx"> - CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
</span><span class="lines">@@ -33,9 +36,8 @@
</span><span class="cx"> - LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
</span><span class="cx"> + CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS"
</span><span class="cx"> + CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
</span><del>-+ CPPFLAGS="${CPPFLAGS}"
</del><span class="cx"> + OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
</span><span class="cx"> + LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
</span><del>- VLC_ADD_LIBS([motion rotate dvdread dvdnav], [-Wl,-framework,IOKit,-framework,CoreFoundation])
</del><span class="cx"> VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
</span><del>- VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
</del><ins>+ VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesnosparklepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/no-sparkle.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/no-sparkle.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/no-sparkle.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> diff --git configure.ac configure.ac
</span><del>-index fd31f16..af37c4c 100644
</del><ins>+index 318cad4..7c4e53f 100644
</ins><span class="cx"> --- configure.ac
</span><span class="cx"> +++ configure.ac
</span><del>-@@ -3685,13 +3685,6 @@ then
</del><ins>+@@ -3850,13 +3850,6 @@ then
</ins><span class="cx">
</span><span class="cx"> VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge])
</span><span class="cx">
</span><span class="lines">@@ -16,72 +16,22 @@
</span><span class="cx"> if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
</span><span class="cx"> then
</span><span class="cx"> AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
</span><del>-diff --git extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
-index a932b0e..5f58bbd 100644
---- extras/package/macosx/Resources/English.lproj/Preferences.xib
-+++ extras/package/macosx/Resources/English.lproj/Preferences.xib
-@@ -4682,9 +4682,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
- <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
- <bool key="NSWindowIsRestorable">YES</bool>
- </object>
-- <object class="NSCustomObject" id="761483302">
-- <string key="NSClassName">SUUpdater</string>
-- </object>
- <object class="NSWindowTemplate" id="898680423">
- <int key="NSWindowStyleMask">15</int>
- <int key="NSWindowBacking">2</int>
-@@ -6833,22 +6830,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
- <int key="connectionID">3554</int>
- </object>
- <object class="IBConnectionRecord">
-- <object class="IBBindingConnection" key="connection">
-- <string key="label">value: automaticallyChecksForUpdates</string>
-- <reference key="source" ref="243384014"/>
-- <reference key="destination" ref="761483302"/>
-- <object class="NSNibBindingConnector" key="connector">
-- <reference key="NSSource" ref="243384014"/>
-- <reference key="NSDestination" ref="761483302"/>
-- <string key="NSLabel">value: automaticallyChecksForUpdates</string>
-- <string key="NSBinding">value</string>
-- <string key="NSKeyPath">automaticallyChecksForUpdates</string>
-- <int key="NSNibBindingConnectorVersion">2</int>
-- </object>
-- </object>
-- <int key="connectionID">3559</int>
-- </object>
-- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">o_intf_update_ckb</string>
- <reference key="source" ref="150917409"/>
-@@ -9560,12 +9541,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
- <reference key="parent" ref="492678965"/>
- </object>
- <object class="IBObjectRecord">
-- <int key="objectID">3555</int>
-- <reference key="object" ref="761483302"/>
-- <reference key="parent" ref="0"/>
-- <string key="objectName">Sparkle Updater</string>
-- </object>
-- <object class="IBObjectRecord">
- <int key="objectID">3556</int>
- <reference key="object" ref="243384014"/>
- <object class="NSMutableArray" key="children">
-diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
-index 9c133df..8a2f5bd 100644
</del><ins>+diff --git extras/package/macosx/Resources/English.lproj/MainMenu.xib extras/package/macosx/Resources/English.lproj/MainMenu.xib
+index 1c880c9..08b3b9d 100644
</ins><span class="cx"> --- extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><span class="cx"> +++ extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><del>-@@ -4418,9 +4418,6 @@ LCAuLi4</string>
- <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
- <bool key="NSWindowIsRestorable">YES</bool>
</del><ins>+@@ -2106,9 +2106,6 @@
+ <object class="NSCustomObject" id="651263286">
+ <string key="NSClassName">VLCMainMenu</string>
</ins><span class="cx"> </object>
</span><span class="cx"> - <object class="NSCustomObject" id="1040926652">
</span><span class="cx"> - <string key="NSClassName">SUUpdater</string>
</span><span class="cx"> - </object>
</span><span class="cx"> <object class="NSCustomView" id="560875128">
</span><del>- <nil key="NSNextResponder"/>
</del><ins>+ <reference key="NSNextResponder"/>
</ins><span class="cx"> <int key="NSvFlags">268</int>
</span><del>-@@ -5907,14 +5904,6 @@ LCAuLi4</string>
- <int key="connectionID">4256</int>
</del><ins>+@@ -2635,14 +2632,6 @@
+ <int key="connectionID">2817</int>
</ins><span class="cx"> </object>
</span><span class="cx"> <object class="IBConnectionRecord">
</span><span class="cx"> - <object class="IBActionConnection" key="connection">
</span><span class="lines">@@ -93,9 +43,9 @@
</span><span class="cx"> - </object>
</span><span class="cx"> - <object class="IBConnectionRecord">
</span><span class="cx"> <object class="IBOutletConnection" key="connection">
</span><del>- <string key="label">o_outline_view</string>
- <reference key="source" ref="998338913"/>
-@@ -9989,11 +9978,6 @@ LCAuLi4</string>
</del><ins>+ <string key="label">o_dmi_mute</string>
+ <reference key="source" ref="651263286"/>
+@@ -5466,11 +5455,6 @@
</ins><span class="cx"> <string key="objectName">Application</string>
</span><span class="cx"> </object>
</span><span class="cx"> <object class="IBObjectRecord">
</span><span class="lines">@@ -107,37 +57,8 @@
</span><span class="cx"> <int key="objectID">4397</int>
</span><span class="cx"> <reference key="object" ref="629699013"/>
</span><span class="cx"> <object class="NSMutableArray" key="children">
</span><del>-diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
-index c5fced6..da7d001 100644
---- modules/gui/macosx/intf.m
-+++ modules/gui/macosx/intf.m
-@@ -69,7 +69,6 @@
- #import "AudioEffects.h"
-
- #import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
--#import <Sparkle/Sparkle.h> /* we're the update delegate */
-
- #import "iTunes.h"
-
-@@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil;
- }
-
- #pragma mark -
--#pragma mark Sparkle delegate
--/* received directly before the update gets installed, so let's shut down a bit */
--- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
--{
-- [NSApp activateIgnoringOtherApps:YES];
-- [o_remote stopListening: self];
-- [[VLCCoreInteraction sharedInstance] stop];
--}
--
--#pragma mark -
- #pragma mark Media Key support
-
- -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
</del><span class="cx"> diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
</span><del>-index a91fe3a..4407d25 100644
</del><ins>+index 98f315d..0074c64 100644
</ins><span class="cx"> --- modules/gui/macosx/simple_prefs.m
</span><span class="cx"> +++ modules/gui/macosx/simple_prefs.m
</span><span class="cx"> @@ -38,8 +38,6 @@
</span><span class="lines">@@ -149,15 +70,15 @@
</span><span class="cx"> static const char *const ppsz_language[] =
</span><span class="cx"> {
</span><span class="cx"> "auto",
</span><del>-@@ -365,7 +363,6 @@ create_toolbar_item(NSString * o_itemIde
- [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
</del><ins>+@@ -383,7 +381,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
</ins><span class="cx"> [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
</span><ins>+ [o_intf_art_ckb setTitle: _NS("Allow metadata network access")];
</ins><span class="cx"> [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
</span><span class="cx"> - [o_intf_last_update_lbl setStringValue: @""];
</span><span class="cx"> [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
</span><span class="cx"> [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
</span><span class="cx"> [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
</span><del>-@@ -585,10 +582,6 @@ static inline char * __config_GetLabel(v
</del><ins>+@@ -595,10 +592,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
</ins><span class="cx"> [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
</span><span class="cx">
</span><span class="cx"> [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
</span><span class="lines">@@ -168,3 +89,101 @@
</span><span class="cx"> psz_tmp = config_GetPsz(p_intf, "control");
</span><span class="cx"> if (psz_tmp) {
</span><span class="cx"> [o_intf_enableGrowl_ckb setState: (NSInteger)strstr(psz_tmp, "growl")];
</span><ins>+diff --git extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
+index 2f264fd..d4049bd 100644
+--- extras/package/macosx/Resources/English.lproj/Preferences.xib
++++ extras/package/macosx/Resources/English.lproj/Preferences.xib
+@@ -4779,9 +4779,6 @@
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
+ </object>
+- <object class="NSCustomObject" id="761483302">
+- <string key="NSClassName">SUUpdater</string>
+- </object>
+ <object class="NSWindowTemplate" id="898680423">
+ <int key="NSWindowStyleMask">15</int>
+ <int key="NSWindowBacking">2</int>
+@@ -7629,22 +7626,6 @@
+ <int key="connectionID">2681</int>
+ </object>
+ <object class="IBConnectionRecord">
+- <object class="IBBindingConnection" key="connection">
+- <string key="label">value: automaticallyChecksForUpdates</string>
+- <reference key="source" ref="243384014"/>
+- <reference key="destination" ref="761483302"/>
+- <object class="NSNibBindingConnector" key="connector">
+- <reference key="NSSource" ref="243384014"/>
+- <reference key="NSDestination" ref="761483302"/>
+- <string key="NSLabel">value: automaticallyChecksForUpdates</string>
+- <string key="NSBinding">value</string>
+- <string key="NSKeyPath">automaticallyChecksForUpdates</string>
+- <int key="NSNibBindingConnectorVersion">2</int>
+- </object>
+- </object>
+- <int key="connectionID">3559</int>
+- </object>
+- <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="588417130"/>
+@@ -9360,12 +9341,6 @@
+ <reference key="parent" ref="492678965"/>
+ </object>
+ <object class="IBObjectRecord">
+- <int key="objectID">3555</int>
+- <reference key="object" ref="761483302"/>
+- <reference key="parent" ref="0"/>
+- <string key="objectName">Sparkle Updater</string>
+- </object>
+- <object class="IBObjectRecord">
+ <int key="objectID">3556</int>
+ <reference key="object" ref="243384014"/>
+ <array class="NSMutableArray" key="children">
+diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
+index 1d48150..c61a4aa 100644
+--- modules/gui/macosx/intf.m
++++ modules/gui/macosx/intf.m
+@@ -68,8 +68,6 @@
+ #import "VideoEffects.h"
+ #import "AudioEffects.h"
+
+-#import <Sparkle/Sparkle.h> /* we're the update delegate */
+-
+ #import "iTunes.h"
+ #import "Spotify.h"
+
+@@ -785,8 +783,6 @@
+ PL_LOCK;
+ items_at_launch = p_playlist->p_local_category->i_children;
+ PL_UNLOCK;
+-
+- [[SUUpdater sharedUpdater] setDelegate:self];
+ }
+
+ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+@@ -974,25 +970,6 @@
+ }
+
+ #pragma mark -
+-#pragma mark Sparkle delegate
+-/* received directly before the update gets installed, so let's shut down a bit */
+-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
+-{
+- [NSApp activateIgnoringOtherApps:YES];
+- [o_remote stopListening: self];
+- [[VLCCoreInteraction sharedInstance] stop];
+-}
+-
+-/* don't be enthusiastic about an update if we currently play a video */
+-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
+-{
+- if ([self activeVideoPlayback])
+- return NO;
+-
+- return YES;
+-}
+-
+-#pragma mark -
+ #pragma mark Media Key support
+
+ -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchbluraynoatomicsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- modules/access/bluray.c.orig 2015-12-06 06:41:52.000000000 -0800
-+++ modules/access/bluray.c 2015-12-06 06:43:19.000000000 -0800
-@@ -43,6 +43,11 @@
- #include <vlc_plugin.h>
- #include <vlc_demux.h> /* demux_t */
- #include <vlc_input.h> /* Seekpoints, chapters */
-+
-+#ifndef __STDC_NO_ATOMICS__
-+#define __STDC_NO_ATOMICS__ 1
-+#endif
-+
- #include <vlc_atomic.h>
- #include <vlc_dialog.h> /* BD+/AACS warnings */
- #include <vlc_vout.h> /* vout_PutSubpicture / subpicture_t */
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchffmpeg24diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/patch-ffmpeg-2.4.diff (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-ffmpeg-2.4.diff 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/patch-ffmpeg-2.4.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- configure.ac.orig 2014-09-18 08:28:55.000000000 -0700
-+++ configure.ac 2014-09-18 08:30:11.000000000 -0700
-@@ -2221,9 +2221,6 @@
- [ --enable-avcodec libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
-- PKG_CHECK_EXISTS([libavcodec < 56],, [
-- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
-- ])
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
- CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchforlua52diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-for-lua52.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-for-lua52.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-for-lua52.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+diff --git configure.ac configure.ac
+index 95f24fc..15c274b 100644
+--- configure.ac
++++ configure.ac
+@@ -1481,7 +1481,7 @@ AC_ARG_ENABLE(lua,
+ [disable LUA scripting support (default enabled)])])
+ if test "${enable_lua}" != "no"
+ then
+- PKG_CHECK_MODULES(LUA, lua5.2,
++ PKG_CHECK_MODULES(LUA, lua-5.2,
+ [ have_lua=yes ],
+ [
+ AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+@@ -1498,8 +1498,8 @@ then
+ AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
+ [],
+ [ have_lua=no ] )
+- AC_CHECK_LIB( lua5.2 , luaL_newstate,
+- [LUA_LIBS="-llua5.2"],
++ AC_CHECK_LIB( lua-5.2 , luaL_newstate,
++ [LUA_LIBS="-llua-5.2"],
+ AC_CHECK_LIB( lua5.1 , luaL_newstate,
+ [LUA_LIBS="-llua5.1"],
+ AC_CHECK_LIB( lua51 , luaL_newstate,
+@@ -1516,7 +1516,7 @@ then
+ AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
+ fi
+ AC_ARG_VAR([LUAC], [LUA byte compiler])
+- AC_PATH_PROGS(LUAC,[${LUAC} luac], [false])
++ AC_PATH_PROGS(LUAC,[${LUAC} luac5.2], [false])
+ AS_IF([test "${LUAC}" = "false"], [
+ AC_MSG_ERROR([Could not find the LUA byte compiler.])
+ ])
+diff --git modules/lua/vlc.h modules/lua/vlc.h
+index c7a2913..b5ebbd8 100644
+--- modules/lua/vlc.h
++++ modules/lua/vlc.h
+@@ -39,9 +39,9 @@
+ #include <vlc_demux.h>
+
+ #define LUA_COMPAT_MODULE
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
++#include <lua-5.2/lua.h> /* Low level lua C API */
++#include <lua-5.2/lauxlib.h> /* Higher level C API */
++#include <lua-5.2/lualib.h> /* Lua libs */
+ #if LUA_VERSION_NUM >= 502
+ #define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+ #define lua_objlen(L,idx) lua_rawlen(L,idx)
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchlua53diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-From 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee@freedesktop.org>
-Date: Thu, 5 Feb 2015 14:48:53 -0800
-Subject: [PATCH] lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0
- compatibility.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-In Lua 5.3.0, luaL_checkint was deprecated.
-
-This patch fixes this build error with Lua 5.3.0.
-
-lua/demux.c: In function âvlclua_demux_peekâ:
-lua/demux.c:55:5: error: implicit declaration of function âluaL_checkintâ [-Werror=implicit-function-declaration]
- int n = luaL_checkint( L, 1 );
- ^
-
-Signed-off-by: Vinson Lee <vlee@freedesktop.org>
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/lua/vlc.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
-index efd94f1..85c7fc1 100644
---- modules/lua/vlc.h
-+++ modules/lua/vlc.h
-@@ -38,6 +38,7 @@
- #include <vlc_stream.h>
- #include <vlc_demux.h>
-
-+#define LUA_COMPAT_APIINTCASTS
- #define LUA_COMPAT_MODULE
- #include <lua.h> /* Low level lua C API */
- #include <lauxlib.h> /* Higher level C API */
---
-1.7.10.4
-
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchnoopencv_examplediff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-no-opencv_example.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-no-opencv_example.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-no-opencv_example.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+--- modules/video_filter/orig.Makefile.am 2016-02-24 17:57:51.000000000 +0100
++++ modules/video_filter/Makefile.am 2016-02-24 18:20:24.000000000 +0100
+@@ -257,16 +257,6 @@
+ liboldmovie_plugin_la_LIBADD = $(LIBS_oldmovie)
+ liboldmovie_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' $(LDFLAGS_oldmovie)
+
+-libopencv_example_plugin_la_SOURCES = $(SOURCES_opencv_example)
+-libopencv_example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_opencv_example) -DMODULE_NAME_IS_opencv_example
+-libopencv_example_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_opencv_example)
+-libopencv_example_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_opencv_example)
+-libopencv_example_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_opencv_example)
+-libopencv_example_plugin_la_LIBADD = $(LIBS_opencv_example)
+-libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' $(LDFLAGS_opencv_example)
+-EXTRA_LTLIBRARIES += libopencv_example_plugin.la
+-video_filter_LTLIBRARIES += $(LTLIBopencv_example)
+-
+ libopencv_wrapper_plugin_la_SOURCES = $(SOURCES_opencv_wrapper)
+ libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_opencv_wrapper) -DMODULE_NAME_IS_opencv_wrapper
+ libopencv_wrapper_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_opencv_wrapper)
+Exit 1
+--- modules/video_filter/orig.Makefile.in 2016-02-24 17:58:32.000000000 +0100
++++ modules/video_filter/Makefile.in 2016-02-24 18:22:02.000000000 +0100
+@@ -472,15 +472,6 @@
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(liboldmovie_plugin_la_CFLAGS) $(CFLAGS) \
+ $(liboldmovie_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
+-libopencv_example_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_32 = libopencv_example_plugin_la-opencv_example.lo
+-am_libopencv_example_plugin_la_OBJECTS = $(am__objects_32)
+-libopencv_example_plugin_la_OBJECTS = \
+- $(am_libopencv_example_plugin_la_OBJECTS)
+-libopencv_example_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+- $(libopencv_example_plugin_la_CXXFLAGS) $(CXXFLAGS) \
+- $(libopencv_example_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
+ libopencv_wrapper_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__objects_33 = libopencv_wrapper_plugin_la-opencv_wrapper.lo
+ am_libopencv_wrapper_plugin_la_OBJECTS = $(am__objects_33)
+@@ -706,7 +697,6 @@
+ $(libmotionblur_plugin_la_SOURCES) \
+ $(libmotiondetect_plugin_la_SOURCES) \
+ $(liboldmovie_plugin_la_SOURCES) \
+- $(libopencv_example_plugin_la_SOURCES) \
+ $(libopencv_wrapper_plugin_la_SOURCES) \
+ $(libposterize_plugin_la_SOURCES) \
+ $(libpostproc_plugin_la_SOURCES) \
+@@ -746,7 +736,6 @@
+ $(libmotionblur_plugin_la_SOURCES) \
+ $(libmotiondetect_plugin_la_SOURCES) \
+ $(liboldmovie_plugin_la_SOURCES) \
+- $(libopencv_example_plugin_la_SOURCES) \
+ $(libopencv_wrapper_plugin_la_SOURCES) \
+ $(libposterize_plugin_la_SOURCES) \
+ $(libpostproc_plugin_la_SOURCES) \
+@@ -856,7 +845,6 @@
+ CFLAGS_ogg = @CFLAGS_ogg@
+ CFLAGS_omxil = @CFLAGS_omxil@
+ CFLAGS_omxil_vout = @CFLAGS_omxil_vout@
+-CFLAGS_opencv_example = @CFLAGS_opencv_example@
+ CFLAGS_opencv_wrapper = @CFLAGS_opencv_wrapper@
+ CFLAGS_opus = @CFLAGS_opus@
+ CFLAGS_postproc = @CFLAGS_postproc@
+@@ -924,7 +912,6 @@
+ CPPFLAGS_mux_ogg = @CPPFLAGS_mux_ogg@
+ CPPFLAGS_notify = @CPPFLAGS_notify@
+ CPPFLAGS_ogg = @CPPFLAGS_ogg@
+-CPPFLAGS_opencv_example = @CPPFLAGS_opencv_example@
+ CPPFLAGS_opencv_wrapper = @CPPFLAGS_opencv_wrapper@
+ CPPFLAGS_opus = @CPPFLAGS_opus@
+ CPPFLAGS_qsv = @CPPFLAGS_qsv@
+@@ -1146,7 +1133,6 @@
+ LIBS_ogg = @LIBS_ogg@
+ LIBS_oldmovie = @LIBS_oldmovie@
+ LIBS_oldrc = @LIBS_oldrc@
+-LIBS_opencv_example = @LIBS_opencv_example@
+ LIBS_opencv_wrapper = @LIBS_opencv_wrapper@
+ LIBS_opus = @LIBS_opus@
+ LIBS_param_eq = @LIBS_param_eq@
+@@ -1282,7 +1268,6 @@
+ LTLIBogg = @LTLIBogg@
+ LTLIBomxil = @LTLIBomxil@
+ LTLIBomxil_vout = @LTLIBomxil_vout@
+-LTLIBopencv_example = @LTLIBopencv_example@
+ LTLIBopencv_wrapper = @LTLIBopencv_wrapper@
+ LTLIBopensles_android = @LTLIBopensles_android@
+ LTLIBopus = @LTLIBopus@
+@@ -1594,9 +1579,9 @@
+ libwave_plugin.la libgradfun_plugin.la libyuvp_plugin.la \
+ libantiflicker_plugin.la libhqdn3d_plugin.la \
+ libanaglyph_plugin.la liboldmovie_plugin.la libvhs_plugin.la \
+- libfreeze_plugin.la $(LTLIBatmo) $(LTLIBopencv_example) \
++ libfreeze_plugin.la $(LTLIBatmo) \
+ $(LTLIBopencv_wrapper) $(LTLIBpostproc)
+-EXTRA_LTLIBRARIES = libatmo_plugin.la libopencv_example_plugin.la \
++EXTRA_LTLIBRARIES = libatmo_plugin.la \
+ libopencv_wrapper_plugin.la libpostproc_plugin.la
+ EXTRA_DIST = Modules.am
+ AUTOMAKE_OPTIONS = subdir-objects
+@@ -1668,7 +1653,6 @@
+ SOURCES_gradient = gradient.c
+ SOURCES_ball = ball.c
+ SOURCES_opencv_wrapper = opencv_wrapper.c
+-SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
+ librotate_plugin_la_SOURCES = rotate.c
+ librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM)
+ librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath \
+@@ -1929,20 +1913,6 @@
+ liboldmovie_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_oldmovie)
+ liboldmovie_plugin_la_LIBADD = $(LIBS_oldmovie)
+ liboldmovie_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' $(LDFLAGS_oldmovie)
+-libopencv_example_plugin_la_SOURCES = $(SOURCES_opencv_example)
+-libopencv_example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_opencv_example) -DMODULE_NAME_IS_opencv_example
+-libopencv_example_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_opencv_example)
+-libopencv_example_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_opencv_example)
+-libopencv_example_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_opencv_example)
+-libopencv_example_plugin_la_LIBADD = $(LIBS_opencv_example)
+-libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' $(LDFLAGS_opencv_example)
+-libopencv_wrapper_plugin_la_SOURCES = $(SOURCES_opencv_wrapper)
+-libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_opencv_wrapper) -DMODULE_NAME_IS_opencv_wrapper
+-libopencv_wrapper_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_opencv_wrapper)
+-libopencv_wrapper_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_opencv_wrapper)
+-libopencv_wrapper_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_opencv_wrapper)
+-libopencv_wrapper_plugin_la_LIBADD = $(LIBS_opencv_wrapper)
+-libopencv_wrapper_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' $(LDFLAGS_opencv_wrapper)
+ libposterize_plugin_la_SOURCES = $(SOURCES_posterize)
+ libposterize_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_posterize) -DMODULE_NAME_IS_posterize
+ libposterize_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_posterize)
+@@ -2305,8 +2275,6 @@
+ liboldmovie_plugin.la: $(liboldmovie_plugin_la_OBJECTS) $(liboldmovie_plugin_la_DEPENDENCIES) $(EXTRA_liboldmovie_plugin_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(liboldmovie_plugin_la_LINK) -rpath $(video_filterdir) $(liboldmovie_plugin_la_OBJECTS) $(liboldmovie_plugin_la_LIBADD) $(LIBS)
+
+-libopencv_example_plugin.la: $(libopencv_example_plugin_la_OBJECTS) $(libopencv_example_plugin_la_DEPENDENCIES) $(EXTRA_libopencv_example_plugin_la_DEPENDENCIES)
+- $(AM_V_CXXLD)$(libopencv_example_plugin_la_LINK) $(libopencv_example_plugin_la_OBJECTS) $(libopencv_example_plugin_la_LIBADD) $(LIBS)
+
+ libopencv_wrapper_plugin.la: $(libopencv_wrapper_plugin_la_OBJECTS) $(libopencv_wrapper_plugin_la_DEPENDENCIES) $(EXTRA_libopencv_wrapper_plugin_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libopencv_wrapper_plugin_la_LINK) $(libopencv_wrapper_plugin_la_OBJECTS) $(libopencv_wrapper_plugin_la_LIBADD) $(LIBS)
+@@ -2404,7 +2372,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmotionblur_plugin_la-motionblur.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmotiondetect_plugin_la-motiondetect.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmovie_plugin_la-oldmovie.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopencv_example_plugin_la-opencv_example.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopencv_wrapper_plugin_la-opencv_wrapper.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libposterize_plugin_la-posterize.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpostproc_plugin_la-postproc.Plo@am__quote@
+@@ -3052,12 +3019,6 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libblend_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libblend_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libblend_plugin_la-blend.lo `test -f 'blend.cpp' || echo '$(srcdir)/'`blend.cpp
+
+-libopencv_example_plugin_la-opencv_example.lo: opencv_example.cpp
+-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopencv_example_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libopencv_example_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libopencv_example_plugin_la-opencv_example.lo -MD -MP -MF $(DEPDIR)/libopencv_example_plugin_la-opencv_example.Tpo -c -o libopencv_example_plugin_la-opencv_example.lo `test -f 'opencv_example.cpp' || echo '$(srcdir)/'`opencv_example.cpp
+-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libopencv_example_plugin_la-opencv_example.Tpo $(DEPDIR)/libopencv_example_plugin_la-opencv_example.Plo
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='opencv_example.cpp' object='libopencv_example_plugin_la-opencv_example.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopencv_example_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libopencv_example_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libopencv_example_plugin_la-opencv_example.lo `test -f 'opencv_example.cpp' || echo '$(srcdir)/'`opencv_example.cpp
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+Exit 1
+--- modules/video_filter/orig.Modules.am 2015-02-02 20:42:29.000000000 +0100
++++ modules/video_filter/Modules.am 2016-02-24 18:22:23.000000000 +0100
+@@ -65,7 +65,6 @@
+ SOURCES_gradient = gradient.c
+ SOURCES_ball = ball.c
+ SOURCES_opencv_wrapper = opencv_wrapper.c
+-SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
+
+ librotate_plugin_la_SOURCES = rotate.c
+ librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM)
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchopencv_includesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-opencv_includes.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-opencv_includes.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-opencv_includes.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- modules/video_filter/opencv_wrapper.c.orig 2016-02-23 10:07:58.000000000 +0100
++++ modules/video_filter/opencv_wrapper.c 2016-02-23 10:03:36.000000000 +0100
+@@ -39,6 +39,7 @@
+ #include <vlc_image.h>
+ #include "filter_picture.h"
+
++#include <opencv2/core/fast_math.hpp>
+ #include <opencv2/core/core_c.h>
+ #include <opencv2/core/types_c.h>
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchsimplepreferencesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-simplepreferences.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-simplepreferences.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-simplepreferences.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+diff --git modules/gui/qt4/components/simple_preferences.cpp modules/gui/qt4/components/simple_preferences.cpp
+index 2487cc4..cfe6a3b 100644
+--- modules/gui/qt4/components/simple_preferences.cpp
++++ modules/gui/qt4/components/simple_preferences.cpp
+@@ -225,7 +225,7 @@ static int getDefaultAudioVolume(vlc_object_t *obj, const char *aout)
+ return -1;
+ else
+ #ifdef __APPLE__
+- if (!strcmp("auhal") && module_exists("auhal"))
++ if (!strcmp(aout, "auhal") && module_exists("auhal"))
+ return (config_GetFloat(obj, "auhal-volume") * 100.f + .5f)
+ / AOUT_VOLUME_DEFAULT;
+ else
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchvlcformacportsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/patch-vlc-for-macports.diff (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-vlc-for-macports.diff 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/patch-vlc-for-macports.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> diff --git modules/lua/vlc.c modules/lua/vlc.c
</span><del>-index 14b5520..92668f1 100644
</del><ins>+index df235d0..b753346 100644
</ins><span class="cx"> --- modules/lua/vlc.c
</span><span class="cx"> +++ modules/lua/vlc.c
</span><del>-@@ -234,10 +234,22 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
</del><ins>+@@ -232,10 +232,22 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
</ins><span class="cx"> i++;
</span><del>-
</del><ins>+
</ins><span class="cx"> #if defined(__APPLE__)
</span><span class="cx"> - if( likely(asprintf( &ppsz_dir_list[i],
</span><span class="cx"> + if( strcasestr (psz_datapath, "/share") == NULL
</span><span class="lines">@@ -27,107 +27,96 @@
</span><span class="cx"> free( psz_datapath );
</span><span class="cx"> }
</span><span class="cx"> diff --git src/darwin/dirs.c src/darwin/dirs.c
</span><del>-index 83c27a4..7e8b0cb 100644
</del><ins>+index 381729c..9174602 100644
</ins><span class="cx"> --- src/darwin/dirs.c
</span><span class="cx"> +++ src/darwin/dirs.c
</span><del>-@@ -42,6 +42,14 @@
</del><ins>+@@ -43,14 +43,20 @@
</ins><span class="cx"> # define MAXPATHLEN 1024
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-+// this is set to true in config_GetLibDir() if it detects we're installed
-+// in a (linux-specific) posix way.
-+static int libDirIsPosix = FALSE;
-+
</del><ins>+-char *config_GetLibDir (void)
</ins><span class="cx"> +// 20150205: we should do case-insensitive filename comparisons. HFS is case-insensitive by default,
</span><span class="cx"> +// and while it strives to preserve case there is no guarantee that case folding will never occur,
</span><span class="cx"> +// especially in directory components.
</span><span class="cx"> +
</span><del>- static char *config_GetLibPath (void)
</del><ins>++// @p libDirIsPosix is set to true in if getLibDir() detects we're installed
++// in a (linux-specific) posix way, like e.g. MacPorts would do.
++char *getLibDir (bool *libDirIsPosix)
</ins><span class="cx"> {
</span><ins>++ *libDirIsPosix = FALSE;
</ins><span class="cx"> /* Get the full program path and name */
</span><del>-@@ -49,7 +57,7 @@ static char *config_GetLibPath (void)
- for (unsigned i = 0; i < _dyld_image_count(); i++)
- {
</del><ins>+ /* First try to see if we are linked to the framework */
+- for (unsigned i = 0; i < _dyld_image_count(); i++)
+- {
++ for (unsigned i = 0; i < _dyld_image_count(); i++) {
</ins><span class="cx"> const char *psz_img_name = _dyld_get_image_name(i);
</span><span class="cx"> - const char *p = strstr( psz_img_name, "VLCKit.framework/Versions/" );
</span><span class="cx"> + const char *p = strcasestr( psz_img_name, "VLCKit.framework/Versions/" );
</span><span class="cx">
</span><span class="cx"> /* Check for "VLCKit.framework/Versions/Current/VLCKit",
</span><span class="cx"> * as well as "VLCKit.framework/Versions/A/VLCKit" and
</span><del>-@@ -61,26 +69,26 @@ static char *config_GetLibPath (void)
</del><ins>+@@ -61,18 +67,18 @@ char *config_GetLibDir (void)
</ins><span class="cx"> p += strcspn( p, "/" );
</span><span class="cx">
</span><del>- /* If the string ends with VLC then we've found a winner */
-- if ( !strcmp( p, "/VLCKit" ) )
-+ if ( !strcasecmp( p, "/VLCKit" ) )
- return strdup( psz_img_name );
</del><ins>+ /* If the string ends with VLCKit then we've found a winner */
+- if (!strcmp( p, "/VLCKit"))
++ if (!strcasecmp( p, "/VLCKit"))
+ return strdup( dirname(psz_img_name) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - /* Do we end by "VLC"? If so we are the legacy VLC.app that doesn't
</span><del>-+ /* Do we end in "MacOS/VLC"? If so we are the legacy (?!) VLC.app that doesn't
</del><ins>++ /* Do we end by "MacOS/VLC"? If so we are the legacy VLC.app that doesn't
</ins><span class="cx"> * link to VLCKit. */
</span><span class="cx"> size_t len = strlen(psz_img_name);
</span><del>-- if( len >= 3 && !strcmp( psz_img_name + len - 3, "VLC") )
-+ if( len >= 9 && !strcasecmp( psz_img_name + len - 9, "MacOS/VLC") )
- return strdup( psz_img_name );
</del><ins>+- if (len >= 3 && !strcmp( psz_img_name + len - 3, "VLC"))
++ if (len >= 9 && !strcasecmp( psz_img_name + len - 9, "MacOS/VLC"))
+ return strdup( dirname(psz_img_name) );
</ins><span class="cx">
</span><del>-- /* Do we end by "VLC-Plugin"? oh, we must be the NPAPI plugin */
-- if( len >= 10 && !strcmp( psz_img_name + len - 10, "VLC-Plugin") )
-+ /* Do we end in "VLC-Plugin"? oh, we must be the NPAPI plugin */
-+ if( len >= 10 && !strcasecmp( psz_img_name + len - 10, "VLC-Plugin") )
- return strdup( psz_img_name );
</del><ins>+ /* Do we end by "VLC-Plugin"? oh, we must be the NPAPI plugin */
+- if (len >= 10 && !strcmp( psz_img_name + len - 10, "VLC-Plugin"))
++ if (len >= 10 && !strcasecmp( psz_img_name + len - 10, "VLC-Plugin"))
+ return strdup( dirname(psz_img_name) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- /* We are not linked to the VLC.framework, let's use dladdr to figure
-- * libvlc path */
-+ /* We are not linked to the VLC.framework, we'rebreak not VLC.app either,
-+ * so let's use dladdr to figure the libvlc path */
- Dl_info info;
- if( dladdr(system_Init, &info) )
-- return strdup(dirname( info.dli_fname ));
-+ return strdup(dirname( (char*)info.dli_fname ));
</del><ins>+@@ -84,6 +90,7 @@ char *config_GetLibDir (void)
+ char *path = NULL;
+ asprintf(&path, "%s/"PACKAGE, incompletepath);
+ free(incompletepath);
++ *libDirIsPosix = TRUE;
+ return path;
+ }
</ins><span class="cx">
</span><del>- char path[MAXPATHLEN+1];
- uint32_t path_len = sizeof(path) - 1;
-@@ -99,6 +107,19 @@ char *config_GetLibDir (void)
- if (p != NULL)
- {
- *p = '\0';
-+ p = strrchr (path, '.');
-+ if (p == NULL || !strcasestr(p, ".app/Contents/MacOS"))
-+ {
-+ // we're NOT running an OS X style app bundle;
-+ // return the Linux/POSIX style LibDir.
-+ free(path);
-+ path = strdup (PKGLIBDIR);
-+ libDirIsPosix = TRUE;
-+ }
-+ else
-+ {
-+ libDirIsPosix = FALSE;
-+ }
- return path;
- }
- free (path);
-@@ -115,8 +136,26 @@ char *config_GetDataDir (void)
</del><ins>+@@ -91,15 +98,37 @@ char *config_GetLibDir (void)
+ abort ();
+ }
+
++char *config_GetLibDir (void)
++{
++ bool isPosixStub;
++ return getLibDir (&isPosixStub);
++}
++
+ char *config_GetDataDir (void)
+ {
+ const char *path = getenv ("VLC_DATA_PATH");
+ if (path)
</ins><span class="cx"> return strdup (path);
</span><span class="cx">
</span><del>- char *vlcpath = config_GetLibDir ();
</del><ins>+- char *vlcpath = config_GetLibDir ();
</ins><span class="cx"> - char *datadir;
</span><ins>++ bool libDirIsPosix;
++ char *vlcpath = getLibDir (&libDirIsPosix);
</ins><span class="cx"> + char *datadir = NULL;
</span><span class="cx">
</span><del>-+ if (libDirIsPosix)
-+ {
</del><ins>++ if (libDirIsPosix) {
</ins><span class="cx"> + // vlcpath should point to something like /opt/local/lib/vlc
</span><span class="cx"> + // if so, we can chop off the /lib/vlc bit, and then add /share
</span><span class="cx"> + // like we would otherwise.
</span><del>-+ char *p = strcasestr (vlcpath, "/lib/");
-+ if (p != NULL)
-+ {
</del><ins>++ char *p = strcasestr(vlcpath, "/lib/");
++ if (p != NULL) {
</ins><span class="cx"> + *p = '\0';
</span><span class="cx"> + }
</span><del>-+ else
-+ {
</del><ins>++ else {
</ins><span class="cx"> + // something else ... return PKGDATADIR
</span><span class="cx"> + free(vlcpath);
</span><span class="cx"> + datadir = strdup(PKGDATADIR);
</span><span class="lines">@@ -137,24 +126,38 @@
</span><span class="cx"> if (asprintf (&datadir, "%s/share", vlcpath) == -1)
</span><span class="cx"> datadir = NULL;
</span><span class="cx">
</span><del>-diff --git src/interface/interface.c src/interface/interface.c
-index b1dcfaf..f31a4a5 100644
---- src/interface/interface.c
-+++ src/interface/interface.c
-@@ -113,8 +113,14 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
- char *module;
- char *psz_tmp = config_ChainCreate( &module, &p_intf->p_cfg,
- psz_parser );
-- free( psz_tmp );
-- free( psz_parser );
-+ if (psz_tmp)
-+ {
-+ free( psz_tmp );
</del><ins>+@@ -137,16 +166,24 @@ static char *getAppDependentDir(vlc_userdir_t type)
+ }
+
+ // Default fallback
+- const char *name = "org.videolan.vlc";
+-
+- CFBundleRef mainBundle = CFBundleGetMainBundle();
+- if (mainBundle) {
+- CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
+- if (identifierAsNS) {
+- char identifier[256];
+- Boolean ret = CFStringGetCString(identifierAsNS, identifier, sizeof(identifier), kCFStringEncodingUTF8);
+- if (ret)
+- name = identifier;
++ char name[256] = "org.videolan.vlc";
++ bool libDirIsPosix;
++ char *vlcpath = getLibDir(&libDirIsPosix);
++ if (vlcpath) {
++ free(vlcpath);
</ins><span class="cx"> + }
</span><del>-+ if (psz_parser)
-+ {
-+ free( psz_parser );
-+ }
- p_intf->p_module = module_need( p_intf, "interface", module, true );
- free(module);
- if( p_intf->p_module == NULL )
</del><ins>++
++ if (!libDirIsPosix) {
++ CFBundleRef mainBundle = CFBundleGetMainBundle();
++ if (mainBundle) {
++ CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
++ if (identifierAsNS) {
++ char identifier[256];
++ Boolean ret = CFStringGetCString(identifierAsNS, identifier, sizeof(identifier), kCFStringEncodingUTF8);
++ // Don't use an empty identifier (= the application that links to us doesn't have a CFBundleIdentifier set).
++ if (ret && strlen(identifier))
++ strcpy(name, identifier);
++ }
+ }
+ }
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchvlcnoO4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-vlc-no-O4.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-vlc-no-O4.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-vlc-no-O4.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+diff --git configure.ac configure.ac
+index a085ac3..f737b2d 100644
+--- configure.ac
++++ configure.ac
+@@ -940,10 +942,10 @@ AS_IF([test "${enable_optimizations}" != "no"], [
+ dnl -O4 and -O3 only in production builds
+ AS_IF([test "${enable_debug}" = "no"], [
+ VLC_SAVE_FLAGS
+- CFLAGS="${CFLAGS} -O4"
+- CXXFLAGS="${CXXFLAGS} -O4"
+- OBJCFLAGS="${OBJCFLAGS} -O4"
+- AC_CACHE_CHECK([if $CC accepts -O4], [ac_cv_c_o4], [
++ CFLAGS="${CFLAGS} -O3"
++ CXXFLAGS="${CXXFLAGS} -O3"
++ OBJCFLAGS="${OBJCFLAGS} -O3"
++ AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o4], [
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
+ ac_cv_c_o4=yes
+ ], [
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchvlcnoqt5diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-vlc-no-qt5.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-vlc-no-qt5.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-vlc-no-qt5.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+diff --git configure.ac configure.ac
+index a085ac3..8c6eb3d 100644
+--- configure.ac
++++ configure.ac
+@@ -3701,7 +3701,7 @@ AC_ARG_ENABLE(qt, [
+ ])
+ ])
+ AS_IF([test "${enable_qt}" != "no"], [
+- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
++ PKG_CHECK_MODULES([QT], [Qt5Core >= 6.1.0 Qt5Widgets Qt5Gui], [
+ PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
+ VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
+ VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchvlcqtconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-vlc-qt-configureac.diff (0 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-vlc-qt-configureac.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-vlc-qt-configureac.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+diff --git configure.ac configure.ac
+index a085ac3..f0b2c0a 100644
+--- configure.ac
++++ configure.ac
+@@ -69,6 +69,7 @@ AM_PROG_CC_C_O
+ AC_PROG_CXX
+ AC_PROG_CPP
+ AC_PROG_OBJC
++AC_PROG_OBJCXX
+ _AM_DEPENDENCIES([OBJC])
+ AC_PROG_EGREP
+ AC_PROG_MAKE_SET
+diff --git modules/gui/qt4/Makefile.am modules/gui/qt4/Makefile.am
+index 1a564cf..ff4ea4c 100644
+--- modules/gui/qt4/Makefile.am
++++ modules/gui/qt4/Makefile.am
+@@ -26,6 +26,7 @@ libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
+ endif
+ endif
+ if HAVE_DARWIN
++libqt4_plugin_la_OBJCXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt4)
+ libqt4_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
+ endif
+
+@@ -118,6 +119,9 @@ libqt4_plugin_la_SOURCES = \
+ if HAVE_WIN32
+ libqt4_plugin_la_SOURCES += main_interface_win32.cpp
+ endif
++if HAVE_DARWIN
++libqt4_plugin_la_SOURCES += util/searchlineedit_mac.mm
++endif
+
+ # Meta-object compilation
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchvlcqt4macdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/patch-vlc-qt4mac.diff (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-vlc-qt4mac.diff 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/patch-vlc-qt4mac.diff 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,97 +0,0 @@
</span><del>-diff --git modules/gui/qt4/util/searchlineedit.cpp modules/gui/qt4/util/searchlineedit.cpp
-index 94744ec..e83625d 100644
---- modules/gui/qt4/util/searchlineedit.cpp
-+++ modules/gui/qt4/util/searchlineedit.cpp
-@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
- }
- #endif
-
--#ifndef Q_OS_MAC
-+#ifndef Q_OS_MAC_UNUSED
- SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
- {
- clearButton = new QFramelessButton( this );
-@@ -202,4 +202,14 @@ void SearchLineEdit::searchEditingFinished()
- emit searchDelayedChanged( text() );
- }
-
-+// #else
-+//
-+// void SearchLineEdit::updateText( const QString& text )
-+// {
-+// }
-+//
-+// void SearchLineEdit::searchEditingFinished()
-+// {
-+// }
-+
- #endif
-diff --git modules/gui/qt4/util/searchlineedit.hpp modules/gui/qt4/util/searchlineedit.hpp
-index a09b9bc..8d9e2b7 100644
---- modules/gui/qt4/util/searchlineedit.hpp
-+++ modules/gui/qt4/util/searchlineedit.hpp
-@@ -72,7 +72,7 @@ private:
- };
- #endif
-
--#ifndef Q_OS_MAC
-+#ifndef Q_OS_MAC_UNUSED
- class QFramelessButton;
- class SearchLineEdit : public QLineEdit
- {
-@@ -99,28 +99,33 @@ private slots:
- signals:
- void searchDelayedChanged( const QString& );
- };
--#else
--
--/* On Mac, we try to use the native NSSearchField */
--#include <QMacCocoaViewContainer>
--
--class SearchLineEdit : public QMacCocoaViewContainer
--{
-- Q_OBJECT
--
--public:
-- SearchLineEdit(QWidget *parent = 0);
-- virtual ~SearchLineEdit() {}
--
-- virtual QSize sizeHint() const { return QSize(150, 40); }
--
--public slots:
-- void clear() {}
--
--signals:
-- void searchDelayedChanged( const QString& );
-- void textEdited( const QString& );
--};
-+// #else
-+//
-+// /* On Mac, we try to use the native NSSearchField */
-+// #include <QMacCocoaViewContainer>
-+//
-+// class SearchLineEdit : public QMacCocoaViewContainer
-+// {
-+// Q_OBJECT
-+//
-+// public:
-+// SearchLineEdit(QWidget *parent = 0);
-+// virtual ~SearchLineEdit() {}
-+//
-+// virtual QSize sizeHint() const { return QSize(150, 40); }
-+//
-+// public slots:
-+// void clear() {}
-+//
-+// // moc does not look at #ifdefs, so we must provide the same slots and signals
-+// private slots:
-+// void updateText( const QString& );
-+// void searchEditingFinished();
-+//
-+// signals:
-+// void searchDelayedChanged( const QString& );
-+// void textEdited( const QString& );
-+// };
- #endif
-
- #endif
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesqtkitpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/qtkit.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/qtkit.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/qtkit.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>---- modules/access/Modules.am
-+++ modules/access/Modules.am
-@@ -1,3 +1,5 @@
-+AM_LIBTOOLFLAGS=--tag=CC
-+
- SUBDIRS = rtp
- noinst_LTLIBRARIES =
-
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCfilesstatic_assertpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/static_assert.patch (146097 => 146098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/static_assert.patch 2016-02-27 09:03:44 UTC (rev 146097)
+++ trunk/dports/multimedia/VLC/files/static_assert.patch 2016-02-27 10:27:22 UTC (rev 146098)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
-index 9d20a2d..4c99329 100644
</del><ins>+diff --git include/vlc_fixups.h include/vlc_fixups.h
+index b448d83..638b864 100644
</ins><span class="cx"> --- include/vlc_fixups.h
</span><span class="cx"> +++ include/vlc_fixups.h
</span><del>-@@ -241,8 +241,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
</del><ins>+@@ -239,8 +239,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>