<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aabe67d1c6283104e1e70a0832eff3f9ce6e9b3e">https://github.com/macports/macports-ports/commit/aabe67d1c6283104e1e70a0832eff3f9ce6e9b3e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new aabe67d Rename port:VLC@2.2.8 to VLC2 and upgrade port:VLC to 3.0.6
</span>aabe67d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aabe67d1c6283104e1e70a0832eff3f9ce6e9b3e
</span>Author: René J.V. Bertin <rjvbertin@gmail.com>
AuthorDate: Mon Feb 18 10:38:09 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> Rename port:VLC@2.2.8 to VLC2 and upgrade port:VLC to 3.0.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The VLC v3 series only build on Darwin 14 and up; while libVLC can still
</span><span style='display:block; white-space:pre;color:#404040;'> be built on Darwin 13.
</span><span style='display:block; white-space:pre;color:#404040;'> This proposal copies the current VLC and libVLC ports to VLC2 (libVLC2)
</span><span style='display:block; white-space:pre;color:#404040;'> and upgrades them to v3.0.6 . Logic is introduced that aims to
</span><span style='display:block; white-space:pre;color:#404040;'> - replace (install) port:VLC with (instead of) port:VLC2 on 10.9-
</span><span style='display:block; white-space:pre;color:#404040;'> - replace (install) port:libVLC with (instead of) port:libVLC2 on 10.8-
</span><span style='display:block; white-space:pre;color:#404040;'> - do the reverse when those systems are upgraded
</span>---
multimedia/VLC/Portfile | 778 +++++++++++----------
multimedia/VLC/files/configure.ac-no-arch.patch | 45 ++
multimedia/VLC/files/lock.h | 158 +++++
multimedia/VLC/files/patch-build-on-darwin13.diff | 242 +++++++
multimedia/VLC/files/patch-ffmpegVLC.diff | 82 +++
multimedia/VLC/files/patch-for-libvpx-1.8.0.diff | 32 +
multimedia/VLC/files/patch-for-lua53.diff | 218 +++---
multimedia/VLC/files/patch-no-@rpath.diff | 60 ++
multimedia/VLC/files/patch-no-hrtfs.diff | 11 +
multimedia/VLC/files/patch-static_assert.diff | 27 +-
multimedia/VLC/files/patch-use-NSGetEnviron.diff | 4 +-
multimedia/VLC/files/patch-vda-ffmpeg34+.diff | 3 +-
multimedia/VLC/files/patch-vlc-for-macports.diff | 95 ++-
multimedia/{VLC => VLC2}/Portfile | 74 +-
.../files/PR-34741-no__clang_version__.patch | 0
.../{VLC => VLC2}/files/buildfix-package.mak.patch | 0
multimedia/VLC2/files/no-sparkle.patch | 189 +++++
.../{VLC => VLC2}/files/patch-configure.ac.diff | 0
.../{VLC => VLC2}/files/patch-ffmpeg3-compat.diff | 0
.../{VLC => VLC2}/files/patch-ffmpeg4-compat.diff | 0
.../{VLC => VLC2}/files/patch-for-lua53.diff | 0
.../files/patch-modules-codec-x264-new-api.diff | 0
.../files/patch-no-opencv_example.diff | 0
.../{VLC => VLC2}/files/patch-opencv_includes.diff | 0
.../{VLC => VLC2}/files/patch-really-no-qtkit.diff | 0
multimedia/VLC2/files/patch-soundfont-path.diff | 13 +
.../{VLC => VLC2}/files/patch-static_assert.diff | 0
.../files/patch-use-NSGetEnviron.diff | 0
.../{VLC => VLC2}/files/patch-vda-ffmpeg34+.diff | 0
.../files/patch-vlc-for-macports.diff | 0
.../{VLC => VLC2}/files/patch-vlc-no-O4.diff | 0
31 files changed, 1425 insertions(+), 606 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5065591..74fe6af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,172 +1,176 @@
</span> # -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name VLC
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories multimedia devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories multimedia devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description VLC is a cross-platform media player and streaming server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description VLC media player is a highly portable multimedia player for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It can also be used as a server to stream in unicast or multicast \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in IPv4 or IPv6 on a high-bandwidth network.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description VLC is a cross-platform media player and streaming server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description VLC media player is a highly portable multimedia player for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It can also be used as a server to stream in unicast or multicast \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in IPv4 or IPv6 on a high-bandwidth network.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.videolan.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.videolan.org
</span>
subport lib${name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description the core engine and interface to VLC's multimedia framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description libVLC is the core engine and the interface to the multimedia \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- framework on which VLC media player is based. It allows developers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to create a wide range of multimedia applications using the VLC features.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage http://www.videolan.org/vlc/libvlc.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description the core engine and interface to VLC's multimedia framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libVLC is the core engine and the interface to the multimedia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framework on which VLC media player is based. It allows developers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to create a wide range of multimedia applications using the VLC features.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name} VLC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage http://www.videolan.org/vlc/libvlc.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libVLC builds on 10.9 (Darwin 13)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by libVLC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by VLC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # given the Portfile design it's easier to shunt the entire patch phase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rather than trying to keep the patchfiles list empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name} libVLC2
</span> }
# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-################### ports VLC and libVLC ###################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname vlc-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4434e91384520fe1fe129a52f5d66d61e4404a9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable HFS compression of the workdir if the compress_workdir PortGroup is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${filespath}/../../../_resources/port1.0/group/compress_workdir-1.0.tcl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup compress_workdir 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ffmpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:a52dec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:avahi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:faad2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fluidsynth \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fribidi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnutls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libass \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libbluray \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libcddb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libcdio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdc1394 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdvbpsi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdvdnav \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdvdread \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libebml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcrypt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgpg-error \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libid3tag \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libidn \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmatroska \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmodplug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmpcdec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmpeg2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmtp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libogg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libopus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libproxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsamplerate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsndfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libssh2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtheora \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libupnp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libusb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libvorbis \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libvpx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:live555 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nettle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:orc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p11-kit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:schroedinger \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:speex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:speexDSP \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:taglib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:twolame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vcdimager \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:x264 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:x265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:libaacs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libbdplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname vlc-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 717f81c5ab63d7d5cdb427a198d958e0e418609f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25699704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/libavcodec.diff:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:a52dec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:avahi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:faad2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fluidsynth \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fribidi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libass \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libbluray \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcddb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcdio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdc1394 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdvbpsi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdvdnav \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdvdread \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libebml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcrypt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgpg-error \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libid3tag \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libidn \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmatroska \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmodplug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmpcdec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmpeg2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmtp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libopus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libproxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsamplerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libssh2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libupnp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libusb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvpx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:live555 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nettle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:orc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p11-kit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:schroedinger \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:speex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:taglib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:twolame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vcdimager \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:x264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:x265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:libaacs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libbdplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} requires Mac OS X 10.9 or greater."
</span> return -code error "incompatible Mac OS X version"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} == 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_deployment_target 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-macosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {exec xcrun --show-sdk-path -sdk macosx10.10} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Using SDK macosx10.10 : ${result}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-macosx-sdk=${result}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${worksrcpath}/include/os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/lock.h ${worksrcpath}/include/os/lock.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-on-darwin13.diff
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-4.2 llvm-gcc-4.2 {clang < 300}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:lua
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles buildfix-package.mak.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-34741-no__clang_version__.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-static_assert.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no-sparkle.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vlc-no-O4.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-soundfont-path.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # FFMpeg 3 compatibility (see attributions in the patchfile)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vda-ffmpeg34+.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # FFMpeg 4 compatibility (by RJVB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg4-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# VLC doesn't currently build for me using port:clang-3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.2 llvm-gcc-4.2 macports-clang-3.8 {clang < 300}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # libx264 api changed slightly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-modules-codec-x264-new-api.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append configure.ac-no-arch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-soundfont-path.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists replaced_by]} {
</span> post-patch {
if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
reinplace "s:-lstdc\+\+:-lc++:" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,211 +179,235 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/modules/codec/fluidsynth.c
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do autoreconf only the first time around
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoreconf [expr ![file exists ${worksrcpath}/config.status]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:libtool port:autoconf port:automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXCPP="${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gl.c:121:3: error: Platform not recognized.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -D__unix__=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # live555 is installed to a weird location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${prefix}/lib/live/liveMedia/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://download.videolan.org/pub/videolan/vlc/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Other
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-contrib=${worksrcpath}/contrib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug --disable-update-check --enable-gnutls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-notify --disable-dbus --enable-lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-atmo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Input Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dvdnav --enable-dvdread --disable-smbclient --enable-vcdx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-freerdp --disable-opencv --enable-sftp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mux/Demux Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dvbpsi --enable-ogg --enable-mux_ogg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-mkv --enable-mod --enable-mpc --disable-shout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Codec Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-a52 --enable-faad --enable-flac --enable-live555 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dca --enable-png --disable-quicktime --enable-twolame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-speex --enable-theora --enable-x264 --enable-x265 --enable-postproc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gst-decode --enable-avcodec --enable-avformat --enable-swscale \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-fluidsynth --enable-schroedinger --enable-vpx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Video Plugins. We do our best to deactivate X11 and disable its auto-detection by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # claiming the headers and libs are somewhere they're not.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-caca --enable-sdl --enable-sdl-image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x --disable-xcb --disable-xvideo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-includes=${destroot} --x-libraries=${destroot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-freetype --enable-fontconfig --enable-fribidi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-svg --disable-svgdec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Audio Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-jack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-samplerate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pulse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-chromaprint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Interface Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-macosx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-macosx-dialog-provider \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-qt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-skins2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-vnc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Visualisations and Video Filter Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-goom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Service Discovery Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-bonjour \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-upnp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 20150209: Jack really would require a newer variant than what's currently in MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant jack description {Enable jack plugin for audio output} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:jack port:portaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-jack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-jack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant dbus description {Enable DBus support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-dbus --enable-dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args-append "|& tee -a ${workpath}/.macports.${subport}.configure.log'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmd [join "${configure.cmd} ${configure.pre_args} ${configure.args}"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-prepend "-cf '${configure.cmd} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd "/bin/csh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "configure command set to `${configure.cmd} ${configure.pre_args} ${configure.args} ${configure.post_args}`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '## ${cmd}' > ${workpath}/.macports.${subport}.configure.log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QTKit was disabled in 10.12 "Sierra"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qtkit description {Enable qtcapture and qtaudio} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-macosx-qtkit --enable-macosx-qtkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do autoreconf only the first time around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf [expr ![file exists ${worksrcpath}/config.status]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:libtool port:autoconf port:automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXCPP="${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1 -k
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gl.c:121:3: error: Platform not recognized.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -D__unix__=1 -Wno-unknown-pragmas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# live555 is installed to a weird location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/lib/live/liveMedia/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The VLC.app target does not obey DESTDIR and tries to copy a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # non-existing folder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.destdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target VLC.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't try to install the (missing) shared/hrtfs folder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # That folder is only used by the spatialaudio plugin which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we don't build at the moment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-hrtfs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant svg description {Enable SVG rendering and decoding support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:librsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-svg --enable-svg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-svgdec --enable-svgdec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://download.videolan.org/pub/videolan/vlc/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-contrib=${worksrcpath}/contrib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-debug --disable-update-check --enable-gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-notify --disable-dbus --enable-lua \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sparkle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Input Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-dvdnav --enable-dvdread --disable-smbclient \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-macosx-qtkit --disable-realrtsp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-freerdp --disable-opencv --enable-sftp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Mux/Demux Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-dvbpsi --enable-ogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-mod --enable-mpc --disable-shout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Codec Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-a52 --enable-faad --enable-flac --enable-live555 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-dca --enable-png --enable-twolame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-speex --enable-theora --enable-x264 --enable-x265 --enable-postproc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gst-decode --enable-avcodec --enable-avformat --enable-swscale \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-fluidsynth --enable-schroedinger --enable-vpx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Video Plugins. We do our best to deactivate X11 and disable its auto-detection by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# claiming the headers and libs are somewhere they're not.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-caca --enable-sdl-image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x --disable-xcb --disable-xvideo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-includes=${destroot} --x-libraries=${destroot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-freetype --enable-fontconfig --enable-fribidi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-svg --disable-svgdec --disable-wayland
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Audio Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-jack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-samplerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-pulse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-chromaprint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Interface Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-macosx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-qt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-skins2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-vnc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Visualisations and Video Filter Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-goom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Service Discovery Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-upnp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 20150209: Jack really would require a newer variant than what's currently in MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant jack description {Enable jack plugin for audio output} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:jack port:portaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant shout description {Enable Shoutcast/Icecast streaming output support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libshout2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-shout --enable-shout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant dbus description {Enable DBus support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-dbus --enable-dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant smb description {Enable Samba 3 input support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:samba3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-smbclient --enable-smbclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib/samba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # QTKit was disabled in 10.12 "Sierra"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qtkit description {Enable qtcapture and qtaudio} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-macosx-qtkit --enable-macosx-qtkit
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant pulse description {Enable PulseAudio support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:pulseaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-pulse --enable-pulse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant svg description {Enable SVG rendering and decoding support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:librsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-svg --enable-svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-svgdec --enable-svgdec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXau \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXdmcp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:XviD \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xcb-util \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xcb-util-keysyms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-x --disable-xvideo --disable-xcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-includes=${destroot} --x-libraries=${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x --enable-xvideo --enable-xcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant shout description {Enable Shoutcast/Icecast streaming output support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libshout2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-shout --enable-shout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant quartz {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:libsamplerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:BGHUDAppKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant smb description {Enable Samba 3 input support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:samba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-smbclient --enable-smbclient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/samba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-vlc-for-macports.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant pulse description {Enable PulseAudio support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-pulse --enable-pulse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-macosx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-samplerate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-realrtsp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # taken from VLC's own configure.sh script for OS X:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-samplerate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-merge-ffmpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-realrtsp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXau \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXdmcp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:XviD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xcb-util \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xcb-util-keysyms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-x --disable-xvideo --disable-xcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-includes=${destroot} --x-libraries=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-x --enable-xvideo --enable-xcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # VLC is not currently compatible with FreeRDP 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant freerdp description {Build the FreeRDP support; currently dysfunctional} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:FreeRDP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # access/rdp.c:45:11: fatal error: 'freerdp/version.h' file not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -DFREERDP_INTERFACE_VERSION \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFREERDP_VERSION_MAJOR=2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFREERDP_VERSION_MINOR=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-freerdp --enable-freerdp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libsamplerate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:BGHUDAppKit
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant huge \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requires jack shout svg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Enable all variants except quartz, smb, freerdp and x11} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-vlc-for-macports.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --enable-samplerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-realrtsp
</span> if {${subport} ne "lib${name}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant full \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requires huge quartz smb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Enable all variants except x11 (and except freerdp, currently)} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant full \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requires huge quartz smb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Enable all variants except x11 (and except freerdp, currently)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-macosx --enable-macosx
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # taken from VLC's own configure.sh script for OS X:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-samplerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-merge-ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-realrtsp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FreeRDP currently doesn't build with CMake >= 3.1 (#47389)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant freerdp description {Build the FreeRDP support; currently dysfunctional} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:FreeRDP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # access/rdp.c:45:11: fatal error: 'freerdp/version.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -DFREERDP_INTERFACE_VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFREERDP_VERSION_MAJOR=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFREERDP_VERSION_MINOR=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-freerdp --enable-freerdp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-for-lua53.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant huge \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires jack shout svg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Enable all variants except quartz, smb, freerdp and x11} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant full \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires huge quartz smb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Enable all variants except x11 (and except freerdp, currently)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant full \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires huge quartz smb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Enable all variants except x11 (and except freerdp, currently)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # make 10.12 and later ignore all QTKit code in modules/gui/macosx/open.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-really-no-qtkit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-for-lua53.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-for-libvpx-1.8.0.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform macosx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qtkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qtkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-use-NSGetEnviron.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use-NSGetEnviron.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-@rpath.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists replaced_by]} {
</span> post-patch {
reinplace "/Sparkle.framework/d" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/VLC.xcodeproj/project.pbxproj
</span> reinplace "/SDKROOT/d" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/VLC.xcodeproj/project.pbxproj
</span> reinplace "/Growl.framework/d" \
${worksrcpath}/extras/package/macosx/package.mak
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,65 +421,59 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> # To trick configure
file mkdir "${worksrcpath}/contrib/lib"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-macosx-eyetv --enable-macosx-eyetv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-macosx-vlc-app --enable-macosx-vlc-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete {*}[glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete {*}[glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These are already in ${prefix}, so we don't need to bundle them as well
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These are already in ${prefix}, so we don't need to bundle them as well
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # There's no need to install these into the bundle and the prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There's no need to install these into the bundle and the prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.macports.org/ticket/35131
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach l [glob -nocomplain ${destroot}${prefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob -nocomplain ${destroot}${prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set locale [file tail ${d}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ldir ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale/${locale}/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${ldir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach m [glob -nocomplain ${d}/LC_MESSAGES/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://trac.macports.org/ticket/35131
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob -nocomplain ${destroot}${prefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob -nocomplain ${destroot}${prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set locale [file tail ${d}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ldir ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale/${locale}/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${ldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach m [glob -nocomplain ${d}/LC_MESSAGES/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the vlc executable needs to be started with a full path to the app bundle executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # or else the Mac OS X interface will hang beyond even a ^C or ^\ :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/vlc ${destroot}${prefix}/bin/vlc.exe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo \"#!/bin/sh\nexec \\\"${applications_dir}/VLC.app/Contents/MacOS/VLC\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/vlc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod 755 ${destroot}${prefix}/bin/vlc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/man
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the vlc executable needs to be started with a full path to the app bundle executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # or else the Mac OS X interface will hang beyond even a ^C or ^\ :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/vlc ${destroot}${prefix}/bin/vlc.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo \"#!/bin/sh\nexec \\\"${applications_dir}/VLC.app/Contents/MacOS/VLC\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/vlc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod 755 ${destroot}${prefix}/bin/vlc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/man
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/lib/vlc/vlc-cache-gen -f ${prefix}/lib/vlc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "MIDI support requires installing one or more SoundFont files,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in ${prefix}/share/sounds/sf2, for instance from port:generaluser-soundfont."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/lib/vlc/vlc-cache-gen ${prefix}/lib/vlc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "MIDI support requires installing one or more SoundFont files,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in ${prefix}/share/sounds/sf2, for instance from port:generaluser-soundfont."
</span>
# 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;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/configure.ac-no-arch.patch b/multimedia/VLC/files/configure.ac-no-arch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..69865e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/configure.ac-no-arch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be65881..704e92a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,20 +138,12 @@ case "${host_os}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl Force gcc "-arch" flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_flag=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${host}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i?86*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_flag="-arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ppc64*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_flag="-arch ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ppc*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_flag="-arch ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ YASMFLAGS="-f macho32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_flag="-arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ YASMFLAGS="-f macho64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_c_bigendian="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,12 +152,12 @@ case "${host_os}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS=darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${CXX} -stdlib=libc++ -std=c++11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag} -Werror=partial-availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 -Werror=partial-availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/lock.h b/multimedia/VLC/files/lock.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..efc5e6c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/lock.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,158 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2016 Apple Inc. All rights reserved.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @APPLE_APACHE_LICENSE_HEADER_START@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * You may obtain a copy of the License at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * http://www.apache.org/licenses/LICENSE-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Unless required by applicable law or agreed to in writing, software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * distributed under the License is distributed on an "AS IS" BASIS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * See the License for the specific language governing permissions and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * limitations under the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @APPLE_APACHE_LICENSE_HEADER_END@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef __OS_LOCK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __OS_LOCK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <sys/cdefs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <os/base.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __has_feature(assume_nonnull)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_ASSUME_NONNULL_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_ASSUME_NONNULL_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_ASSUME_NONNULL_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*! @header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Low-level lock API.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_LOCK_API_VERSION 20160309
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+__BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef __AVAILABILITY_INTERNAL__MAC_10_12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __AVAILABILITY_INTERNAL__MAC_10_12 __attribute__((availability(macosx,introduced=10.12)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_UNFAIR_LOCK_AVAILABILITY \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __OSX_AVAILABLE_STARTING(__MAC_10_12,__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @typedef os_unfair_lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @abstract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Low-level lock that allows waiters to block efficiently on contention.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * In general, higher level synchronization primitives such as those provided by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the pthread or dispatch subsystems should be preferred.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The values stored in the lock should be considered opaque and implementation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * defined, they contain thread ownership information that the system may use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to attempt to resolve priority inversions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This lock must be unlocked from the same thread that locked it, attemps to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * unlock from a different thread will cause an assertion aborting the process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This lock must not be accessed from multiple processes or threads via shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * or multiply-mapped memory, the lock implementation relies on the address of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the lock value and owning process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Must be initialized with OS_UNFAIR_LOCK_INIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @discussion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Replacement for the deprecated OSSpinLock. Does not spin on contention but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * waits in the kernel to be woken up by an unlock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * As with OSSpinLock there is no attempt at fairness or lock ordering, e.g. an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * unlocker can potentially immediately reacquire the lock before a woken up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * waiter gets an opportunity to attempt to acquire the lock. This may be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * advantageous for performance reasons, but also makes starvation of waiters a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * possibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+typedef struct os_unfair_lock_s {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t _os_unfair_lock_opaque;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} os_unfair_lock, *os_unfair_lock_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_UNFAIR_LOCK_INIT ((os_unfair_lock){0})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#elif defined(__cplusplus) && __cplusplus >= 201103L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_UNFAIR_LOCK_INIT (os_unfair_lock{})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#elif defined(__cplusplus)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_UNFAIR_LOCK_INIT (os_unfair_lock())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define OS_UNFAIR_LOCK_INIT {0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @function os_unfair_lock_lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @abstract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Locks an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Pointer to an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void os_unfair_lock_lock(os_unfair_lock_t lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @function os_unfair_lock_trylock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @abstract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Locks an os_unfair_lock if it is not already locked.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @discussion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * It is invalid to surround this function with a retry loop, if this function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * returns false, the program must be able to proceed without having acquired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the lock, or it must call os_unfair_lock_lock() directly (a retry loop around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * os_unfair_lock_trylock() amounts to an inefficient implementation of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * os_unfair_lock_lock() that hides the lock waiter from the system and prevents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * resolution of priority inversions).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Pointer to an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Returns true if the lock was succesfully locked and false if the lock was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * already locked.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_EXPORT OS_NOTHROW OS_WARN_RESULT OS_NONNULL_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bool os_unfair_lock_trylock(os_unfair_lock_t lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @function os_unfair_lock_unlock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @abstract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Unlocks an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Pointer to an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void os_unfair_lock_unlock(os_unfair_lock_t lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+__END_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OS_ASSUME_NONNULL_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif // __OS_LOCK__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-build-on-darwin13.diff b/multimedia/VLC/files/patch-build-on-darwin13.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3c7d7f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-build-on-darwin13.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,242 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/audio_output/auhal.c modules/audio_output/auhal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 22044631c7202fadd43f38eb7dcef24891344993..636217708c443bd6c626d9df3dedf557365c5d41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/audio_output/auhal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/audio_output/auhal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,6 @@ IsAudioFormatDigital(AudioFormatID id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'iac3':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case kAudioFormat60958AC3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case kAudioFormatAC3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case kAudioFormatEnhancedAC3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/vt_utils.c modules/codec/vt_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f0a5f4a00f0972292beb0f29ef8bfcc2b0bc02e6..c919b7d5204e0a6f235b2c60c557ea079d4b12c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/vt_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/vt_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,7 +155,7 @@ cvpxpic_create_mapped(const video_format_t *fmt, CVPixelBufferRef cvpx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default: return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CVPixelBufferLockFlags lock = readonly ? kCVPixelBufferLock_ReadOnly : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ enum CVPixelBufferLockFlags lock = readonly ? kCVPixelBufferLock_ReadOnly : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVPixelBufferLockBaseAddress(cvpx, lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ picture_resource_t rsc = { };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/videotoolbox.m modules/codec/videotoolbox.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a63ac7a62ff84b865b7c23c573992aa2f2b3a30f..2d48e6e96991a5da689d4c055e3ad16bd5674e26 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/videotoolbox.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/videotoolbox.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -996,12 +996,12 @@ static CMVideoCodecType CodecPrecheck(decoder_t *p_dec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCMVideoCodecType_H264;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_CODEC_HEVC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!deviceSupportsHEVC())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if (!deviceSupportsHEVC())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Warn(p_dec, "device doesn't support HEVC");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCMVideoCodecType_HEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// return kCMVideoCodecType_HEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_CODEC_MP4V:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1136,11 +1136,11 @@ static CFMutableDictionaryRef CreateSessionDescriptionFormat(decoder_t *p_dec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case COLOR_SPACE_BT2020:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (&kCVImageBufferColorPrimaries_ITU_R_2020 != nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if (&kCVImageBufferColorPrimaries_ITU_R_2020 != nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* fall through */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case COLOR_SPACE_BT709:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1421,19 +1421,19 @@ static int OpenDecoder(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->b_vt_need_keyframe = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case kCMVideoCodecType_HEVC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_codec_init = InitHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_codec_clean = CleanHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_codec_supported = CodecSupportedHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_late_start = LateStartHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_process_block = ProcessBlockHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_need_restart = VideoToolboxNeedsToRestartHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_configure_vout = ConfigureVoutHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_get_extradata = GetDecoderExtradataHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->pf_fill_reorder_info = FillReorderInfoHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->b_poc_based_reorder = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->b_vt_need_keyframe = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// case kCMVideoCodecType_HEVC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_codec_init = InitHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_codec_clean = CleanHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_codec_supported = CodecSupportedHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_late_start = LateStartHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_process_block = ProcessBlockHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_need_restart = VideoToolboxNeedsToRestartHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_configure_vout = ConfigureVoutHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_get_extradata = GetDecoderExtradataHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->pf_fill_reorder_info = FillReorderInfoHEVC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->b_poc_based_reorder = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// p_sys->b_vt_need_keyframe = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case kCMVideoCodecType_MPEG4Video:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->pf_get_extradata = GetDecoderExtradataMPEG4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/keystore/keychain.m modules/keystore/keychain.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 09b2dc9c1c231cc51a1aa5683b83893982ffc7b4..d2d331c6c9fb20e7de82a7cf54d9132d5778dddb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/keystore/keychain.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/keystore/keychain.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@ static NSString * ErrorForStatus(OSStatus status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OSX_MAVERICKS (NSAppKitVersionNumber >= 1265)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern const CFStringRef kSecAttrAccessible;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// extern const CFStringRef kSecAttrAccessible;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/video_filter/ci_filters.m modules/video_filter/ci_filters.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 795c907aa51a3dffc5452ba163c1073eac5c8621..966062af3f31fdd6dfb8138099d0ae3d57ded61b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/video_filter/ci_filters.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/video_filter/ci_filters.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,10 +36,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "filter_picture.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vt_utils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CoreImage/CIContext.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CoreImage/CIImage.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CoreImage/CIFilter.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CoreImage/CIVector.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QuartzCore/CIContext.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QuartzCore/CIImage.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QuartzCore/CIFilter.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QuartzCore/CIVector.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -589,11 +589,11 @@ Open(vlc_object_t *obj, char const *psz_filter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_CODEC_CVPX_UYVY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_CODEC_CVPX_I420:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_CODEC_CVPX_BGRA:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (&kCGColorSpaceITUR_709 == nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if (&kCGColorSpaceITUR_709 == nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Warn(obj, "iOS/macOS version is too old, aborting...");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/Makefile.in modules/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 29924af..39f3298 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10730,7 +10730,7 @@ video_filter_LTLIBRARIES = libadjust_plugin.la libalphamask_plugin.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS / iOS hardware video filters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libci_filters_plugin_la_SOURCES = video_filter/ci_filters.m codec/vt_utils.c codec/vt_utils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_OSX_TRUE@libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@HAVE_OSX_TRUE@ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@HAVE_OSX_TRUE@ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,QuartzCore -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdeinterlace_common_la_SOURCES = video_filter/deinterlace/common.c video_filter/deinterlace/common.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdeinterlace_common_la_LDFLAGS = -static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/video_filter/Makefile.am modules/video_filter/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af190d1..3f0fc4f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/video_filter/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/video_filter/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +111,7 @@ video_filter_LTLIBRARIES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libci_filters_plugin_la_SOURCES = video_filter/ci_filters.m codec/vt_utils.c codec/vt_utils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,QuartzCore -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ video_filter_LTLIBRARIES += libci_filters_plugin.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/access/qtsound.m modules/access/qtsound.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af190d1..3f0fc4f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/access/orig.qtsound.m 2018-10-28 12:11:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/access/qtsound.m 2019-02-18 00:41:40.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <QTKit/QTKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <AVFoundation/AVFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*****************************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Local prototypes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,6 +320,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Dbg(p_demux, "Check user consent for access to the audio device");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,6 +337,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ audioInput = [[QTCaptureDeviceInput alloc] initWithDevice: p_sys->audiodevice];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!audioInput) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --get modules/access/avcapture.m modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af190d1..3f0fc4f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/access/orig.avcapture.m 2018-10-28 12:11:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/access/avcapture.m 2019-02-18 00:27:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,13 +43,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <AVFoundation/AVFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <CoreMedia/CoreMedia.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-+ (void)requestAccessForMediaType:(AVMediaType)mediaType completionHandler:(void (^)(BOOL granted))handler API_AVAILABLE(macos(10.14), ios(7.0));
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ (void)requestAccessForMediaType:(struct AVMediaType)mediaType completionHandler:(void (^)(BOOL granted))handler API_AVAILABLE(macos(10.14), ios(7.0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*****************************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Local prototypes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,6 +336,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Dbg(p_demux, "Check user consent for access to the video device");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,6 +353,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input = [AVCaptureDeviceInput deviceInputWithDevice:(__bridge AVCaptureDevice *)p_sys->device error:&o_returnedError];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpegVLC.diff b/multimedia/VLC/files/patch-ffmpegVLC.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c005003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-ffmpegVLC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig.configure.ac 2016-05-31 18:11:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2016-07-04 23:04:07.557682616 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2283,7 +2272,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for libavutil variant])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CHECK_EXISTS([libavutil], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_EXISTS([libavutil-VLC], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavutil_version="$(${PKG_CONFIG} --modversion libavutil)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavutil_micro="${libavutil_version##*.}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test ${libavutil_micro} -le 99], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2322,8 +2311,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE(avcodec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --enable-avcodec libavcodec codec (default enabled)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "${enable_avcodec}" != "no"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavutil < 55],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_MODULES(AVCODEC,[libavcodec-VLC >= 53.34.0 libavutil-VLC >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavutil-VLC < 55],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2382,7 +2371,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2416,7 +2405,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "x${have_avcodec}" = "xyes"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2496,7 +2485,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_avformat="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "${enable_avformat}" != "no"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_MODULES(AVFORMAT,[libavformat >= 53.21.0 libavcodec libavutil], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_MODULES(AVFORMAT,[libavformat-VLC >= 53.21.0 libavcodec-VLC libavutil-VLC], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_avformat="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2523,7 +2512,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (default enabled)]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${enable_swscale}" != "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_MODULES(SWSCALE,[libswscale],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_MODULES(SWSCALE,[libswscale-VLC],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2550,7 +2539,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --enable-postproc libpostproc image post-processing (default auto)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${enable_postproc}" != "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_MODULES(POSTPROC,[libpostproc-VLC libavutil-VLC],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3180,12 +3169,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libav) av_vdpau_ver="55.26.0" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg) av_vdpau_ver="55.42.100"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavutil-VLC >= 52.4.0 libavcodec-VLC >= ${av_vdpau_ver}], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_avcodec_vdpau="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_NOTICE([VDPAU decoding acceleration activated])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-for-libvpx-1.8.0.diff b/multimedia/VLC/files/patch-for-libvpx-1.8.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..19b706c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-for-libvpx-1.8.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Danny Milosavljevic <dannym@scratchpost.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 11 Feb 2019 16:07:12 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame formats in the chroma_table
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modules/codec/vpx.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/vpx.c modules/codec/vpx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f03c7fae625..59b3acdef74 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/vpx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/vpx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +117,7 @@ static const struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if VPX_IMAGE_ABI_VERSION < 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +130,7 @@ static const struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-for-lua53.diff b/multimedia/VLC/files/patch-for-lua53.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ce45d8..5fc759f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-for-lua53.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-for-lua53.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +1,85 @@
</span> diff --git modules/lua/demux.c modules/lua/demux.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b732eebd927ebc6f1153ab092066c87fed812078..dea68fae3756f3dc7ffdf75af87b4f201e2d8dfe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 398122957f85a9c4248b5f3d5409b541fd6d7c6f..a77ed004c93c3068a9b20fe3ded537c8eb7dc93a 100644
</span> --- modules/lua/demux.c
+++ modules/lua/demux.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@ struct demux_sys_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@ struct vlclua_playlist
</span> static int vlclua_demux_peek( lua_State *L )
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- demux_t *p_demux = (demux_t *)vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream_t *s = (stream_t *)vlclua_get_this(L);
</span> - int n = luaL_checkint( L, 1 );
+ int n = luaL_checkinteger( L, 1 );
const uint8_t *p_peek;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_peek = stream_Peek( p_demux->s, &p_peek, n );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@ static int vlclua_demux_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_demux_read( lua_State *L )
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- demux_t *p_demux = (demux_t *)vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const uint8_t *p_read;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream_t *s = (stream_t *)vlclua_get_this(L);
</span> - int n = luaL_checkint( L, 1 );
+ int n = luaL_checkinteger( L, 1 );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_read = stream_Peek( p_demux->s, &p_read, n );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( i_read > 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/configuration.c modules/lua/libs/configuration.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7394e52790373d66afb191785b1505b1b9df9d15..41d0a20c4a12ce1ebec1ee9146235987550526f7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/configuration.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/configuration.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +84,7 @@ static int vlclua_config_set( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_VAR_INTEGER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- config_PutInt( p_this, psz_name, luaL_checkint( L, 2 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config_PutInt( p_this, psz_name, luaL_checkinteger( L, 2 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *buf = malloc(n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (buf != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/dialog.c modules/lua/libs/dialog.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 144b38d7e946e66383579227ea517e2c533aa714..11b9a1b4e4a7431d48485439a8adc658dce3583d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/dialog.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/dialog.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Read entry in the Lua registry */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushlightuserdata( L, (void*) &key_update );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_gettable( L, LUA_REGISTRYINDEX );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return luaL_checkint( L, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return luaL_checkinteger( L, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_VAR_BOOL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Manually update a dialog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -573,22 +573,22 @@ static int vlclua_create_widget_inner( lua_State *L, int i_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set common arguments: col, row, hspan, vspan, width, height */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( lua_isnumber( L, arg ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_widget->i_column = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_widget->i_column = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_widget->i_row = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_widget->i_row = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_widget->i_horiz_span = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_widget->i_horiz_span = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_widget->i_vert_span = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_widget->i_vert_span = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_widget->i_width = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_widget->i_width = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_widget->i_height = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_widget->i_height = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_of_args:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/io.c modules/lua/libs/io.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c01cf7137d1eb2252a1675322bc5a1b2d916e215..12267e1822603e2a6dc458356d15a4b60336e772 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/io.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/io.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* psz_mode = luaL_optstring( L, 2, NULL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( psz_mode != NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- long i_offset = luaL_optlong( L, 3, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ long i_offset = luaL_optinteger( L, 3, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( !strcmp( psz_mode, "set" ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i_mode = SEEK_SET;
</span> diff --git modules/lua/libs/net.c modules/lua/libs/net.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 92d7b586d6808db0640f60097c1fa70be3b5a6d8..2a5351071b4fa7937e9756bf2ed998ec2a830529 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cb0d759b5d3badd0e090ca4ca9c9fff71fd9edd4..49f2aec9e84b3b4732e537edbef0065f4d590825 100644
</span> --- modules/lua/libs/net.c
+++ modules/lua/libs/net.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -202,7 +202,7 @@ static int vlclua_net_listen_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_State *L )
</span> {
vlc_object_t *p_this = vlclua_get_this( L );
const char *psz_host = luaL_checkstring( L, 1 );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,16 +88,16 @@ index 92d7b586d6808db0640f60097c1fa70be3b5a6d8..2a5351071b4fa7937e9756bf2ed998ec
</span> int *pi_fd = net_ListenTCP( p_this, psz_host, i_port );
if( pi_fd == NULL )
return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,7 +274,7 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span> {
vlc_object_t *p_this = vlclua_get_this( L );
const char *psz_host = luaL_checkstring( L, 1 );
- int i_port = luaL_checkint( L, 2 );
+ int i_port = luaL_checkinteger( L, 2 );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_fd = net_Connect( p_this, psz_host, i_port, SOCK_STREAM, IPPROTO_TCP );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_fd = net_ConnectTCP( p_this, psz_host, i_port );
</span> lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) );
return 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -282,26 +282,26 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span>
static int vlclua_net_close( lua_State *L )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,22 +114,25 @@ index 92d7b586d6808db0640f60097c1fa70be3b5a6d8..2a5351071b4fa7937e9756bf2ed998ec
</span> size_t i_len;
const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_len = luaL_optint( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_len = luaL_optinteger( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushinteger( L, (fd != -1) ? send( fd, psz_buffer, i_len, 0 ) : -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -278,7 +278,7 @@ static int vlclua_net_send( lua_State *L )
</span>
static int vlclua_net_recv( lua_State *L )
{
- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t i_len = luaL_optint( L, 2, 1 );
</span> + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t i_len = luaL_optinteger( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t i_len = (size_t)luaL_optinteger( L, 2, 1 );
</span> char psz_buffer[i_len];
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t i_ret = (fd != -1) ? recv( fd, psz_buffer, i_len, 0 ) : -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,19 +382,19 @@ static int vlclua_fd_open( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushnil( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for( int i = 0; lua_next( L, 1 ); i++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- luafds[i] = luaL_checkint( L, -2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ luafds[i] = luaL_checkinteger( L, -2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_fds[i].fd = vlclua_fd_get( L, luafds[i] );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_fds[i].events = luaL_checkinteger( L, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_fds[i].events &= POLLIN | POLLOUT | POLLPRI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L )
</span> #ifndef _WIN32
static int vlclua_fd_write( lua_State *L )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,47 +141,20 @@ index 92d7b586d6808db0640f60097c1fa70be3b5a6d8..2a5351071b4fa7937e9756bf2ed998ec
</span> size_t i_len;
const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_len = luaL_optint( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_len = luaL_optinteger( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushinteger( L, (fd != -1) ? write( fd, psz_buffer, i_len ) : -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -371,7 +371,7 @@ static int vlclua_fd_write( lua_State *L )
</span>
static int vlclua_fd_read( lua_State *L )
{
- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t i_len = luaL_optint( L, 2, 1 );
</span> + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t i_len = luaL_optinteger( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t i_len = (size_t)luaL_optinteger( L, 2, 1 );
</span> char psz_buffer[i_len];
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t i_ret = (fd != -1) ? read( fd, psz_buffer, i_len ) : -1;
</span> diff --git modules/lua/libs/osd.c modules/lua/libs/osd.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 341cd62d03a7d0f605dd1312197253a72be75608..799b1f6b45455eae888dcc29933a0c4497f1daf4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0f1f8fbdedaf1e26cada736bb86a269e8530e7bb..bedc464d1c1c55e4d1a640fb3c6ffb6889df454f 100644
</span> --- modules/lua/libs/osd.c
+++ modules/lua/libs/osd.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@ static int vlclua_osd_icon( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_icon = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_icon = vlc_osd_icon_from_string( psz_icon );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_chan = luaL_optint( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_chan = luaL_optinteger( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( !i_icon )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return luaL_error( L, "\"%s\" is not a valid osd icon.", psz_icon );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,9 +114,9 @@ static int vlc_osd_position_from_string( const char *psz_name )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_osd_message( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_message = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_chan = luaL_optint( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_chan = luaL_optinteger( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_position = luaL_optstring( L, 3, "top-right" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mtime_t duration = luaL_optint( L, 4, 1000000 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mtime_t duration = luaL_optinteger( L, 4, 1000000 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- input_thread_t *p_input = vlclua_get_input_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( p_input )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,10 +154,10 @@ static int vlc_osd_slider_type_from_string( const char *psz_name )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_string( const char *psz_name )
</span>
static int vlclua_osd_slider( lua_State *L )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,11 +162,7 @@ index 341cd62d03a7d0f605dd1312197253a72be75608..799b1f6b45455eae888dcc29933a0c44
</span> + int i_position = luaL_checkinteger( L, 1 );
const char *psz_type = luaL_checkstring( L, 2 );
int i_type = vlc_osd_slider_type_from_string( psz_type );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_chan = luaL_optint( L, 3, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_chan = luaL_optinteger( L, 3, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( !i_type )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return luaL_error( L, "\"%s\" is not a valid slider type.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- psz_type );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD );
</span> @@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( lua_State *L )
static int vlclua_spu_channel_clear( lua_State *L )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +173,7 @@ index 341cd62d03a7d0f605dd1312197253a72be75608..799b1f6b45455eae888dcc29933a0c44
</span> if( !p_input )
return luaL_error( L, "Unable to find input." );
diff --git modules/lua/libs/playlist.c modules/lua/libs/playlist.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cdfd9509b8d6e8fc634d98583e49b0232a34c1ac..5838214523b88860e034340aef40229ac6302e97 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a5b68d9bdd78014c3d28f8723c91474bc6702c5c..5346b5cf946e314f5ae07269fde8d15c24ee8f58 100644
</span> --- modules/lua/libs/playlist.c
+++ modules/lua/libs/playlist.c
@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_State * L )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,17 +193,17 @@ index cdfd9509b8d6e8fc634d98583e49b0232a34c1ac..5838214523b88860e034340aef40229a
</span> + int i_id = luaL_checkinteger( L, 1 );
playlist_t *p_playlist = vlclua_get_playlist_internal( L );
PL_LOCK;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_ret = playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@ static int vlclua_playlist_gotoitem( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_ViewPlay( p_playlist, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua_State * L )
</span>
static int vlclua_playlist_delete( lua_State * L )
{
- int i_id = luaL_checkint( L, 1 );
+ int i_id = luaL_checkinteger( L, 1 );
playlist_t *p_playlist = vlclua_get_playlist_internal( L );
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PL_LOCK;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,8 +155,8 @@ static int vlclua_playlist_delete( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( lua_State * L )
</span>
static int vlclua_playlist_move( lua_State * L )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,10 +215,10 @@ index cdfd9509b8d6e8fc634d98583e49b0232a34c1ac..5838214523b88860e034340aef40229a
</span> PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item );
diff --git modules/lua/libs/stream.c modules/lua/libs/stream.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0f9ef8b866fbc7dc9e89c93c1e10d49998f6d864..330df464815384bb0d468b331d4405e02e1be868 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab0c4a01e6744b79ed76460f7571474888824a75..5923427b84a2c508c7c6100823fe98b5d6de922a 100644
</span> --- modules/lua/libs/stream.c
+++ modules/lua/libs/stream.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,7 +101,7 @@ static int vlclua_stream_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State *L )
</span> {
int i_read;
stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,21 +227,8 @@ index 0f9ef8b866fbc7dc9e89c93c1e10d49998f6d864..330df464815384bb0d468b331d4405e0
</span> uint8_t *p_read = malloc( n );
if( !p_read ) return vlclua_error( L );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/variables.c modules/lua/libs/variables.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7a106af5ec9624fe3148e3035eb238363a60431b..5c64dc5e114092efbee9b33f5065cf7699c98ae3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/variables.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/variables.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@ static int vlclua_tovalue( lua_State *L, int i_type, vlc_value_t *val )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- val->b_bool = luaL_checkboolean( L, -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_VAR_INTEGER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- val->i_int = luaL_checkint( L, -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ val->i_int = luaL_checkinteger( L, -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_VAR_STRING:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- val->psz_string = (char*)luaL_checkstring( L, -1 ); /* XXX: Beware, this only stays valid as long as (L,-1) stays in the stack */
</span> diff --git modules/lua/libs/volume.c modules/lua/libs/volume.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8e7a392e654054e267345468ef502cccdfddafdd..00fbcab15d21ee25453c516466f56e302aed49fe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0dba2c1e1b9a0c38321f4ccca8ce2afae19ed642..f0b7d419016e1012f68017255b86b7b953fe9ab4 100644
</span> --- modules/lua/libs/volume.c
+++ modules/lua/libs/volume.c
@@ -48,7 +48,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,34 +240,3 @@ index 8e7a392e654054e267345468ef502cccdfddafdd..00fbcab15d21ee25453c516466f56e30
</span> if( i_volume < 0 )
i_volume = 0;
int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@ static int vlclua_volume_up( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_t *p_this = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float volume;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- playlist_VolumeUp( p_this, luaL_optint( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ playlist_VolumeUp( p_this, luaL_optinteger( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,7 +78,7 @@ static int vlclua_volume_down( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_t *p_this = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float volume;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- playlist_VolumeDown( p_this, luaL_optint( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ playlist_VolumeDown( p_this, luaL_optinteger( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/win.c modules/lua/libs/win.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 67f6b930d5fd69f141f295cb434d5ea7ef2ea619..24a84760a928befad091b14ec8508ab785583fc0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/win.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/win.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +123,7 @@ static int vlclua_console_init( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_console_wait( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_timeout = luaL_optint( L, 1, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_timeout = luaL_optinteger( L, 1, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DWORD status = WaitForSingleObject( GetConsole( L ), i_timeout );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushboolean( L, status == WAIT_OBJECT_0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-no-@rpath.diff b/multimedia/VLC/files/patch-no-@rpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a42173b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-no-@rpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/Makefile.am lib/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 892d9b1..1918615 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,9 +70,9 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_OS2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libvlc_la_LDFLAGS += -avoid-version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libvlc_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# libvlc_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkgconfig_DATA = libvlc.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/Makefile.in lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9a7b283..00af3ac 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@ host_triplet = @host@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_WIN32_TRUE@am__append_1 = ../src/libvlc_win32_rc.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_WIN32_TRUE@am__append_2 = -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_OS2_TRUE@am__append_3 = -avoid-version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@HAVE_DARWIN_TRUE@am__append_4 = -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# @HAVE_DARWIN_TRUE@am__append_4 = -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir = lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/Makefile.am src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 502990c..e3880c8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,9 +479,9 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_DBUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libvlccore_la_LIBADD += $(DBUS_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libvlccore_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# libvlccore_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlc.dll.manifest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/Makefile.in src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a8761d3..9569ec6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@ host_triplet = @host@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_WIN32_TRUE@am__append_24 = -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static $(LIBCOM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_OS2_TRUE@am__append_25 = -avoid-version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_DBUS_TRUE@am__append_26 = $(DBUS_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@HAVE_DARWIN_TRUE@am__append_27 = -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# @HAVE_DARWIN_TRUE@am__append_27 = -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_PROGRAMS = test_block$(EXEEXT) test_dictionary$(EXEEXT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_i18n_atof$(EXEEXT) test_interrupt$(EXEEXT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_md5$(EXEEXT) test_picture_pool$(EXEEXT) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-no-hrtfs.diff b/multimedia/VLC/files/patch-no-hrtfs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4db73f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-no-hrtfs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extras/package/macosx/package.mak 2018-10-08 13:49:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extras/package/macosx/package.mak 2018-10-08 13:49:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,8 +36,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -r "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -r "$(prefix)/lib/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ## HRTFs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -r $(srcdir)/share/hrtfs $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Copy some other stuff (?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) | $(AMTAR) -x -C $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-static_assert.diff b/multimedia/VLC/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cbe1c83..f00a7df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git include/vlc_fixups.h include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 997f600..d65f41c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,9 +239,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined (HAVE_STATIC_ASSERT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define static_assert _Static_assert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined (HAVE_STATIC_ASSERT) && !defined (static_assert)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define _Static_assert(x, s) ((void) sizeof (struct { unsigned a[(x) ? 1 : -1];}))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Alignment of critical static data structures */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.orig 2016-03-22 15:34:33.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h 2016-03-22 15:34:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -793,6 +793,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to `int' if <stddef.h> does not define. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* #undef ssize_t */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define static_assert _Static_assert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vlc_fixups.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-use-NSGetEnviron.diff b/multimedia/VLC/files/patch-use-NSGetEnviron.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 36d84f2..9595707 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-use-NSGetEnviron.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-use-NSGetEnviron.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> int status;
--- modules/stream_filter/orig.decomp.c 2015-04-13 21:54:35.000000000 +0200
+++ modules/stream_filter/decomp.c 2017-08-18 14:11:46.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@ struct stream_sys_t
</span> int64_t pts_delay;
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span>
static const size_t bufsize = 65536;
#ifdef HAVE_VMSPLICE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -361,7 +361,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,7 @@ static int Open (stream_t *stream, const char *path)
</span> if (!posix_spawn_file_actions_adddup2 (&actions, comp[0], 0)
&& !posix_spawn_file_actions_adddup2 (&actions, uncomp[1], 1)
&& !posix_spawnp (&p_sys->pid, path, &actions, NULL, argv,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vda-ffmpeg34+.diff b/multimedia/VLC/files/patch-vda-ffmpeg34+.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 47af314..1d417d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-vda-ffmpeg34+.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-vda-ffmpeg34+.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/55164
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/codec/avcodec/vda.c 2017-10-25 16:52:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/org.vda.c 2017-10-25 16:51:59.000000000 +0200
</span> +++ modules/codec/avcodec/vda.c 2017-10-25 16:52:10.000000000 +0200
@@ -145,7 +145,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vlc-for-macports.diff b/multimedia/VLC/files/patch-vlc-for-macports.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c9e3ebd..d8fa589 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-vlc-for-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-vlc-for-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/vlc.c modules/lua/vlc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index df235d0..b753346 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/vlc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/vlc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -232,10 +232,22 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( likely(asprintf( &ppsz_dir_list[i],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( strcasestr (psz_datapath, "/share") == NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && likely(asprintf( &ppsz_dir_list[i],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "%s"DIR_SEP"share"DIR_SEP"lua"DIR_SEP"%s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- psz_datapath, luadirname ) != -1) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // When installed through MacPorts (or Fink, or HomeBrew, or...?) we do have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // meta/reader under LibDir/lua (/opt/local/lib/vlc/lua for MacPorts's standard install prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // so we add that location at the end.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *psz_libpath = config_GetLibDir();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( likely(psz_libpath != NULL) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ psz_libpath, luadirname ) != -1) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free( psz_libpath );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free( psz_datapath );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> diff --git src/darwin/dirs.c src/darwin/dirs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 381729c..9174602 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d0489fd21cbb56a0730feb68e8fdbe8066728c0a..fa701de23a3f7cbe0e1a6e8ca4276cf12d2f729d 100644
</span> --- src/darwin/dirs.c
+++ src/darwin/dirs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,14 +43,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define MAXPATHLEN 1024
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,14 +36,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span>
-char *config_GetLibDir (void)
+// 20150205: we should do case-insensitive filename comparisons. HFS is case-insensitive by default,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +27,7 @@ index 381729c..9174602 100644
</span>
/* Check for "VLCKit.framework/Versions/Current/VLCKit",
* as well as "VLCKit.framework/Versions/A/VLCKit" and
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,18 +67,18 @@ char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,18 +60,18 @@ char *config_GetLibDir (void)
</span> p += strcspn( p, "/" );
/* If the string ends with VLCKit then we've found a winner */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +48,9 @@ index 381729c..9174602 100644
</span> - 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) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,6 +90,7 @@ char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Do we end by "VLC for iOS"? so we are the iOS app */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,6 +91,7 @@ char *config_GetLibDir (void)
</span> char *path = NULL;
asprintf(&path, "%s/"PACKAGE, incompletepath);
free(incompletepath);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +58,7 @@ index 381729c..9174602 100644
</span> return path;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,15 +98,37 @@ char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,15 +99,37 @@ char *config_GetLibDir (void)
</span> abort ();
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,21 +98,23 @@ index 381729c..9174602 100644
</span> if (asprintf (&datadir, "%s/share", vlcpath) == -1)
datadir = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,16 +166,24 @@ static char *getAppDependentDir(vlc_userdir_t type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,19 +170,27 @@ static char *getAppDependentDir(vlc_userdir_t type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *fallback = "org.videolan.vlc";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *name = NULL;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Default fallback
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *name = "org.videolan.vlc";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> - CFBundleRef mainBundle = CFBundleGetMainBundle();
- if (mainBundle) {
- CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
- if (identifierAsNS) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- char identifier[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Boolean ret = CFStringGetCString(identifierAsNS, identifier, sizeof(identifier), kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ret)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name = identifier;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char name[256] = "org.videolan.vlc";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFIndex len = CFStringGetLength(identifierAsNS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFIndex size = CFStringGetMaximumSizeForEncoding(len, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *identifier = calloc(len + 1, sizeof(char));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (identifier != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Boolean ret = CFStringGetCString(identifierAsNS, identifier, size, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- name = identifier;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(identifier);
</span> + bool libDirIsPosix;
+ char *vlcpath = getLibDir(&libDirIsPosix);
+ if (vlcpath) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,12 +126,29 @@ index 381729c..9174602 100644
</span> + if (mainBundle) {
+ CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
+ if (identifierAsNS) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char identifier[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Boolean ret = CFStringGetCString(identifierAsNS, identifier, sizeof(identifier), kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Don't use an empty identifier (= the application that links to us doesn't have a CFBundleIdentifier set).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ret && strlen(identifier))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcpy(name, identifier);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFIndex len = CFStringGetLength(identifierAsNS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFIndex size = CFStringGetMaximumSizeForEncoding(len, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *identifier = calloc(len + 1, sizeof(char));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (identifier != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Boolean ret = CFStringGetCString(identifierAsNS, identifier, size, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ name = identifier;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(identifier);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git bin/Makefile.am bin/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6033e50..ea7b544 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +132,7 @@ MOSTLYCLEANFILES = $(noinst_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if BUILD_VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-data-local:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd $(bindir); mv vlc-osx vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd $(DESTDIR)/$(bindir); mv vlc-osx vlc
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC2/Portfile
</span>similarity index 91%
copy from multimedia/VLC/Portfile
copy to multimedia/VLC2/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 5065591..97234ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name VLC2
</span>
categories multimedia devel
maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +20,29 @@ long_description VLC media player is a highly portable multimedia player
</span> homepage http://www.videolan.org
subport lib${name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span> 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name} VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # support libVLC2 up to 10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by libVLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> homepage http://www.videolan.org/vlc/libvlc.html
}
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # given the Portfile design it's easier to shunt the entire patch phase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rather than trying to keep the patchfiles list empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name} libVLC
</span> }
# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +54,6 @@ supported_archs x86_64
</span> ##
if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
version 2.2.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 12
</span> license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +65,6 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> checksums rmd160 4434e91384520fe1fe129a52f5d66d61e4404a9a \
sha256 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable HFS compression of the workdir if the compress_workdir PortGroup is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${filespath}/../../../_resources/port1.0/group/compress_workdir-1.0.tcl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup compress_workdir 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig
depends_lib-append port:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,13 +173,15 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> patchfiles-append \
patch-modules-codec-x264-new-api.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:-lstdc\+\+:-lc++:" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/access/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists replaced_by]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:-lstdc\+\+:-lc++:" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/modules/access/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# do autoreconf only the first time around
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -375,23 +383,25 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
patchfiles-append patch-use-NSGetEnviron.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/Sparkle.framework/d" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/SDKROOT/d" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/Growl.framework/d" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${worksrcpath}/contrib/BGHUDAppKit.framework]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists replaced_by]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/Sparkle.framework/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/SDKROOT/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/Growl.framework/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile.am
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # To trick configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir "${worksrcpath}/contrib/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${worksrcpath}/contrib/BGHUDAppKit.framework]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To trick configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir "${worksrcpath}/contrib/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.args-replace --disable-macosx-eyetv --enable-macosx-eyetv
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/PR-34741-no__clang_version__.patch b/multimedia/VLC2/files/PR-34741-no__clang_version__.patch
</span>similarity index 100%
rename from multimedia/VLC/files/PR-34741-no__clang_version__.patch
rename to multimedia/VLC2/files/PR-34741-no__clang_version__.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/buildfix-package.mak.patch b/multimedia/VLC2/files/buildfix-package.mak.patch
</span>similarity index 100%
rename from multimedia/VLC/files/buildfix-package.mak.patch
rename to multimedia/VLC2/files/buildfix-package.mak.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/no-sparkle.patch b/multimedia/VLC2/files/no-sparkle.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..395ade6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/files/no-sparkle.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,189 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 318cad4..7c4e53f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3850,13 +3850,6 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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 style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test ! -d ${CONTRIB_DIR}/Sparkle.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git extras/package/macosx/Resources/English.lproj/MainMenu.xib extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1c880c9..08b3b9d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2106,9 +2106,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSCustomObject" id="651263286">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="NSClassName">VLCMainMenu</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="NSCustomObject" id="1040926652">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="NSClassName">SUUpdater</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSCustomView" id="560875128">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <reference key="NSNextResponder"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="NSvFlags">268</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2635,14 +2632,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="connectionID">2817</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="IBActionConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="label">checkForUpdates:</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="source" ref="1040926652"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="destination" ref="354414928"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="connectionID">4371</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="IBOutletConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="label">o_dmi_mute</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <reference key="source" ref="651263286"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5466,11 +5455,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="objectName">Application</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="objectID">4370</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="object" ref="1040926652"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="parent" ref="0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="objectID">4397</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <reference key="object" ref="629699013"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSMutableArray" key="children">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 98f315d..0074c64 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/gui/macosx/simple_prefs.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/gui/macosx/simple_prefs.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,8 +38,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "AppleRemote.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "CoreInteraction.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char *const ppsz_language[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "auto",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -383,7 +381,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_art_ckb setTitle: _NS("Allow metadata network access")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [o_intf_last_update_lbl setStringValue: @""];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -595,10 +592,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ psz_tmp = config_GetPsz(p_intf, "control");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (psz_tmp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [o_intf_enableGrowl_ckb setState: (NSInteger)strstr(psz_tmp, "growl")];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2f264fd..d4049bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extras/package/macosx/Resources/English.lproj/Preferences.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extras/package/macosx/Resources/English.lproj/Preferences.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4779,9 +4779,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <bool key="NSWindowIsRestorable">YES</bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="NSCustomObject" id="761483302">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="NSClassName">SUUpdater</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSWindowTemplate" id="898680423">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="NSWindowStyleMask">15</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="NSWindowBacking">2</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7629,22 +7626,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="connectionID">2681</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="IBBindingConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="label">value: automaticallyChecksForUpdates</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="source" ref="243384014"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="destination" ref="761483302"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="NSNibBindingConnector" key="connector">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="NSSource" ref="243384014"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="NSDestination" ref="761483302"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="NSLabel">value: automaticallyChecksForUpdates</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="NSBinding">value</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="NSKeyPath">automaticallyChecksForUpdates</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="NSNibBindingConnectorVersion">2</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="connectionID">3559</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="IBOutletConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="label">nextKeyView</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <reference key="source" ref="588417130"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9360,12 +9341,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <reference key="parent" ref="492678965"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="objectID">3555</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="object" ref="761483302"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <reference key="parent" ref="0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="objectName">Sparkle Updater</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="objectID">3556</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <reference key="object" ref="243384014"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <array class="NSMutableArray" key="children">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1d48150..c61a4aa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/gui/macosx/intf.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/gui/macosx/intf.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,8 +68,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "VideoEffects.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "AudioEffects.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <Sparkle/Sparkle.h> /* we're the update delegate */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "iTunes.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "Spotify.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -785,8 +783,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PL_LOCK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ items_at_launch = p_playlist->p_local_category->i_children;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PL_UNLOCK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [[SUUpdater sharedUpdater] setDelegate:self];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -974,25 +970,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma mark -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma mark Sparkle delegate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* received directly before the update gets installed, so let's shut down a bit */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSApp activateIgnoringOtherApps:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [o_remote stopListening: self];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [[VLCCoreInteraction sharedInstance] stop];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* don't be enthusiastic about an update if we currently play a video */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ([self activeVideoPlayback])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma mark -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma mark Media Key support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-configure.ac.diff b/multimedia/VLC2/files/patch-configure.ac.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-configure.ac.diff
rename to multimedia/VLC2/files/patch-configure.ac.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpeg3-compat.diff b/multimedia/VLC2/files/patch-ffmpeg3-compat.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-ffmpeg3-compat.diff
rename to multimedia/VLC2/files/patch-ffmpeg3-compat.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpeg4-compat.diff b/multimedia/VLC2/files/patch-ffmpeg4-compat.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-ffmpeg4-compat.diff
rename to multimedia/VLC2/files/patch-ffmpeg4-compat.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-for-lua53.diff b/multimedia/VLC2/files/patch-for-lua53.diff
</span>similarity index 100%
copy from multimedia/VLC/files/patch-for-lua53.diff
copy to multimedia/VLC2/files/patch-for-lua53.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-modules-codec-x264-new-api.diff b/multimedia/VLC2/files/patch-modules-codec-x264-new-api.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-modules-codec-x264-new-api.diff
rename to multimedia/VLC2/files/patch-modules-codec-x264-new-api.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-no-opencv_example.diff b/multimedia/VLC2/files/patch-no-opencv_example.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-no-opencv_example.diff
rename to multimedia/VLC2/files/patch-no-opencv_example.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-opencv_includes.diff b/multimedia/VLC2/files/patch-opencv_includes.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-opencv_includes.diff
rename to multimedia/VLC2/files/patch-opencv_includes.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-really-no-qtkit.diff b/multimedia/VLC2/files/patch-really-no-qtkit.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-really-no-qtkit.diff
rename to multimedia/VLC2/files/patch-really-no-qtkit.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/patch-soundfont-path.diff b/multimedia/VLC2/files/patch-soundfont-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bca8b80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/files/patch-soundfont-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/fluidsynth.c modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bdc8d24..9859aa1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@ static int Open (vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glob_t gl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glob ("/usr/share/sounds/sf2/*.sf2", GLOB_NOESCAPE, NULL, &gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glob ("@PREFIX@/share/sounds/sf2/*.sf2", GLOB_NOESCAPE, NULL, &gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size_t i = 0; i < gl.gl_pathc; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *path = gl.gl_pathv[i];
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-static_assert.diff b/multimedia/VLC2/files/patch-static_assert.diff
</span>similarity index 100%
copy from multimedia/VLC/files/patch-static_assert.diff
copy to multimedia/VLC2/files/patch-static_assert.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-use-NSGetEnviron.diff b/multimedia/VLC2/files/patch-use-NSGetEnviron.diff
</span>similarity index 100%
copy from multimedia/VLC/files/patch-use-NSGetEnviron.diff
copy to multimedia/VLC2/files/patch-use-NSGetEnviron.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vda-ffmpeg34+.diff b/multimedia/VLC2/files/patch-vda-ffmpeg34+.diff
</span>similarity index 100%
copy from multimedia/VLC/files/patch-vda-ffmpeg34+.diff
copy to multimedia/VLC2/files/patch-vda-ffmpeg34+.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vlc-for-macports.diff b/multimedia/VLC2/files/patch-vlc-for-macports.diff
</span>similarity index 100%
copy from multimedia/VLC/files/patch-vlc-for-macports.diff
copy to multimedia/VLC2/files/patch-vlc-for-macports.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vlc-no-O4.diff b/multimedia/VLC2/files/patch-vlc-no-O4.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-vlc-no-O4.diff
rename to multimedia/VLC2/files/patch-vlc-no-O4.diff
</pre><pre style='margin:0'>
</pre>