<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ddd6f4336c9cb206f76bc438e355a929425676b0">https://github.com/macports/macports-ports/commit/ddd6f4336c9cb206f76bc438e355a929425676b0</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 ddd6f4336c9 VLC has become too hard to build "the MacPorts way" on enough supported OS versions and esp. the newer versions. The official build runs on OS X 10.7 (!) and up. It may not take any of its dependencies from MacPorts but nowadays it can be used as a dependency itself (the embedded libVLC). This new port implementation installs the app bundle from the distribution DMG and puts up symlinks to expose the shared libraries and headerfiles under libexec/vlc3. Part of the hea [...]
</span>ddd6f4336c9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ddd6f4336c9cb206f76bc438e355a929425676b0
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Sun Feb 7 11:49:09 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> VLC has become too hard to build "the MacPorts way" on enough supported
</span><span style='display:block; white-space:pre;color:#404040;'> OS versions and esp. the newer versions. The official build runs on OS X
</span><span style='display:block; white-space:pre;color:#404040;'> 10.7 (!) and up. It may not take any of its dependencies from MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'> but nowadays it can be used as a dependency itself (the embedded libVLC).
</span><span style='display:block; white-space:pre;color:#404040;'> This new port implementation installs the app bundle from the distribution
</span><span style='display:block; white-space:pre;color:#404040;'> DMG and puts up symlinks to expose the shared libraries and headerfiles
</span><span style='display:block; white-space:pre;color:#404040;'> under libexec/vlc3. Part of the headerfiles are installed from the source
</span><span style='display:block; white-space:pre;color:#404040;'> tarball; the pkgconfig files are provided by the port.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> VLC2: With this change there is no longer a need to impose an OS dependent
</span><span style='display:block; white-space:pre;color:#404040;'> hard-wired choice of VLC2 or VLC(3); being able to install VLC2 in
</span><span style='display:block; white-space:pre;color:#404040;'> addition to VLC(3) can have an interest (for watching streamed videos).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> phonon-backend-vlc : don't depend on libVLC any longer (+vlc2 it still
</span><span style='display:block; white-space:pre;color:#404040;'> makes sense to depend on libVLC2).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> kde-extra-cmake-modules : upgrade to 5.75.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> phonon-qt5 : upgrade to 4.11.1
</span>---
audio/phonon-backend-vlc/Portfile | 8 +-
audio/phonon/Portfile | 88 ++--
audio/phonon/files/phonon | 38 --
.../files/{ => qt4}/patch-CMakeLists.txt.diff | 0
.../patch-cmake_FindPhononInternal.cmake.diff | 0
.../{ => qt4}/patch-cmake_PhononMacros.cmake.diff | 0
.../phonon/files/qt5/patch-support-older-qt5.diff | 13 +
kde/kde-extra-cmake-modules/Portfile | 23 +-
.../files/patch-BUNDLEDIR.diff | 10 +-
.../files/patch-doc-building.diff | 12 +-
.../files/patch-enable-named-operators.diff | 10 +-
.../files/patch-kdecompilerflags.diff | 72 +--
.../files/patch-mac-installdirs.diff | 18 +-
.../files/patch-qt_no_exceptions.diff | 14 +-
multimedia/VLC/Portfile | 516 +++------------------
multimedia/VLC/files/configure.ac-no-arch.patch | 45 --
multimedia/VLC/files/libvlc.pc | 11 +
multimedia/VLC/files/lock.h | 158 -------
multimedia/VLC/files/no-sparkle.patch | 189 --------
multimedia/VLC/files/patch-build-on-darwin13.diff | 169 -------
multimedia/VLC/files/patch-build-on-pre-1012.diff | 446 ------------------
multimedia/VLC/files/patch-ffmpegVLC.diff | 82 ----
multimedia/VLC/files/patch-for-lua53.diff | 242 ----------
multimedia/VLC/files/patch-no-@rpath.diff | 60 ---
multimedia/VLC/files/patch-no-hrtfs.diff | 11 -
multimedia/VLC/files/patch-soundfont-path.diff | 13 -
multimedia/VLC/files/patch-static_assert.diff | 11 -
multimedia/VLC/files/patch-use-NSGetEnviron.diff | 40 --
multimedia/VLC/files/patch-vda-ffmpeg34+.diff | 11 -
multimedia/VLC/files/patch-vlc-for-macports.diff | 154 ------
multimedia/VLC/files/vlc-plugin.pc | 23 +
multimedia/VLC2/Portfile | 97 ++--
multimedia/VLC2/files/buildfix-package.mak.patch | 26 --
.../VLC2/files/patch-build-on-post-1012.diff | 20 +
...ch-configure.ac.diff => patch-buildsystem.diff} | 0
35 files changed, 304 insertions(+), 2326 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon-backend-vlc/Portfile b/audio/phonon-backend-vlc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b662a835d54..32cb336f8b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/phonon-backend-vlc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/phonon-backend-vlc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,7 @@ if {${subport} eq "${name}-qt5"} {
</span>
version 0.10.2.23
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
license {LGPL-2.1 LGPL-3}
maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,18 +32,13 @@ platforms darwin
</span> homepage http://projects.kde.org/projects/kdesupport/phonon/phonon-vlc
distname phonon-backend-vlc-git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant vlc2 description {build against libVLC2} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {[variant_exists vlc2] && [variant_isset vlc2]} {
depends_lib-append \
path:libexec/vlc2/lib/pkgconfig/libvlc.pc:libVLC2
configure.pkg_config_path-append "${prefix}/libexec/vlc2/lib/pkgconfig"
} else {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:libexec/vlc3/lib/pkgconfig/libvlc.pc:libVLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:libexec/vlc3/lib/pkgconfig/libvlc.pc:VLC
</span> configure.pkg_config_path-append "${prefix}/libexec/vlc3/lib/pkgconfig"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon/Portfile b/audio/phonon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e15f95a10c7..030d1c2cf83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/phonon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/phonon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,15 +4,23 @@ PortSystem 1.0
</span>
name phonon
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.10.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7a1934b45a6d54d0803edf0a3cd6d7b5b4ecc1e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2e8b145669afa0e93833e4064b657677abc9413e4007fa5ddc91397c9bddc295 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 336724
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.10.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7a1934b45a6d54d0803edf0a3cd6d7b5b4ecc1e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2e8b145669afa0e93833e4064b657677abc9413e4007fa5ddc91397c9bddc295 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 336724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt4 support was dropped in 4.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.11.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 035bb6e70e678593cf83673691fb69c8eb0c2248 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 314732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
license {LGPL-2.1 LGPL-3}
maintainers {michaelld @michaelld} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Cross Platform Multimedia API used by KDE4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Cross Platform Multimedia API used by Qt applications
</span> platforms darwin
homepage https://phonon.kde.org
master_sites kde:stable/${name}/${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +39,13 @@ subport ${name}-qt5 {
</span> framework for the application developer. This is the Phonon 4\
transitional library for Qt5 (API compatible with regular Phonon4)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append qt5/patch-support-older-qt5.diff
</span> qt5.depends_component \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtdeclarative qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:share/ECM/cmake/ECMConfig.cmake:kde-extra-cmake-modules
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:kde-extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPHONON_BUILD_PHONON4QT5:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DAPPLE_SUPPRESS_X11_WARNING=ON
</span>
set LPH libphonon4qt5
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,55 +59,18 @@ subport ${name}-qt5 {
</span> copy ${workpath}/build/demos/simplecapture/simplecapture.app ${demos_dest_dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix library and plugin self-names
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${prefix}/lib/${LPH}.4.dylib ${destroot}${prefix}/lib/${LPH}.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${prefix}/lib/${LPH}experimental.4.dylib ${destroot}${prefix}/lib/${LPH}experimental.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix use of libphonon4qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change lib/${LPH}.4.dylib ${prefix}/lib/${LPH}.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/${LPH}experimental.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change lib/${LPH}.4.dylib ${prefix}/lib/${LPH}.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_plugins_dir}/designer/phononwidgets.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id phononwidgets.dylib ${destroot}${qt_plugins_dir}/designer/phononwidgets.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset demos]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change lib/${LPH}.4.dylib ${prefix}/lib/${LPH}.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${demos_dest_dir}/simpleplayer.app/Contents/MacOS/simpleplayer"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change lib/${LPH}.4.dylib ${prefix}/lib/${LPH}.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${demos_dest_dir}/metadatareader.app/Contents/MacOS/metadatareader"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change lib/${LPH}.4.dylib ${prefix}/lib/${LPH}.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${demos_dest_dir}/phota.app/Contents/MacOS/phota"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change lib/${LPH}.4.dylib ${prefix}/lib/${LPH}.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${demos_dest_dir}/simplecapture.app/Contents/MacOS/simplecapture"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +compversion440
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix use of CMAKE_INSTALL_NAME to be an absolute path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (RJVB: why is this necessary?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmake_FindPhononInternal.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix MODULE names to end in .dylib instead of .so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmake_PhononMacros.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant pulseaudio description "Build Phonon with additional support for PulseAudio" {
depends_lib-append port:pulseaudio
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIO_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIO_LIBRARY=${prefix}/lib/libpulse.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIO_MAINLOOP_LIBRARY=${prefix}/lib/libpulse-mainloop-glib.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_PulseAudio=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPHONON_PULSESUPPORT=YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=OFF
</span> }
if {![variant_isset pulseaudio]} {
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_PulseAudio=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPHONON_PULSESUPPORT=NO \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIO_INCLUDE_DIR= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIO_LIBRARY= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIO_MAINLOOP_LIBRARY=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=ON
</span> }
if {${subport} ne "${name}-qt5"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,10 +83,21 @@ if {${subport} ne "${name}-qt5"} {
</span> # -- Using CMake automoc builtin
depends_build-append port:automoc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix use of CMAKE_INSTALL_NAME to be an absolute path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (RJVB: why is this necessary?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append qt4/patch-cmake_FindPhononInternal.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix MODULE names to end in .dylib instead of .so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append qt4/patch-cmake_PhononMacros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant compversion440 description {Build libraries with compatibility version 4.4.0 for existing Qt4 installs expecting that} {
# fix the library compatibility version to be 4.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append qt4/patch-CMakeLists.txt.diff
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +compversion440
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_QZeitgeist=ON
</span>
set LPH libphonon
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,7 +144,7 @@ if {${subport} ne "${name}-qt5"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args-append -k
</span>
post-patch {
set rel_mp_qt_cmake_dir [strsed ${qt_cmake_module_dir} "g@${prefix}/@@"]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,10 +156,6 @@ if {[info exists qt_cmake_defines]} {
</span> configure.args-append \
${qt_cmake_defines}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# nb: there is no WITH_QZeitgeist option, keeping it out of nostalgia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_QZeitgeist=OFF
</span>
configure.ldflags-append -F${qt_frameworks_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon/files/phonon b/audio/phonon/files/phonon
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bea68bf6716..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/phonon/files/phonon
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef QT_PHONON_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define QT_PHONON_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "abstractaudiooutput.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "abstractmediastream.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "abstractvideooutput.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "addoninterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "audiodataoutput.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "audiodataoutputinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "audiooutput.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "audiooutputinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "backendcapabilities.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "backendinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "effect.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "effectinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "effectparameter.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "effectwidget.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "globalconfig.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "mediacontroller.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "medianode.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "mediaobject.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "mediaobjectinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "mediasource.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "objectdescription.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "objectdescriptionmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "path.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "phonondefs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "phononnamespace.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "platformplugin.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "pulsesupport.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "seekslider.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "streaminterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "videoplayer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "videowidget.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "videowidgetinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "volumefadereffect.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "volumefaderinterface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "volumeslider.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon/files/patch-CMakeLists.txt.diff b/audio/phonon/files/qt4/patch-CMakeLists.txt.diff
</span>similarity index 100%
rename from audio/phonon/files/patch-CMakeLists.txt.diff
rename to audio/phonon/files/qt4/patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff b/audio/phonon/files/qt4/patch-cmake_FindPhononInternal.cmake.diff
</span>similarity index 100%
rename from audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff
rename to audio/phonon/files/qt4/patch-cmake_FindPhononInternal.cmake.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff b/audio/phonon/files/qt4/patch-cmake_PhononMacros.cmake.diff
</span>similarity index 100%
rename from audio/phonon/files/patch-cmake_PhononMacros.cmake.diff
rename to audio/phonon/files/qt4/patch-cmake_PhononMacros.cmake.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon/files/qt5/patch-support-older-qt5.diff b/audio/phonon/files/qt5/patch-support-older-qt5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3d271348dea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/phonon/files/qt5/patch-support-older-qt5.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 phonon/factory.cpp phonon/factory.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66449be1ba8f2084a10d0e184fa8bf0a58b9a240..baa1420da9ec8db4becafaebc16118f2cc335c50 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- phonon/factory.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ phonon/factory.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,7 +474,7 @@ QList<BackendDescriptor> Factory::findBackends()
</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;'>+ // Apply PHONON_BACKEND override if set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const QString backendEnv = qEnvironmentVariable("PHONON_BACKEND");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const QString backendEnv = qgetenv("PHONON_BACKEND");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (backendEnv.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return backendList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/Portfile b/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c7ce328635..a5024b31acf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,26 +7,30 @@ set ECM extra-cmake-modules
</span> name kde-${ECM}
subport ${name}-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set kf5.branch 5.59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set kf5.branch 5.75
</span>
if {${subport} eq "${name}-devel"} {
fetch.type git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.url git://anongit.kde.org/extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 3f51cb1fcd5f7b00b565b9f2ddf7366aeef3c415
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # v5.59.0-1-g3f51cb1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.59.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url https://invent.kde.org/kde/extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch a670c57c193c8632bd6d12bdf1afd237b5d753a3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # v5.75.0-7-ga670c57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.75.0.7
</span> distname ECM-5.1x.git
} else {
version ${kf5.branch}.0
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://download.kde.org/stable/frameworks/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://download.kde.org/stable/frameworks/${branch}/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid certificate issues on kde.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.ignore_sslcert yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> distname ${ECM}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6a477336c39f9866da84095d6e746859b3829b42 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1a630b242242ac32d20d14e7ae5645aa28a47676eae0e62ed76af8bc1f56c438 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 326980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bf31cee9a2387236a89c5e82898bee6e2f63b252 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 878d47a901056d5303bf37414d787046e1d38fac2bd9f2f5ddd00a9dd6b9f4eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 348904
</span> }
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +46,7 @@ long_description Extra CMake Modules, or ECM, aims to augment CMake with addi
</span> platforms darwin
homepage http://projects.kde.org/projects/kdesupport/${ECM}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -Np1
</span> patchfiles-append patch-BUNDLEDIR.diff
# https://phabricator.kde.org/D5865
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7af60053c03..3847b41a12f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kde-modules/KDEInstallDirs.cmake kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5c8783b..f5dfd6d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d739cf1..cafb7ad 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDEInstallDirs.cmake
</span> @@ -18,7 +18,7 @@
# deprecated variable name in square brackets):
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ index 5c8783b..f5dfd6d 100644
</span> # ``EXECROOTDIR``
# executables and libraries (``<empty>``) [``EXEC_INSTALL_PREFIX``]
# ``BINDIR``
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -417,7 +417,7 @@ macro(_define_non_cache varname value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,7 +409,7 @@ macro(_define_non_cache varname value)
</span> endmacro()
if(APPLE)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-doc-building.diff b/kde/kde-extra-cmake-modules/files/patch-doc-building.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a841685aca..edf81b5d4a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-doc-building.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-doc-building.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git docs/CMakeLists.txt docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f17400f..2dd6b8b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/orig.FindSphinx.cmake 2015-12-06 15:09:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindSphinx.cmake 2015-12-15 13:06:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,6 +56,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dc83ec6..7d39969 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/FindSphinx.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/FindSphinx.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,9 @@ find_program(Sphinx_BUILD_EXECUTABLE
</span> sphinx-build
sphinx-build2
sphinx-build3
+ sphinx-build-2.7
+ sphinx-build-3.4
+ sphinx-build-3.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DOC "Sphinx Documentation Builder (http://sphinx-doc.org/)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOC "Sphinx Documentation Builder (https://www.sphinx-doc.org/)"
</span> )
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-enable-named-operators.diff b/kde/kde-extra-cmake-modules/files/patch-enable-named-operators.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d97ae5ea593..8c8606c711f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-enable-named-operators.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-enable-named-operators.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kde-modules/KDECompilerSettings.cmake kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8f87ecc1970b3523890e0c91d7627dd7ec5fb542..ae2eaffc79273185a196ee00986a017245f3c09e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,6 +219,46 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63a5ce1..c42fd55 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,6 +210,46 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
</span> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-operator-names")
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-kdecompilerflags.diff b/kde/kde-extra-cmake-modules/files/patch-kdecompilerflags.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 895cd3d6905..d31e079efa8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-kdecompilerflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-kdecompilerflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git docs/module/ECMAddCompilerFlag.rst docs/module/ECMAddCompilerFlag.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/docs/module/ECMAddCompilerFlag.rst b/docs/module/ECMAddCompilerFlag.rst
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000000000000000000000000000000000000..320a51a308c981a3514e31a8d07fb1e61c1121aa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..320a51a
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/module/ECMAddCompilerFlag.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/docs/module/ECMAddCompilerFlag.rst
</span> @@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMAddCompilerFlag.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kde-modules/KDECompilerSettings.cmake kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b60e4ea1c666b53ac4fe54a8f0327713e3159872..25b82ceca0ad51fe0a2d8e5742ed1c9d48421f7e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,6 +186,8 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e5193e..b60e28d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,6 +182,8 @@ endif()
</span> # Language and toolchain features
############################################################
+include(ECMAddCompilerFlag)
+
# Pick sensible versions of the C and C++ standards.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that MSVC does not have equivalent flags; the features are either
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # supported or they are not.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -369,20 +371,14 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT CMAKE_C_STANDARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -404,20 +406,14 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
</span> # Make some warnings errors
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ index b60e4ea1c666b53ac4fe54a8f0327713e3159872..25b82ceca0ad51fe0a2d8e5742ed1c9d
</span>
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -492,12 +488,13 @@ if (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -527,12 +523,13 @@ if (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span> set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,13 +65,13 @@ index b60e4ea1c666b53ac4fe54a8f0327713e3159872..25b82ceca0ad51fe0a2d8e5742ed1c9d
</span> endif()
include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kde-modules/KDEFrameworkCompilerSettings.cmake kde-modules/KDEFrameworkCompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7b62c3e06dfcbc2a3c62bcc85ec75dafd80f67f7..4c591c6bf4b56449d181d79ce06ed3de8d60600f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kde-modules/KDEFrameworkCompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kde-modules/KDEFrameworkCompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,18 +61,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DQT_STRICT_ITERATORS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 27298b8..74c088e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDEFrameworkCompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDEFrameworkCompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,18 +49,9 @@ add_definitions(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKF_DEPRECATED_WARNINGS_SINCE=0x060000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span>
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,11 +93,11 @@ index 7b62c3e06dfcbc2a3c62bcc85ec75dafd80f67f7..4c591c6bf4b56449d181d79ce06ed3de
</span> +ecm_add_cxx_compiler_flags_if_supported(FLAGS -Wzero-as-null-pointer-constant
+ SUPPORTED_IF CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0"
+ QUERY_IF CMAKE_CXX_COMPILER_ID MATCHES "Clang")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/ECMAddCompilerFlag.cmake modules/ECMAddCompilerFlag.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/ECMAddCompilerFlag.cmake b/modules/ECMAddCompilerFlag.cmake
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000000000000000000000000000000000000..ef216c4c6ad60b346d95fc58912e816e94613002
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..ef216c4
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/ECMAddCompilerFlag.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/ECMAddCompilerFlag.cmake
</span> @@ -0,0 +1,153 @@
+#.rst:
+# ECMAddCompilerFlag
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,21 +252,21 @@ index 0000000000000000000000000000000000000000..ef216c4c6ad60b346d95fc58912e816e
</span> + endif()
+endfunction()
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tests/CMakeLists.txt tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9df03eb9f578b05a4cbb10323ab984bacb81d878..1bebe9a1fe50bbbdbdb623914346cc16926baa43 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,3 +221,5 @@ set_package_properties(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (TARGET Qt5::Quick)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test_macro(ECMQMLModules dummy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1901ca1..ed43650 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,3 +224,5 @@ set(ECMGenerateDBusServiceFileTest_EXTRA_OPTIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_test_macro(ECMGenerateDBusServiceFileTest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/ECMGenerateDBusServiceFileTest/check_tree.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span> +
+add_test_macro(ECMAddCompilerFlag dummy)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tests/ECMAddCompilerFlag/CMakeLists.txt tests/ECMAddCompilerFlag/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/ECMAddCompilerFlag/CMakeLists.txt b/tests/ECMAddCompilerFlag/CMakeLists.txt
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000000000000000000000000000000000000..a8d1c6ccbaaa24792ee6814939891f58cd4fcb4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..688e057
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/ECMAddCompilerFlag/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tests/ECMAddCompilerFlag/CMakeLists.txt
</span> @@ -0,0 +1,115 @@
+project(ECMAddCompilerFlagTest)
+cmake_minimum_required(VERSION 2.8.12)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,11 +383,11 @@ index 0000000000000000000000000000000000000000..a8d1c6ccbaaa24792ee6814939891f58
</span> +endif()
+
+add_executable(dummy main.c)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tests/ECMAddCompilerFlag/main.c tests/ECMAddCompilerFlag/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/ECMAddCompilerFlag/main.c b/tests/ECMAddCompilerFlag/main.c
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000000000000000000000000000000000000..c13815cea825c1f1ea72190a7fe901cd1fa55d0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..c13815c
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/ECMAddCompilerFlag/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tests/ECMAddCompilerFlag/main.c
</span> @@ -0,0 +1,4 @@
+int main()
+{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-mac-installdirs.diff b/kde/kde-extra-cmake-modules/files/patch-mac-installdirs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f4329762e4b..d4f033bc707 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-mac-installdirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-mac-installdirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git kde-modules/KDEInstallDirs.cmake kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52b2eb212f3941ea48ba864433e11919e83b2367..b79b66d37296cbf8a49440e759a92f99b075db95 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,6 +259,10 @@ if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cafb7ad..bb64366 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,6 +249,10 @@ if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GN
</span> endif()
endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ index 52b2eb212f3941ea48ba864433e11919e83b2367..b79b66d37296cbf8a49440e759a92f99
</span> endif()
set(_gnu_install_dirs_vars
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -466,6 +470,9 @@ if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -459,6 +463,9 @@ if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
</span> if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ index 52b2eb212f3941ea48ba864433e11919e83b2367..b79b66d37296cbf8a49440e759a92f99
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -532,20 +539,41 @@ if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -525,20 +532,41 @@ if (WIN32)
</span> _define_relative(DATAROOTDIR BINDIR "data"
"read-only architecture-independent data root"
SHARE_INSTALL_PREFIX)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,8 +66,8 @@ index 52b2eb212f3941ea48ba864433e11919e83b2367..b79b66d37296cbf8a49440e759a92f99
</span> # Qt-specific data vars
if(KDE_INSTALL_USE_QT_SYS_PATHS)
query_qmake(qt_docs_dir QT_INSTALL_DOCS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -584,40 +612,40 @@ _define_relative(KTEMPLATESDIR DATAROOTDIR "kdevappwizard/templates"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Kapptemplate and Kdevelop templates")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,40 +609,40 @@ _define_relative(JARDIR "" "jar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Java AAR/JAR files for Android")
</span>
# Cross-desktop or other system things
-_define_relative(ICONDIR DATAROOTDIR "icons"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-qt_no_exceptions.diff b/kde/kde-extra-cmake-modules/files/patch-qt_no_exceptions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a569a15c575..9b1a662530e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-qt_no_exceptions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-qt_no_exceptions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,9 +304,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c42fd55..6e5193e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,9 +295,9 @@ endif()
</span> if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ Index: kde-modules/KDECompilerSettings.cmake
</span> #elseif (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel"))
# Exceptions appear to be disabled by default for MSVC
# http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,9 +324,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,9 +315,13 @@ macro(_kdecompilersettings_append_exception_flag VAR)
</span> set(${VAR} "${${VAR}} -fexceptions")
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ Index: kde-modules/KDECompilerSettings.cmake
</span> endif()
string(STRIP "${${VAR}}" ${VAR})
endmacro()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,10 +355,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,10 +346,10 @@ function(KDE_TARGET_ENABLE_EXCEPTIONS target mode)
</span> if (WIN32)
target_compile_options(${target} ${mode} "$<$<CXX_COMPILER_ID:Intel>:-EHsc>")
else()
<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 63c379cf5f7..bda140e433f 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,8 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<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>
name VLC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +16,35 @@ long_description VLC media player is a highly portable multimedia player for
</span>
homepage https://www.videolan.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport lib${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
</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.11.1
</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;'>+# make VLC2 and VLC(3) co-installable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vlcprefix ${prefix}/libexec/vlc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.videolan.org/pub/videolan/vlc/${version}/:source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://download.videolan.org/pub/videolan/vlc/${version}/macosx:installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles vlc-${version}.tar.xz:source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc-${version}.dmg:installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums vlc-${version}.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a19eb43a0ea6307f0923efe28acae1b803df6a69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25886644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc-${version}.dmg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 69f9f1b4134ce37805f495f8e78eb1c791306793 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 021212d2f6e6701ec3b254d56dfa5c5f848c9c02813c5750c6944a8458de8fb5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 51971868
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport lib${name} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "lib${name}"} {
</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 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,472 +52,58 @@ subport lib${name} {
</span> to create a wide range of multimedia applications using the VLC features.
conflicts ${name}
homepage https://www.videolan.org/vlc/libvlc.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # libVLC builds on 10.9 (Darwin 13)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by libVLC2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {}
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 15} {
</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;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # VLC 3 doesn't run on OS X < 10.7
</span> replaced_by VLC2
PortGroup obsolete 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # given the Portfile design it's easier to shunt the entire patch phase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # rather than trying to keep the patchfiles list empty.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
</span><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;'>-version 3.0.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</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 https://download.videolan.org/pub/videolan/vlc/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir VLC
</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:#e0ffe0;'>+use_dmg yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only vlc-${version}.dmg
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a9c6a8796d0d86a71b738d4d41c377cd03d0e4ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 26041744
</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;'>- port:realpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "---> Extracting sources (partial)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "tar -xf ${distpath}/vlc-${version}.tar.xz vlc-${version}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libavcodec.diff: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;'>- path:include/turbojpeg.h:libjpeg-turbo \
</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: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: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: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:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# make libVLC2 and libVLC(3) co-installable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set vlcprefix ${prefix}/libexec/vlc3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=${vlcprefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --bindir=${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # VLC calls ibtools which isn't part of the commandline tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires Mac OS X 10.9 or greater."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible Mac OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.major} == 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_deployment_target 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-macosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {exec xcrun --show-sdk-path -sdk macosx10.10} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Using SDK macosx10.10 : ${result}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-macosx-sdk=${result}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-on-darwin13.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "ditto --rsrc ${workpath}/VLC-${version}/VLC.app ${destroot}${applications_dir}/VLC.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${vlcprefix}/lib/vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${vlcprefix}/include/vlc/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/VLC.app/Contents/MacOS/plugins ${destroot}${vlcprefix}/lib/vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/VLC.app/Contents/MacOS/share/lua ${destroot}${vlcprefix}/lib/vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib/*.dylib] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s [string map [list ${destroot} ""] ${l}] ${destroot}${vlcprefix}/lib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${worksrcpath}/include/os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/lock.h ${worksrcpath}/include/os/lock.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make the code build on 10.11 and earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-on-pre-1012.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include/vlc/*.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s [string map [list ${destroot} ""] ${l}] ${destroot}${vlcprefix}/include/vlc
</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_lib-append port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# VLC doesn't currently build for me using port:clang-3.8
</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 macports-clang-3.8 {clang < 300}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append configure.ac-no-arch.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-soundfont-path.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists replaced_by]} {
</span><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:#ffe0e0;'>-
</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;'>+ foreach l [glob ${workpath}/vlc-${version}/include/*.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${l} ${destroot}${vlcprefix}/include/vlc/plugins/
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args-append "|& tee -a ${workpath}/.macports.${subport}@${version}.configure.log'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmd [join "${configure.cmd} ${configure.pre_args} ${configure.args}"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-prepend "-cf '${configure.cmd} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd "/bin/csh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "configure command set to `cmd=${configure.cmd} pre_args=${configure.pre_args} args=${configure.args} post_args=${configure.post_args}`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '## ${cmd}' > ${workpath}/.macports.${subport}.configure.log"
</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;'>-# 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;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "MATROSKA_CFLAGS=${prefix}/include/ebml" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "MATROSKA_LIBS=-lmatroska -lebml"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1 -k
</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 -Wno-unknown-pragmas
</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;'>-build.target all
</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;'>- # The VLC.app target does not obey DESTDIR and tries to copy a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # non-existing folder.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=${destroot}${vlcprefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target VLC.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't try to install the (missing) shared/hrtfs folder.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # That folder is only used by the spatialaudio plugin which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we don't build at the moment.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-hrtfs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install
</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;'>-livecheck.url https://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-sparkle --disable-chromecast \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-secret
</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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --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 --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-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 --disable-wayland
</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-vlc \
</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-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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-samplerate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-realrtsp
</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 --enable-macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-vlc --enable-vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${vlcprefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l {libvlc.pc vlc-plugin.pc} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/${l} ${destroot}${vlcprefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${vlcprefix}/lib/pkgconfig/${l}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|${version}|g" ${destroot}${vlcprefix}/lib/pkgconfig/${l}
</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:#e0ffe0;'>+ system "echo \"#!/bin/sh\nexec \\\"${applications_dir}/VLC.app/Contents/MacOS/VLC\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/vlc3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod 755 ${destroot}${prefix}/bin/vlc3"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FreeRDP currently doesn't build with CMake >= 3.1 (#47389)
</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=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFREERDP_VERSION_MINOR=1
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant chromecast description {Enable ChromeCast support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/protoc:protobuf3-cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-chromecast \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-chromecast
</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 huge \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requires jack shout svg chromecast \
</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:#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;'>- 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:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</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:#ffe0e0;'>-
</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:#ffe0e0;'>- patch-no-@rpath.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists replaced_by]} {
</span><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;'>- 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:#ffe0e0;'>-
</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:#ffe0e0;'>- }
</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}${vlcprefix}/lib/vlc/plugins/*/*.la]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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}${vlcprefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${vlcprefix}/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 ${vlcprefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${vlcprefix}/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}${vlcprefix}/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 ${vlcprefix}/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;'>- }
</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}${vlcprefix}/share/applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${vlcprefix}/share/man
</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;'>- reinplace "s|prefix=${prefix}|prefix=${vlcprefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${vlcprefix}/lib/pkgconfig/libvlc.pc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${vlcprefix}/lib/pkgconfig/vlc-plugin.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${vlcprefix}/lib/vlc/vlc-cache-gen ${vlcprefix}/lib/vlc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> notes-append "MIDI support requires installing one or more SoundFont files,\
in ${prefix}/share/sounds/sf2, for instance from port:generaluser-soundfont."
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69865e6232e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/configure.ac-no-arch.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index be65881..704e92a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,20 +138,12 @@ case "${host_os}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl Force gcc "-arch" flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_flag=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${host}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i?86*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_flag="-arch i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ppc64*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_flag="-arch ppc64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ppc*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_flag="-arch ppc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ YASMFLAGS="-f macho32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_flag="-arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ YASMFLAGS="-f macho64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arm*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_c_bigendian="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,12 +152,12 @@ case "${host_os}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS=darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${CXX} -stdlib=libc++ -std=c++11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag} -Werror=partial-availability"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 -Werror=partial-availability"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/libvlc.pc b/multimedia/VLC/files/libvlc.pc
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6d537b3300e
</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/libvlc.pc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+prefix=@PREFIX@/libexec/vlc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec_prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libdir=${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+includedir=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Name: LibVLC control API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: VLC media player external control library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Libs: -L${libdir} -lvlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Libs.private: -lvlccore -Wl,-undefined,dynamic_lookup,-framework,AppKit
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index efc5e6ca910..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/lock.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,158 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2016 Apple Inc. All rights reserved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @APPLE_APACHE_LICENSE_HEADER_START@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * You may obtain a copy of the License at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * http://www.apache.org/licenses/LICENSE-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Unless required by applicable law or agreed to in writing, software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * distributed under the License is distributed on an "AS IS" BASIS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * See the License for the specific language governing permissions and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * limitations under the License.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @APPLE_APACHE_LICENSE_HEADER_END@
</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;'>-#ifndef __OS_LOCK__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __OS_LOCK__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <sys/cdefs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <os/base.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __has_feature(assume_nonnull)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_ASSUME_NONNULL_BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_ASSUME_NONNULL_END
</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;'>-OS_ASSUME_NONNULL_BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*! @header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Low-level lock API.
</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;'>-#define OS_LOCK_API_VERSION 20160309
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-__BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __AVAILABILITY_INTERNAL__MAC_10_12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __AVAILABILITY_INTERNAL__MAC_10_12 __attribute__((availability(macosx,introduced=10.12)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_UNFAIR_LOCK_AVAILABILITY \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __OSX_AVAILABLE_STARTING(__MAC_10_12,__IPHONE_10_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;'>- * @typedef os_unfair_lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @abstract
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Low-level lock that allows waiters to block efficiently on contention.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * In general, higher level synchronization primitives such as those provided by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the pthread or dispatch subsystems should be preferred.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * The values stored in the lock should be considered opaque and implementation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * defined, they contain thread ownership information that the system may use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to attempt to resolve priority inversions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This lock must be unlocked from the same thread that locked it, attemps to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * unlock from a different thread will cause an assertion aborting the process.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This lock must not be accessed from multiple processes or threads via shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * or multiply-mapped memory, the lock implementation relies on the address of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the lock value and owning process.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Must be initialized with OS_UNFAIR_LOCK_INIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @discussion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Replacement for the deprecated OSSpinLock. Does not spin on contention but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * waits in the kernel to be woken up by an unlock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * As with OSSpinLock there is no attempt at fairness or lock ordering, e.g. an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * unlocker can potentially immediately reacquire the lock before a woken up
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * waiter gets an opportunity to attempt to acquire the lock. This may be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * advantageous for performance reasons, but also makes starvation of waiters a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * possibility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef struct os_unfair_lock_s {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint32_t _os_unfair_lock_opaque;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} os_unfair_lock, *os_unfair_lock_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_UNFAIR_LOCK_INIT ((os_unfair_lock){0})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#elif defined(__cplusplus) && __cplusplus >= 201103L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_UNFAIR_LOCK_INIT (os_unfair_lock{})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#elif defined(__cplusplus)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_UNFAIR_LOCK_INIT (os_unfair_lock())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define OS_UNFAIR_LOCK_INIT {0}
</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;'>-/*!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @function os_unfair_lock_lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @abstract
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Locks an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Pointer to an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-void os_unfair_lock_lock(os_unfair_lock_t lock);
</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;'>- * @function os_unfair_lock_trylock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @abstract
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Locks an os_unfair_lock if it is not already locked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @discussion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * It is invalid to surround this function with a retry loop, if this function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * returns false, the program must be able to proceed without having acquired
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the lock, or it must call os_unfair_lock_lock() directly (a retry loop around
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * os_unfair_lock_trylock() amounts to an inefficient implementation of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * os_unfair_lock_lock() that hides the lock waiter from the system and prevents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * resolution of priority inversions).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Pointer to an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @result
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Returns true if the lock was succesfully locked and false if the lock was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * already locked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_EXPORT OS_NOTHROW OS_WARN_RESULT OS_NONNULL_ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bool os_unfair_lock_trylock(os_unfair_lock_t lock);
</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;'>- * @function os_unfair_lock_unlock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @abstract
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Unlocks an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Pointer to an os_unfair_lock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_UNFAIR_LOCK_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-void os_unfair_lock_unlock(os_unfair_lock_t lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-__END_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS_ASSUME_NONNULL_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif // __OS_LOCK__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/no-sparkle.patch b/multimedia/VLC/files/no-sparkle.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 395ade6a517..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/no-sparkle.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,189 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 318cad4..7c4e53f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3850,13 +3850,6 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test ! -d ${CONTRIB_DIR}/Sparkle.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 1c880c9..08b3b9d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ extras/package/macosx/Resources/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2106,9 +2106,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="NSCustomObject" id="651263286">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="NSClassName">VLCMainMenu</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="NSCustomObject" id="1040926652">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="NSClassName">SUUpdater</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="NSCustomView" id="560875128">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <reference key="NSNextResponder"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="NSvFlags">268</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2635,14 +2632,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="connectionID">2817</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="IBActionConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="label">checkForUpdates:</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="source" ref="1040926652"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="destination" ref="354414928"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="connectionID">4371</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="IBOutletConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="label">o_dmi_mute</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <reference key="source" ref="651263286"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5466,11 +5455,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="objectName">Application</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="objectID">4370</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="object" ref="1040926652"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="parent" ref="0"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="objectID">4397</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <reference key="object" ref="629699013"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="NSMutableArray" key="children">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 98f315d..0074c64 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/simple_prefs.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/simple_prefs.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,8 +38,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "AppleRemote.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "CoreInteraction.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char *const ppsz_language[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "auto",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [o_intf_art_ckb setTitle: _NS("Allow metadata network access")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [o_intf_last_update_lbl setStringValue: @""];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [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:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- psz_tmp = config_GetPsz(p_intf, "control");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (psz_tmp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [o_intf_enableGrowl_ckb setState: (NSInteger)strstr(psz_tmp, "growl")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 2f264fd..d4049bd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- extras/package/macosx/Resources/English.lproj/Preferences.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ extras/package/macosx/Resources/English.lproj/Preferences.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4779,9 +4779,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <bool key="NSWindowIsRestorable">YES</bool>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="NSCustomObject" id="761483302">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="NSClassName">SUUpdater</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="NSWindowTemplate" id="898680423">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="NSWindowStyleMask">15</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="NSWindowBacking">2</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7629,22 +7626,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="connectionID">2681</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="IBBindingConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="label">value: automaticallyChecksForUpdates</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="source" ref="243384014"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="destination" ref="761483302"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="NSNibBindingConnector" key="connector">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="NSSource" ref="243384014"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="NSDestination" ref="761483302"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="NSLabel">value: automaticallyChecksForUpdates</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="NSBinding">value</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="NSKeyPath">automaticallyChecksForUpdates</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="NSNibBindingConnectorVersion">2</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="connectionID">3559</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="IBConnectionRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="IBOutletConnection" key="connection">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="label">nextKeyView</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <reference key="source" ref="588417130"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9360,12 +9341,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <reference key="parent" ref="492678965"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="objectID">3555</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="object" ref="761483302"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <reference key="parent" ref="0"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string key="objectName">Sparkle Updater</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- </object>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <object class="IBObjectRecord">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <int key="objectID">3556</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <reference key="object" ref="243384014"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <array class="NSMutableArray" key="children">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1d48150..c61a4aa 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/intf.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/intf.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,8 +68,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "VideoEffects.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "AudioEffects.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <Sparkle/Sparkle.h> /* we're the update delegate */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "iTunes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "Spotify.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -785,8 +783,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PL_LOCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- items_at_launch = p_playlist->p_local_category->i_children;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PL_UNLOCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [[SUUpdater sharedUpdater] setDelegate:self];
</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;'>- - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -974,25 +970,6 @@
</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;'>- #pragma mark -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma mark Sparkle delegate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* received directly before the update gets installed, so let's shut down a bit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSApp activateIgnoringOtherApps:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [o_remote stopListening: self];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [[VLCCoreInteraction sharedInstance] stop];
</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;'>--/* don't be enthusiastic about an update if we currently play a video */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([self activeVideoPlayback])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return YES;
</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;'>--#pragma mark -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma mark Media Key support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 438d315da2d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-build-on-darwin13.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,169 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/audio_output/auhal.c modules/audio_output/auhal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 22044631c7202fadd43f38eb7dcef24891344993..636217708c443bd6c626d9df3dedf557365c5d41 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/audio_output/auhal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/audio_output/auhal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,7 +295,6 @@ IsAudioFormatDigital(AudioFormatID id)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 'iac3':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case kAudioFormat60958AC3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case kAudioFormatAC3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case kAudioFormatEnhancedAC3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/codec/vt_utils.c modules/codec/vt_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f0a5f4a00f0972292beb0f29ef8bfcc2b0bc02e6..c919b7d5204e0a6f235b2c60c557ea079d4b12c5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/codec/vt_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/codec/vt_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +155,7 @@ cvpxpic_create_mapped(const video_format_t *fmt, CVPixelBufferRef cvpx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default: return NULL;
</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;'>-- CVPixelBufferLockFlags lock = readonly ? kCVPixelBufferLock_ReadOnly : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ enum CVPixelBufferLockFlags lock = readonly ? kCVPixelBufferLock_ReadOnly : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVPixelBufferLockBaseAddress(cvpx, lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- picture_resource_t rsc = { };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/codec/videotoolbox.m modules/codec/videotoolbox.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a63ac7a62ff84b865b7c23c573992aa2f2b3a30f..2d48e6e96991a5da689d4c055e3ad16bd5674e26 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/codec/videotoolbox.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/codec/videotoolbox.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -996,12 +996,12 @@ static CMVideoCodecType CodecPrecheck(decoder_t *p_dec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return kCMVideoCodecType_H264;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_CODEC_HEVC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!deviceSupportsHEVC())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// if (!deviceSupportsHEVC())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg_Warn(p_dec, "device doesn't support HEVC");
</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;'>-- return kCMVideoCodecType_HEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// return kCMVideoCodecType_HEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_CODEC_MP4V:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1136,11 +1136,11 @@ static CFMutableDictionaryRef CreateSessionDescriptionFormat(decoder_t *p_dec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case COLOR_SPACE_BT2020:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (&kCVImageBufferColorPrimaries_ITU_R_2020 != nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_2020;
</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;'>-+// if (&kCVImageBufferColorPrimaries_ITU_R_2020 != nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_2020;
</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;'>- #pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* fall through */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case COLOR_SPACE_BT709:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1421,19 +1421,19 @@ static int OpenDecoder(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p_sys->b_vt_need_keyframe = true;
</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 kCMVideoCodecType_HEVC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_codec_init = InitHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_codec_clean = CleanHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_codec_supported = CodecSupportedHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_late_start = LateStartHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_process_block = ProcessBlockHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_need_restart = VideoToolboxNeedsToRestartHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_configure_vout = ConfigureVoutHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_get_extradata = GetDecoderExtradataHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->pf_fill_reorder_info = FillReorderInfoHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->b_poc_based_reorder = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_sys->b_vt_need_keyframe = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// case kCMVideoCodecType_HEVC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_codec_init = InitHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_codec_clean = CleanHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_codec_supported = CodecSupportedHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_late_start = LateStartHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_process_block = ProcessBlockHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_need_restart = VideoToolboxNeedsToRestartHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_configure_vout = ConfigureVoutHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_get_extradata = GetDecoderExtradataHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->pf_fill_reorder_info = FillReorderInfoHEVC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->b_poc_based_reorder = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// p_sys->b_vt_need_keyframe = true;
</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 kCMVideoCodecType_MPEG4Video:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p_sys->pf_get_extradata = GetDecoderExtradataMPEG4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/keystore/keychain.m modules/keystore/keychain.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 09b2dc9c1c231cc51a1aa5683b83893982ffc7b4..d2d331c6c9fb20e7de82a7cf54d9132d5778dddb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/keystore/keychain.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/keystore/keychain.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +206,7 @@ static NSString * ErrorForStatus(OSStatus status)
</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;'>- #define OSX_MAVERICKS (NSAppKitVersionNumber >= 1265)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern const CFStringRef kSecAttrAccessible;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// extern const CFStringRef kSecAttrAccessible;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/video_filter/ci_filters.m modules/video_filter/ci_filters.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 795c907aa51a3dffc5452ba163c1073eac5c8621..966062af3f31fdd6dfb8138099d0ae3d57ded61b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/video_filter/ci_filters.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/video_filter/ci_filters.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,10 +36,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "filter_picture.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "vt_utils.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CoreImage/CIContext.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CoreImage/CIImage.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CoreImage/CIFilter.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CoreImage/CIVector.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QuartzCore/CIContext.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QuartzCore/CIImage.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QuartzCore/CIFilter.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QuartzCore/CIVector.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -589,11 +589,11 @@ Open(vlc_object_t *obj, char const *psz_filter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_CODEC_CVPX_UYVY:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_CODEC_CVPX_I420:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case VLC_CODEC_CVPX_BGRA:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (&kCGColorSpaceITUR_709 == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// if (&kCGColorSpaceITUR_709 == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg_Warn(obj, "iOS/macOS version is too old, aborting...");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return VLC_EGENERIC;
</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;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/Makefile.in modules/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29924af..39f3298 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10730,7 +10730,7 @@ video_filter_LTLIBRARIES = libadjust_plugin.la libalphamask_plugin.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # macOS / iOS hardware video filters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- @HAVE_OSX_TRUE@libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_OSX_TRUE@ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_OSX_TRUE@ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,QuartzCore -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdeinterlace_common_la_SOURCES = video_filter/deinterlace/common.c video_filter/deinterlace/common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdeinterlace_common_la_LDFLAGS = -static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/video_filter/Makefile.am modules/video_filter/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af190d1..3f0fc4f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/video_filter/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/video_filter/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,7 +111,7 @@ video_filter_LTLIBRARIES = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- if HAVE_OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,QuartzCore -Wl,-framework,CoreVideo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- video_filter_LTLIBRARIES += libci_filters_plugin.la
</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;color:#808080;'>diff --git a/multimedia/VLC/files/patch-build-on-pre-1012.diff b/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3e3fe951ff1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,446 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/access/avcapture.m modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 38777226cfe56211aa0bd1efc9623ac7ca4cf650..d31f2168885b9b2d68d7dc562ea7a4849edbfb6e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,14 +43,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <AVFoundation/AVFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <CoreMedia/CoreMedia.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--+ (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:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@end
</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;'>- /*****************************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Local prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *****************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -334,6 +326,11 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto error;
</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;'>-+// only compile this block if the requestAccessForMediaType method is supported;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// the code inside `if (@available(foo)) {}` is only *executed* when foo is true but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// it is always parsed at compile time; @available is not an #ifdef that protects against
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// undefined types or functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg_Dbg(p_demux, "Check user consent for access to the video device");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,6 +347,7 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto error;
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- input = [AVCaptureDeviceInput deviceInputWithDevice:(__bridge AVCaptureDevice *)p_sys->device error:&o_returnedError];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/access/avaudiocapture.m modules/access/avaudiocapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e20d8aadf382ee493f2cdfe0cf91a7d9bf951b51..4d6587314c390055836bfe5e9f375aaa08fd3874 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/access/avaudiocapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/access/avaudiocapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,14 +45,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <CoreMedia/CoreMedia.h>
</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;'>--#ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--+ (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:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@end
</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;'>- /*****************************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Struct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *****************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,6 +213,11 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return VLC_EGENERIC;
</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;'>-+// only compile this block if the requestAccessForMediaType method is supported;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// the code inside `if (@available(foo)) {}` is only *executed* when foo is true but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// it is always parsed at compile time; @available is not an #ifdef that protects against
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// undefined types or functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg_Dbg(p_demux, "Check user consent for access to the audio device");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,6 +237,7 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return VLC_EGENERIC;
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSError *error = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device error:&error];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/audio_output/coreaudio_common.c modules/audio_output/coreaudio_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 69fd47137050a1d21ac7eadfbfaafe6f557b8ee9..4a58744104a945d1d11014f9b9948f3dd28dde34 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/audio_output/coreaudio_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/audio_output/coreaudio_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "coreaudio_common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <CoreAudio/CoreAudioTypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static struct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void (*lock)(os_unfair_lock *lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void (*unlock)(os_unfair_lock *lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+} unfair_lock;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ca_init_once(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unfair_lock.lock = dlsym(RTLD_DEFAULT, "os_unfair_lock_lock");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!unfair_lock.lock)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unfair_lock.unlock = dlsym(RTLD_DEFAULT, "os_unfair_lock_unlock");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!unfair_lock.unlock)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unfair_lock.lock = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define os_unfair_lock_lock unfair_lock.lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define os_unfair_lock_unlock unfair_lock.unlock
</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;'>- static inline uint64_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BytesToFrames(struct aout_sys_common *p_sys, size_t i_bytes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,6 +136,10 @@ ca_Open(audio_output_t *p_aout)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mach_timebase_info(&p_sys->tinfo) != KERN_SUCCESS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static pthread_once_t once = PTHREAD_ONCE_INIT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_once(&once, ca_init_once);
</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;'>- assert(p_sys->tinfo.denom != 0 && p_sys->tinfo.numer != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/video_output/caopengllayer.m modules/video_output/caopengllayer.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bff225525d9eb68dace1d5839857fd61e3fd83cf..ce11bdfbc182632592c5e0ba19058187d22b8d20 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/video_output/caopengllayer.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/video_output/caopengllayer.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vlc_atomic.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <QuartzCore/QuartzCore.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// no idea really what version check is needed here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <QuartzCore/CALayer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@protocol CALayerDelegate <NSObject>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (id < CAAction >)actionForLayer:(CALayer *)layer forKey:(NSString *)key;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)displayLayer:(CALayer *)layer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)layoutSublayersOfLayer:(CALayer *)layer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@end
</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;'>- #import <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/video_output/macosx.m modules/video_output/macosx.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 20aedfc63e440cbb16ec3d0078d7d433434b8131..26ca20e4b449a52b7650a3ef7f2c1337f824bc1e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/video_output/macosx.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/video_output/macosx.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,6 +339,7 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *su
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [sys->glView setVoutFlushing:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vlc_gl_MakeCurrent(sys->gl) == VLC_SUCCESS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vout_display_place_t place;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vout_display_PlacePicture(&place, &vd->source, vd->cfg, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,6 +347,7 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *su
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vd->cfg->display.height - (place.y + place.height),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- place.width, place.height);
</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;'>- vout_display_opengl_Display (sys->vgl, &vd->source);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vlc_gl_ReleaseCurrent(sys->gl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/VLCBottomBarView.m modules/gui/macosx/VLCBottomBarView.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 26e9dd3da5ecd6d2b8ffbbb8fb59ff49f2d16ed2..3691486d253854aa971f5a798e91310527273350 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCBottomBarView.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCBottomBarView.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,9 +84,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _darkStroke = [NSColor blackColor];
</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;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self viewDidChangeEffectiveAppearance];
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)calculatePaths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,6 +146,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)viewDidChangeEffectiveAppearance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([self.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setDark:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,6 +155,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setNeedsDisplay:YES];
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/VLCControlsBarCommon.m modules/gui/macosx/VLCControlsBarCommon.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 85aeaf1371f6e0cac6b4e83a3737c25efc901315..ee9ef9d31f4efe72f42ae0c010385e4b41500376 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCControlsBarCommon.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCControlsBarCommon.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,9 +55,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSApplication sharedApplication] removeObserver:self forKeyPath:@"effectiveAppearance"];
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)awakeFromNib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +67,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [super awakeFromNib];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _darkInterface = var_InheritBool(getIntf(), "macosx-interfacestyle");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSApplication *app = [NSApplication sharedApplication];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _darkInterface = [app.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +77,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options:0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context:nil];
</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;'>- _nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self.dropView setDrawBorder: NO];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -439,6 +443,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self.fullscreenButton setState:b_fullscreen];
</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;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This is used for both VLCControlsBarCommon, as well as VLCMainWindowControlsBar instances
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)observeValueForKeyPath:(NSString *)keyPath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ofObject:(id)object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -455,5 +460,13 @@
</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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)observeValueForKeyPath:(NSString *)keyPath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ofObject:(id)object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ change:(NSDictionary *)change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ context:(void *)context
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/VLCMain.m modules/gui/macosx/VLCMain.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 883fad846ecf167de60c428e891b73296a8c4072..6ececa433b5f9fef4115c7552514732d2af7948d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCMain.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCMain.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,6 +95,7 @@ int OpenIntf (vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [VLCApplication sharedApplication];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [VLCMain sharedInstance];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (var_InheritBool(getIntf(), "macosx-interfacestyle")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +105,7 @@ int OpenIntf (vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- app.appearance = [NSAppearance appearanceNamed: NSAppearanceNameDarkAqua];
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSBundle loadNibNamed:@"MainMenu" owner:[[VLCMain sharedInstance] mainMenu]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[[VLCMain sharedInstance] mainWindow] makeKeyAndOrderFront:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/VLCMainWindow.m modules/gui/macosx/VLCMainWindow.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66d9a6b0570f468ceadae22177cc1f57dcd606c2..30bc49b106e24cf1b096360afc4f6f56ff5b7119 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCMainWindow.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCMainWindow.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,9 +135,11 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSNotificationCenter defaultCenter] removeObserver: self];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSApplication sharedApplication] removeObserver:self forKeyPath:@"effectiveAppearance"];
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)awakeFromNib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -192,6 +194,7 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Dropzone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [_dropzoneLabel setStringValue:_NS("Drop media here")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSApplication *app = [NSApplication sharedApplication];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([app.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -204,7 +207,9 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options:0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.dropzoneBackgroundImageView.hidden = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</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;'>- [_dropzoneImageView setImage:imageFromRes(@"dropzone")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [_dropzoneButton setTitle:_NS("Open media...")];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -307,12 +312,14 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isAReload = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOL darkMode = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSApplication *app = [NSApplication sharedApplication];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([app.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darkMode = YES;
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- o_sidebaritems = [[NSMutableArray alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SideBarItem *libraryItem = [SideBarItem itemWithTitle:_NS("LIBRARY") identifier:@"library"];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -755,6 +762,7 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self.fspanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
</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;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)observeValueForKeyPath:(NSString *)keyPath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ofObject:(id)object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- change:(NSDictionary<NSKeyValueChangeKey,id> *)change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -769,6 +777,15 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self reloadSidebar];
</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;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)observeValueForKeyPath:(NSString *)keyPath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ofObject:(id)object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ change:(NSDictionary *)change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ context:(void *)context
</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;'>-+#endif
</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;'>- #pragma mark -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma mark Video Output handling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1299,9 +1316,12 @@ static const float f_min_window_height = 307.;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [super awakeFromNib];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setAcceptsMouseMovedEvents: YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setContentMinSize: NSMakeSize(363., f_min_video_height + [[self controlsBar] height])];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</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;'>- BOOL darkInterface = config_GetInt(getIntf(), "macosx-interfacestyle");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (darkInterface) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/VLCSlider.m modules/gui/macosx/VLCSlider.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 816dcdac31fb1d5b74409f4e665343ce5fa05c9f..200c532a9d314fd528ab2d50027d8a60c15c0c83 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCSlider.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCSlider.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,9 +35,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSAssert([self.cell isKindOfClass:[VLCSliderCell class]],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @"VLCSlider cell is not VLCSliderCell");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _isScrollable = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self viewDidChangeEffectiveAppearance];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</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;'>- [self setSliderStyleLight];
</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;'>-@@ -117,13 +120,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)viewDidChangeEffectiveAppearance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([self.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setSliderStyleDark];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setSliderStyleLight];
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setNeedsDisplay:YES];
</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;'>-diff --git modules/gui/macosx/VLCVolumeSlider.m modules/gui/macosx/VLCVolumeSlider.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bc30e4a86e737634f33e0a8830ff32010d99fb94..02c50a438a8f0592667b5e482882ccef17ffbb1d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCVolumeSlider.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCVolumeSlider.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,9 +34,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (self) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSAssert([self.cell isKindOfClass:[VLCVolumeSliderCell class]],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @"VLCVolumeSlider cell is not VLCVolumeSliderCell");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self viewDidChangeEffectiveAppearance];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</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;'>- [(VLCVolumeSliderCell*)self.cell setSliderStyleLight];
</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;'>-@@ -56,6 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)viewDidChangeEffectiveAppearance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([self.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [(VLCVolumeSliderCell*)self.cell setSliderStyleDark];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +69,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setNeedsDisplay:YES];
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)setUsesBrightArtwork:(BOOL)brightArtwork
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/Windows.m modules/gui/macosx/Windows.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9e459dda2477a712e34b6021241073d40465c149..a2accf389a3bde219f73a3259aac5f0ce64766e3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/Windows.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/Windows.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,10 +231,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)styleMask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- backing:(NSBackingStoreType)backingType defer:(BOOL)flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self = [super initWithContentRect:contentRect styleMask:styleMask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- backing:backingType defer:flag];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</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;'>- _darkInterface = config_GetInt(getIntf(), "macosx-interfacestyle");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_darkInterface) {
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c00500379ce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-ffmpegVLC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,82 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig.configure.ac 2016-05-31 18:11:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-07-04 23:04:07.557682616 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2283,7 +2272,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for libavutil variant])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_EXISTS([libavutil], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CHECK_EXISTS([libavutil-VLC], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libavutil_version="$(${PKG_CONFIG} --modversion libavutil)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libavutil_micro="${libavutil_version##*.}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test ${libavutil_micro} -le 99], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2322,8 +2311,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE(avcodec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --enable-avcodec libavcodec codec (default enabled)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${enable_avcodec}" != "no"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavutil < 55],, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(AVCODEC,[libavcodec-VLC >= 53.34.0 libavutil-VLC >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavutil-VLC < 55],, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2382,7 +2371,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
</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;'>-@@ -2416,7 +2405,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x${have_avcodec}" = "xyes"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
</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;'>-@@ -2496,7 +2485,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_avformat="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${enable_avformat}" != "no"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(AVFORMAT,[libavformat >= 53.21.0 libavcodec libavutil], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(AVFORMAT,[libavformat-VLC >= 53.21.0 libavcodec-VLC libavutil-VLC], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_avformat="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2523,7 +2512,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (default enabled)]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_swscale}" != "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(SWSCALE,[libswscale],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(SWSCALE,[libswscale-VLC],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2550,7 +2539,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --enable-postproc libpostproc image post-processing (default auto)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_postproc}" != "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(POSTPROC,[libpostproc-VLC libavutil-VLC],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3180,12 +3169,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libav) av_vdpau_ver="55.26.0" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg) av_vdpau_ver="55.42.100"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
</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;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavutil-VLC >= 52.4.0 libavcodec-VLC >= ${av_vdpau_ver}], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_avcodec_vdpau="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_NOTICE([VDPAU decoding acceleration activated])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ], [
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5fc759f28a2..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,242 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/demux.c modules/lua/demux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 398122957f85a9c4248b5f3d5409b541fd6d7c6f..a77ed004c93c3068a9b20fe3ded537c8eb7dc93a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/demux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/demux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@ struct vlclua_playlist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_demux_peek( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stream_t *s = (stream_t *)vlclua_get_this(L);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int n = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int n = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const uint8_t *p_peek;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_demux_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stream_t *s = (stream_t *)vlclua_get_this(L);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int n = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int n = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *buf = malloc(n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (buf != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/dialog.c modules/lua/libs/dialog.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 144b38d7e946e66383579227ea517e2c533aa714..11b9a1b4e4a7431d48485439a8adc658dce3583d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/dialog.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/dialog.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Read entry in the Lua registry */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushlightuserdata( L, (void*) &key_update );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_gettable( L, LUA_REGISTRYINDEX );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return luaL_checkint( L, -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return luaL_checkinteger( L, -1 );
</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;'>- /** Manually update a dialog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set common arguments: col, row, hspan, vspan, width, height */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( lua_isnumber( L, arg ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_widget->i_column = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_widget->i_column = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_widget->i_row = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_widget->i_row = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_widget->i_horiz_span = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_widget->i_horiz_span = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_widget->i_vert_span = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_widget->i_vert_span = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_widget->i_width = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_widget->i_width = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( lua_isnumber( L, ++arg ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_widget->i_height = luaL_checkint( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_widget->i_height = luaL_checkinteger( L, arg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else goto end_of_args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end_of_args:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/io.c modules/lua/libs/io.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c01cf7137d1eb2252a1675322bc5a1b2d916e215..12267e1822603e2a6dc458356d15a4b60336e772 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/io.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/io.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* psz_mode = luaL_optstring( L, 2, NULL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( psz_mode != NULL )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long i_offset = luaL_optlong( L, 3, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long i_offset = luaL_optinteger( L, 3, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !strcmp( psz_mode, "set" ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i_mode = SEEK_SET;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/net.c modules/lua/libs/net.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cb0d759b5d3badd0e090ca4ca9c9fff71fd9edd4..49f2aec9e84b3b4732e537edbef0065f4d590825 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/net.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/net.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vlc_object_t *p_this = vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_host = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_port = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_port = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int *pi_fd = net_ListenTCP( p_this, psz_host, i_port );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( pi_fd == NULL )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vlc_object_t *p_this = vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_host = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_port = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_port = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_fd = net_ConnectTCP( p_this, psz_host, i_port );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( 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_net_close( 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_fd = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_fd = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vlclua_fd_unmap_safe( L, i_fd );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 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;'>- static int vlclua_net_send( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -278,7 +278,7 @@ static int vlclua_net_send( 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_net_recv( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i_len = (size_t)luaL_optinteger( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char psz_buffer[i_len];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_pushnil( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for( int i = 0; lua_next( L, 1 ); i++ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- luafds[i] = luaL_checkint( L, -2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ luafds[i] = luaL_checkinteger( L, -2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p_fds[i].fd = vlclua_fd_get( L, luafds[i] );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p_fds[i].events = luaL_checkinteger( L, -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p_fds[i].events &= POLLIN | POLLOUT | POLLPRI;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_fd_write( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -371,7 +371,7 @@ static int vlclua_fd_write( 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_fd_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i_len = (size_t)luaL_optinteger( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char psz_buffer[i_len];
</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/osd.c modules/lua/libs/osd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0f1f8fbdedaf1e26cada736bb86a269e8530e7bb..bedc464d1c1c55e4d1a640fb3c6ffb6889df454f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/osd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/osd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_string( const char *psz_name )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_osd_slider( 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_position = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_position = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_type = luaL_checkstring( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_type = vlc_osd_slider_type_from_string( psz_type );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( 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_spu_channel_clear( 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_chan = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_chan = luaL_checkinteger( L, 1 );
</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;'>- return luaL_error( L, "Unable to find input." );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/playlist.c modules/lua/libs/playlist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a5b68d9bdd78014c3d28f8723c91474bc6702c5c..5346b5cf946e314f5ae07269fde8d15c24ee8f58 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/playlist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/playlist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@ static int vlclua_playlist_next( 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_playlist_skip( 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_skip = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_skip = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_Skip( p_playlist, i_skip );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,7 @@ static int vlclua_playlist_random( 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_playlist_gotoitem( 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_id = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_id = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PL_LOCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_ViewPlay( p_playlist, NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( 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_playlist_delete( 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_id = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_id = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PL_LOCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( 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_playlist_move( 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_item = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i_target = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_item = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_target = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PL_LOCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/libs/stream.c modules/lua/libs/stream.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ab0c4a01e6744b79ed76460f7571474888824a75..5923427b84a2c508c7c6100823fe98b5d6de922a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/stream.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/stream.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +123,7 @@ static int vlclua_stream_read( 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_read;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int n = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int n = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t *p_read = malloc( n );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( !p_read ) return vlclua_error( L );
</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/volume.c modules/lua/libs/volume.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0dba2c1e1b9a0c38321f4ccca8ce2afae19ed642..f0b7d419016e1012f68017255b86b7b953fe9ab4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/libs/volume.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/libs/volume.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int vlclua_volume_set( lua_State *L )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</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;'>-- int i_volume = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i_volume = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( i_volume < 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i_volume = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT );
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a42173b578e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-no-@rpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/Makefile.am lib/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 892d9b1..1918615 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,9 +70,9 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_OS2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libvlc_la_LDFLAGS += -avoid-version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libvlc_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# libvlc_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</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;'>- pkgconfig_DATA = libvlc.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/Makefile.in lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9a7b283..00af3ac 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@ host_triplet = @host@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_WIN32_TRUE@am__append_1 = ../src/libvlc_win32_rc.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @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:#ffe0e0;'>- @HAVE_OS2_TRUE@am__append_3 = -avoid-version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_DARWIN_TRUE@am__append_4 = -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# @HAVE_DARWIN_TRUE@am__append_4 = -Xlinker -install_name -Xlinker @rpath/libvlc.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir = lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Makefile.am src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 502990c..e3880c8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,9 +479,9 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_DBUS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libvlccore_la_LIBADD += $(DBUS_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libvlccore_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# libvlccore_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</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;'>- 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:#ffe0e0;'>- $(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Makefile.in src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a8761d3..9569ec6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,7 +186,7 @@ host_triplet = @host@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @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:#ffe0e0;'>- @HAVE_OS2_TRUE@am__append_25 = -avoid-version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_DBUS_TRUE@am__append_26 = $(DBUS_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_DARWIN_TRUE@am__append_27 = -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# @HAVE_DARWIN_TRUE@am__append_27 = -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_PROGRAMS = test_block$(EXEEXT) test_dictionary$(EXEEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_i18n_atof$(EXEEXT) test_interrupt$(EXEEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4db73f7a6f5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-no-hrtfs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- extras/package/macosx/package.mak 2018-10-08 13:49:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ extras/package/macosx/package.mak 2018-10-08 13:49:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,8 +36,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -r "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -r "$(prefix)/lib/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ## HRTFs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -r $(srcdir)/share/hrtfs $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Copy some other stuff (?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (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-soundfont-path.diff b/multimedia/VLC/files/patch-soundfont-path.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bca8b80f928..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-soundfont-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/codec/fluidsynth.c modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bdc8d24..9859aa1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/codec/fluidsynth.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +125,7 @@ static int Open (vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glob_t gl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glob ("/usr/share/sounds/sf2/*.sf2", GLOB_NOESCAPE, NULL, &gl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glob ("@PREFIX@/share/sounds/sf2/*.sf2", GLOB_NOESCAPE, NULL, &gl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (size_t i = 0; i < gl.gl_pathc; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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/VLC/files/patch-static_assert.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f00a7dfb37b..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.orig 2016-03-22 15:34:33.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h 2016-03-22 15:34:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -793,6 +793,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to `int' if <stddef.h> does not define. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* #undef ssize_t */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>- #include <vlc_fixups.h>
</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;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 95957079985..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/misc/inhibit/orig.xdg.c 2014-08-14 09:20:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/misc/inhibit/xdg.c 2017-08-18 14:11:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- posix_spawnattr_t attr;
</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;'>--extern char **environ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void Timer (void *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pid_t pid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- argv, environ);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ argv, *_NSGetEnviron());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/stream_filter/orig.decomp.c 2015-04-13 21:54:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/stream_filter/decomp.c 2017-08-18 14:11:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,7 @@ struct stream_sys_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int64_t pts_delay;
</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;'>--extern char **environ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const size_t bufsize = 65536;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_VMSPLICE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +288,7 @@ static int Open (stream_t *stream, const char *path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!posix_spawn_file_actions_adddup2 (&actions, comp[0], 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !posix_spawn_file_actions_adddup2 (&actions, uncomp[1], 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !posix_spawnp (&p_sys->pid, path, &actions, NULL, argv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- environ))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *_NSGetEnviron()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vlc_clone (&p_sys->thread, Thread, stream,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_THREAD_PRIORITY_INPUT) == 0)
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1d417d30d7b..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/codec/avcodec/org.vda.c 2017-10-25 16:51:59.000000000 +0200
</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:#ffe0e0;'>-@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external->sys = p_va;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external->description = "VDA";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- external->pix_fmt = PIX_FMT_VDA_VLD;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ external->pix_fmt = AV_PIX_FMT_VDA_VLD;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external->setup = Setup;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external->get = Get;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external->release = Release;
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d8fa58909be..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,154 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/darwin/dirs.c src/darwin/dirs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d0489fd21cbb56a0730feb68e8fdbe8066728c0a..fa701de23a3f7cbe0e1a6e8ca4276cf12d2f729d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/darwin/dirs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/darwin/dirs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,14 +36,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// 20150205: we should do case-insensitive filename comparisons. HFS is case-insensitive by default,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// and while it strives to preserve case there is no guarantee that case folding will never occur,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// especially in directory components.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// @p libDirIsPosix is set to true in if getLibDir() detects we're installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// in a (linux-specific) posix way, like e.g. MacPorts would do.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *getLibDir (bool *libDirIsPosix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *libDirIsPosix = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Get the full program path and name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* First try to see if we are linked to the framework */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (unsigned i = 0; i < _dyld_image_count(); i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (unsigned i = 0; i < _dyld_image_count(); i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *psz_img_name = _dyld_get_image_name(i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *p = strstr( psz_img_name, "VLCKit.framework/Versions/" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *p = strcasestr( psz_img_name, "VLCKit.framework/Versions/" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Check for "VLCKit.framework/Versions/Current/VLCKit",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * as well as "VLCKit.framework/Versions/A/VLCKit" and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,18 +60,18 @@ char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p += strcspn( p, "/" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If the string ends with VLCKit then we've found a winner */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!strcmp( p, "/VLCKit"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!strcasecmp( p, "/VLCKit"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return strdup( dirname(psz_img_name) );
</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;'>-- /* Do we end by "VLC"? If so we are the legacy VLC.app that doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Do we end by "MacOS/VLC"? If so we are the legacy VLC.app that doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * link to VLCKit. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t len = strlen(psz_img_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (len >= 3 && !strcmp( psz_img_name + len - 3, "VLC"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (len >= 9 && !strcasecmp( psz_img_name + len - 9, "MacOS/VLC"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return strdup( dirname(psz_img_name) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Do we end by "VLC-Plugin"? oh, we must be the NPAPI plugin */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (len >= 10 && !strcmp( psz_img_name + len - 10, "VLC-Plugin"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (len >= 10 && !strcasecmp( psz_img_name + len - 10, "VLC-Plugin"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return strdup( dirname(psz_img_name) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Do we end by "VLC for iOS"? so we are the iOS app */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,6 +91,7 @@ char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *path = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asprintf(&path, "%s/"PACKAGE, incompletepath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(incompletepath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *libDirIsPosix = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return path;
</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;'>-@@ -92,15 +99,37 @@ char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abort ();
</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;'>-+char *config_GetLibDir (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool isPosixStub;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return getLibDir (&isPosixStub);
</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;'>- char *config_GetDataDir (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *path = getenv ("VLC_DATA_PATH");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return strdup (path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *vlcpath = config_GetLibDir ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *datadir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool libDirIsPosix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *vlcpath = getLibDir (&libDirIsPosix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *datadir = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (libDirIsPosix) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // vlcpath should point to something like /opt/local/lib/vlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // if so, we can chop off the /lib/vlc bit, and then add /share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // like we would otherwise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *p = strcasestr(vlcpath, "/lib/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (p != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *p = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // something else ... return PKGDATADIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(vlcpath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ datadir = strdup(PKGDATADIR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return datadir;
</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;'>- if (asprintf (&datadir, "%s/share", vlcpath) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- datadir = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,19 +170,27 @@ static char *getAppDependentDir(vlc_userdir_t type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *fallback = "org.videolan.vlc";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *name = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFBundleRef mainBundle = CFBundleGetMainBundle();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (mainBundle) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (identifierAsNS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFIndex len = CFStringGetLength(identifierAsNS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFIndex size = CFStringGetMaximumSizeForEncoding(len, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *identifier = calloc(len + 1, sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (identifier != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Boolean ret = CFStringGetCString(identifierAsNS, identifier, size, 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;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- free(identifier);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool libDirIsPosix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *vlcpath = getLibDir(&libDirIsPosix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (vlcpath) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(vlcpath);
</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;'>-+ if (!libDirIsPosix) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFBundleRef mainBundle = CFBundleGetMainBundle();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (mainBundle) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (identifierAsNS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFIndex len = CFStringGetLength(identifierAsNS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFIndex size = CFStringGetMaximumSizeForEncoding(len, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *identifier = calloc(len + 1, sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (identifier != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Boolean ret = CFStringGetCString(identifierAsNS, identifier, size, 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;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(identifier);
</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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git bin/Makefile.am bin/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6033e50..ea7b544 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,7 +132,7 @@ MOSTLYCLEANFILES = $(noinst_DATA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if BUILD_VLC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-data-local:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd $(bindir); mv vlc-osx vlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd $(DESTDIR)/$(bindir); mv vlc-osx vlc
</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;'>- endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/vlc-plugin.pc b/multimedia/VLC/files/vlc-plugin.pc
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c3fc5a49bc1
</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/vlc-plugin.pc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+prefix=@PREFIX@/libexec/vlc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec_prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+includedir=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+datarootdir=${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libdir=${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+datadir=${datarootdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pkgincludedir=${prefix}/include/vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pkgdatadir=${datadir}/vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pkglibdir=${libdir}/vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pluginsdir=${pkglibdir}/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Name: VLC plugin API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: VLC media player plugin interface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Version: ${VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Cflags: -I${includedir} -I${pkgincludedir}/plugins \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D__PLUGIN__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_FILE_OFFSET_BITS=64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_REENTRANT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_THREAD_SAFE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Libs: -L${libdir} -lvlccore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Libs.private: -Wl,-framework,CoreFoundation,-framework,CoreServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L@PREFIX@/lib -lintl -R@PREFIX@/lib -Wl,-framework -Wl,CoreFoundation -L@PREFIX@/lib -liconv -R@PREFIX@/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lm
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/Portfile b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9038433c243..073897e81a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/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;'>@@ -24,26 +24,38 @@ subport lib${name} {
</span> framework on which VLC media player is based. It allows developers \
to create a wide range of multimedia applications using the VLC features.
conflicts ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # support libVLC2 up to 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by libVLC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> homepage https://www.videolan.org/vlc/libvlc.html
}
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by VLC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # given the Portfile design it's easier to shunt the entire patch phase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # rather than trying to keep the patchfiles list empty.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> conflicts lib${name}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# let's see what OS versions this port really builds on. IOW, leave the commented-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# out code as placeholders and edit or delete based on feedback from the wild.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Background: because of overall building wonkyness, port:VLC (3.x) now installs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the app bundle from the official distribution DMG, and runs on 10.7 and upwards.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# However, VLC2 still has some benefits, such as giving control over the proxy to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# be used for streaming (VLC 3 only supports using the system proxy, which is known
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to break access to certain streaming sites; google it.) The 2 versions can co-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# exist.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${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;'>+} else {
</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 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;'>+# patch {}
</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> # VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
universal_variant no
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,8 +171,7 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> compiler.blacklist-append \
gcc-4.2 llvm-gcc-4.2 {clang < 300}
<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:#e0ffe0;'>+ patchfiles patch-buildsystem.diff \
</span> PR-34741-no__clang_version__.patch \
patch-static_assert.diff \
no-sparkle.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +190,8 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
# libx264 api changed slightly
patchfiles-append \
<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;'>+ patch-modules-codec-x264-new-api.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-on-post-1012.diff
</span>
if {![info exists replaced_by]} {
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -390,20 +402,21 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> if {${os.major} <= 15} {
default_variants-append +qtkit
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-prepend "XCODEFLAGS=-UseModernBuildSystem=NO"
</span>
patchfiles-append patch-use-NSGetEnviron.diff
if {![info exists replaced_by]} {
post-patch {
<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:#e0ffe0;'>+## now in patch-buildsystem.diff :
</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;'>+# reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${worksrcpath}/Makefile.am
</span>
if {![file exists ${worksrcpath}/contrib/BGHUDAppKit.framework]} {
ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -425,29 +438,29 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
if {[variant_isset quartz]} {
if {${subport} ne "lib${name}"} {
<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;'>+ copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC2.app
</span>
# These are already in ${vlcprefix}, so we don't need to bundle them as well
<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;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/lib
</span>
# There's no need to install these into the bundle and the prefix
<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;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/share/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/share/lua
</span>
# http://trac.macports.org/ticket/35131
<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:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/lib
</span> foreach l [glob -nocomplain ${destroot}${vlcprefix}/lib/*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${vlcprefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/lib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${vlcprefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${vlcprefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/share/lua
</span> foreach d [glob -nocomplain ${destroot}${vlcprefix}/share/locale/*] {
set locale [file tail ${d}]
<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:#e0ffe0;'>+ set ldir ${destroot}${applications_dir}/VLC2.app/Contents/MacOS/share/locale/${locale}/LC_MESSAGES
</span> xinstall -m 755 -d ${ldir}
foreach m [glob -nocomplain ${d}/LC_MESSAGES/*] {
ln -s ${vlcprefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -457,7 +470,7 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> # the vlc executable needs to be started with a full path to the app bundle executable
# or else the Mac OS X interface will hang beyond even a ^C or ^\ :
file delete ${destroot}${prefix}/bin/vlc
<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:#e0ffe0;'>+ system "echo \"#!/bin/sh\nexec \\\"${applications_dir}/VLC2.app/Contents/MacOS/VLC\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/vlc"
</span> system "chmod 755 ${destroot}${prefix}/bin/vlc"
# give all executables a suffix (--program-suffix would do that too but isn't supported in the
# Mac-specific autoconf install code).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,9 +483,9 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> delete ${destroot}${vlcprefix}/share/man
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|prefix=${prefix}|prefix=${vlcprefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${vlcprefix}/lib/pkgconfig/libvlc.pc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${vlcprefix}/lib/pkgconfig/vlc-plugin.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# reinplace "s|prefix=${prefix}$|prefix=${vlcprefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${destroot}${vlcprefix}/lib/pkgconfig/libvlc.pc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${destroot}${vlcprefix}/lib/pkgconfig/vlc-plugin.pc
</span> }
post-activate {
system "${prefix}/lib/vlc/vlc-cache-gen -f ${prefix}/lib/vlc"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/buildfix-package.mak.patch b/multimedia/VLC2/files/buildfix-package.mak.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 18f118cb93d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/files/buildfix-package.mak.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git extras/package/macosx/package.mak extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 40e4fe5..0f381dd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,10 +26,10 @@ VLC.app: VLC-tmp
</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;'>- VLC-tmp: vlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -Rf "$(top_builddir)/tmp" "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_GEN)for i in src lib share; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) DESTDIR=$(abs_top_builddir)/tmp/destdir); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -Rf "$(top_builddir)/tmp" "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(abs_top_builddir)/tmp/extras/package/macosx/vlc.xcodeproj/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@ VLC-tmp: vlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $@/Contents/Frameworks && cp -R $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $@/Contents/MacOS/share/locale/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -r "$(top_builddir)/tmp/destdir$(prefix)/lib/vlc/lua" "$(top_builddir)/tmp/destdir$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) | $(AMTAR) -x -C $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/patch-build-on-post-1012.diff b/multimedia/VLC2/files/patch-build-on-post-1012.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..06c31e94696
</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-build-on-post-1012.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/gui/macosx/Windows.m modules/gui/macosx/Windows.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8b6e059edb891deb6c3cfdf476424a7b1d9481de..32d56478ac4283f3c4f2ac4b3f6cca72631c5584 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/gui/macosx/Windows.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/gui/macosx/Windows.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,6 +431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bottom edge is on the screen or can be on the screen when the user moves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the window */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ difference = NSMaxY (screenRect) - NSMaxY (frameRect);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(MAC_OS_X_VERSION_10_13) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_styleMask & NSResizableWindowMask) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGFloat difference2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -450,6 +451,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frameRect.origin.y -= difference2;
</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;'>+ return frameRect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/patch-configure.ac.diff b/multimedia/VLC2/files/patch-buildsystem.diff
</span>similarity index 100%
rename from multimedia/VLC2/files/patch-configure.ac.diff
rename to multimedia/VLC2/files/patch-buildsystem.diff
</pre><pre style='margin:0'>
</pre>