<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/8d50572a4d5ccbe633ce71c0a00a82580eef82f6">https://github.com/macports/macports-ports/commit/8d50572a4d5ccbe633ce71c0a00a82580eef82f6</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 8d50572a4d5 VLC : upgrade to 3.0.11 (#7466)
</span>8d50572a4d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8d50572a4d5ccbe633ce71c0a00a82580eef82f6
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Mon Aug 17 20:11:29 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> VLC : upgrade to 3.0.11 (#7466)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also makes (lib)VLC and (lib)VLC2 co-installable on systems where
</span><span style='display:block; white-space:pre;color:#404040;'> VLC2 is supported, maintaining access to QTKit support where this
</span><span style='display:block; white-space:pre;color:#404040;'> is still possible (support was dropped from VLC 3.0.11).
</span><span style='display:block; white-space:pre;color:#404040;'> This requires adaptation of port:phonon-backend-vlc, which also got
</span><span style='display:block; white-space:pre;color:#404040;'> an upgrade to the latest version instead of a simple revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60667
</span>---
audio/phonon-backend-vlc/Portfile | 60 ++++++---
.../files/patch-link-cocoa-fw.diff | 14 ++
multimedia/VLC/Portfile | 70 +++++-----
multimedia/VLC/files/patch-build-on-post-1014.diff | 50 --------
multimedia/VLC/files/patch-build-on-pre-1012.diff | 142 +++++++++++++++------
multimedia/VLC2/Portfile | 48 ++++---
6 files changed, 233 insertions(+), 151 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 94a59b08819..b662a835d54 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;'>@@ -2,14 +2,28 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url git://anongit.kde.org/phonon-vlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# v0.9.0-7-g0d32bc8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch 0d32bc8358436429fff9251377d86bb03c2aaf1f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[info procs "cmake.save_configure_cmd"] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.save_configure_cmd "log too"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span> name phonon-backend-vlc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.0.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}-qt5"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # v0.11.1-7-g86b0635
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup KDE phonon-vlc 86b0635f9f6fec4aa0d63a3e3aa11bb2fcbe151e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.11.1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # last Qt4-compatible version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # v0.10.2-23-g844dec1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup KDE phonon-vlc 844dec1f2e15eefd0baa945e9e0dc03363cc7194
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.10.2.23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license {LGPL-2.1 LGPL-3}
maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
description VLC backend for Phonon
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,20 +32,39 @@ homepage http://projects.kde.org/projects/kdesupport/phonon/phonon-vl
</span> distname phonon-backend-vlc-git
if {${os.platform} eq "darwin"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libvlc.dylib:libVLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant vlc2 description {build against libVLC2} {}
</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;'>+if {[variant_exists vlc2] && [variant_isset vlc2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:libexec/vlc2/lib/pkgconfig/libvlc.pc:libVLC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append "${prefix}/libexec/vlc2/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:libexec/vlc3/lib/pkgconfig/libvlc.pc:libVLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append "${prefix}/libexec/vlc3/lib/pkgconfig"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -Np1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport ${name}-qt5 {
set qt5.prefer_kde 1
PortGroup qt5 1.0
categories audio kde kf5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description A VLC backend for the Phonon4Qt5 multimedia library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append path:share/ECM/cmake/ECMConfig.cmake:kde-extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:phonon-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ A VLC backend for the Phonon4Qt5 multimedia library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/ECM/cmake/ECMConfig.cmake:kde-extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:phonon-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-link-cocoa-fw.diff
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPHONON_BUILD_PHONON4QT5:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAPPLE_SUPPRESS_X11_WARNING:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAPPLE_SUPPRESS_X11_WARNING:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPhonon4Qt5_DIR=${qt_cmake_module_dir}/phonon
</span> }
if {${subport} ne "${name}-qt5"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +82,4 @@ if {${subport} ne "${name}-qt5"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args -k
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/phonon-backend-vlc/files/patch-link-cocoa-fw.diff b/audio/phonon-backend-vlc/files/patch-link-cocoa-fw.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c252b02a580
</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-backend-vlc/files/patch-link-cocoa-fw.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f0b292d..089fb3b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,6 +78,9 @@ target_link_libraries(phonon_vlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(PHONON_EXPERIMENTAL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(phonon_vlc Phonon::phonon4qt5experimental)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(phonon_vlc "-framework Cocoa")
</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;'>+ install(TARGETS phonon_vlc DESTINATION ${PHONON_BACKEND_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa122ad0589..009f754a07f 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;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
name VLC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +24,7 @@ subport lib${name} {
</span> libVLC is the core engine and the interface to the multimedia \
framework on which VLC media player is based. It allows developers \
to create a wide range of multimedia applications using the VLC features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name} VLC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span> homepage https://www.videolan.org/vlc/libvlc.html
# libVLC builds on 10.9 (Darwin 13)
if {${os.platform} eq "darwin" && ${os.major} < 13} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,22 +35,22 @@ subport lib${name} {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> replaced_by VLC2
PortGroup obsolete 1.0
# given the Portfile design it's easier to shunt the entire patch phase
# rather than trying to keep the patchfiles list empty.
patch {}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name} libVLC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name}
</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:#ffe0e0;'>-version 3.0.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +60,9 @@ dist_subdir VLC
</span> distname vlc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ccb9cf848ba3aa3d57e1dc6a4ccec9f59002883c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 26041520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a9c6a8796d0d86a71b738d4d41c377cd03d0e4ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 26041744
</span>
depends_build port:pkgconfig \
port:realpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,8 +136,15 @@ depends_lib-append path:lib/libavcodec.diff:ffmpeg \
</span> depends_run-append port:libaacs \
port:libbdplus
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# make libVLC2 and libVLC(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;'>+configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${vlcprefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --bindir=${prefix}/bin
</span> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # uses ibtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # VLC calls ibtools which isn't part of the commandline tools
</span> use_xcode yes
if {${os.major} < 13} {
pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,8 +172,6 @@ platform darwin {
</span> patchfiles-append \
patch-build-on-pre-1012.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-on-post-1014.diff
</span> }
depends_lib-append port:lua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,12 +194,12 @@ if {![info exists replaced_by]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args-append "|& tee -a ${workpath}/.macports.${subport}.configure.log'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args-append "|& tee -a ${workpath}/.macports.${subport}@${version}.configure.log'"
</span> pre-configure {
set cmd [join "${configure.cmd} ${configure.pre_args} ${configure.args}"]
configure.pre_args-prepend "-cf '${configure.cmd} "
configure.cmd "/bin/csh"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "configure command set to `${configure.cmd} ${configure.pre_args} ${configure.args} ${configure.post_args}`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "configure command set to `cmd=${configure.cmd} pre_args=${configure.pre_args} args=${configure.args} post_args=${configure.post_args}`"
</span> system "echo '## ${cmd}' > ${workpath}/.macports.${subport}.configure.log"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,7 +228,7 @@ if {${subport} ne "lib${name}"} {
</span> # The VLC.app target does not obey DESTDIR and tries to copy a
# non-existing folder.
destroot.destdir \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=${destroot}${vlcprefix}
</span> destroot.target VLC.app
# Don't try to install the (missing) shared/hrtfs folder.
# That folder is only used by the spatialaudio plugin which
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,7 +253,7 @@ configure.args-append \
</span> # Input Plugins
configure.args-append \
--enable-dvdnav --enable-dvdread --disable-smbclient \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-macosx-qtkit --disable-realrtsp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-realrtsp \
</span> --disable-freerdp --disable-opencv --enable-sftp
# Mux/Demux Plugins
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,6 +289,7 @@ configure.args-append \
</span> # Interface Plugins
configure.args-append \
--disable-macosx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-vlc \
</span> --disable-qt \
--enable-ncurses \
--disable-skins2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -310,13 +315,6 @@ variant dbus description {Enable DBus support} {
</span> configure.args-replace --disable-dbus --enable-dbus
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QTKit was disabled in 10.12 "Sierra"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qtkit description {Enable qtcapture and qtaudio} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-macosx-qtkit --enable-macosx-qtkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant svg description {Enable SVG rendering and decoding support} {
depends_lib-append port:librsvg
configure.args-replace --disable-svg --enable-svg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,7 +327,7 @@ variant shout description {Enable Shoutcast/Icecast streaming output support} {
</span> }
variant smb description {Enable Samba 3 input support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:${prefix}/bin/smbclient:samba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:samba3
</span> configure.args-replace --disable-smbclient --enable-smbclient
configure.ldflags-append -L${prefix}/lib/samba3
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,6 +369,7 @@ variant quartz {
</span> --disable-realrtsp
if {${subport} ne "lib${name}"} {
configure.args-replace --disable-macosx --enable-macosx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-vlc --enable-vlc
</span> }
# taken from VLC's own configure.sh script for OS X:
configure.args-append --disable-samplerate \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,7 +440,7 @@ platform darwin {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete {*}[glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete {*}[glob ${destroot}${vlcprefix}/lib/vlc/plugins/*/*.la]
</span>
if {[variant_isset quartz]} {
if {${subport} ne "lib${name}"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -460,17 +459,17 @@ platform darwin {
</span>
# http://trac.macports.org/ticket/35131
xinstall -m 755 -d ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach l [glob -nocomplain ${destroot}${prefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob -nocomplain ${destroot}${vlcprefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>- ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob -nocomplain ${destroot}${prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ foreach d [glob -nocomplain ${destroot}${vlcprefix}/share/locale/*] {
</span> set locale [file tail ${d}]
set ldir ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale/${locale}/LC_MESSAGES
xinstall -m 755 -d ${ldir}
foreach m [glob -nocomplain ${d}/LC_MESSAGES/*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -481,13 +480,16 @@ platform darwin {
</span> system "chmod 755 ${destroot}${prefix}/bin/vlc"
} else {
delete ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${vlcprefix}/share/applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${vlcprefix}/share/man
</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 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/lib/vlc/vlc-cache-gen ${prefix}/lib/vlc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${vlcprefix}/lib/vlc/vlc-cache-gen ${vlcprefix}/lib/vlc"
</span> }
}
notes-append "MIDI support requires installing one or more SoundFont files,\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-build-on-post-1014.diff b/multimedia/VLC/files/patch-build-on-post-1014.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc24f99a54b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-build-on-post-1014.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/macosx/VLCPlaylistInfo.h modules/gui/macosx/VLCPlaylistInfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e7e1ffd4a5a6e9f9917c7afb526d4c795ede6935..048b08b4a0a0cff72116991c2d0b83b3ab85da84 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCPlaylistInfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCPlaylistInfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,8 +106,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface VLCInfoTreeItem : NSObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@property (readwrite) NSString *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@property (readwrite) NSString *value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@property (readwrite) NSString *propertyName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@property (readwrite) NSString *propertyValue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (readwrite) NSArray *children;
</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/VLCPlaylistInfo.m modules/gui/macosx/VLCPlaylistInfo.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6d5c8c2906b9d0eb45cdad64a705bcdae0091fe0..eb4e481a666c70c48087ae707405a87529ec9b2b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/macosx/VLCPlaylistInfo.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/macosx/VLCPlaylistInfo.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,15 +303,15 @@ FREENULL( psz_##foo );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info_category_t *cat = p_item->pp_categories[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLCInfoTreeItem *subItem = [[VLCInfoTreeItem alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- subItem.name = toNSStr(cat->psz_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ subItem.propertyName = toNSStr(cat->psz_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Build list of codec details
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSMutableArray *infos = [NSMutableArray array];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int j = 0; j < cat->i_infos; j++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLCInfoTreeItem *infoItem = [[VLCInfoTreeItem alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- infoItem.name = toNSStr(cat->pp_infos[j]->psz_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- infoItem.value = toNSStr(cat->pp_infos[j]->psz_value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ infoItem.propertyName = toNSStr(cat->pp_infos[j]->psz_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ infoItem.propertyValue = toNSStr(cat->pp_infos[j]->psz_value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [infos addObject:infoItem];
</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;'>-@@ -397,9 +397,9 @@ FREENULL( psz_##foo );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return @"";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([[tableColumn identifier] isEqualToString:@"0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return [item name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [item propertyName];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return [item value];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [item propertyValue];
</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;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><span style='display:block; white-space:pre;color:#808080;'>index 9a0543041ab..be33d2ca63d 100644
</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;'>+++ b/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/access/qtsound.m modules/access/qtsound.m
</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/access/orig.qtsound.m 2018-10-28 12:11:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/access/qtsound.m 2019-02-18 00:41:40.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <QTKit/QTKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <AVFoundation/AVFoundation.h>
</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;'>- #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;'>-@@ -52,6 +53,7 @@
</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;'>-+#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;'>-@@ -318,6 +320,7 @@
</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;'>-+#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;'>- 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;'>-@@ -334,6 +337,7 @@
</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;'>- audioInput = [[QTCaptureDeviceInput alloc] initWithDevice: p_sys->audiodevice];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!audioInput) {
</span> diff --git modules/access/avcapture.m modules/access/avcapture.m
index 38777226cfe56211aa0bd1efc9623ac7ca4cf650..d31f2168885b9b2d68d7dc562ea7a4849edbfb6e 100644
--- modules/access/avcapture.m
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +37,112 @@ index 38777226cfe56211aa0bd1efc9623ac7ca4cf650..d31f2168885b9b2d68d7dc562ea7a484
</span>
input = [AVCaptureDeviceInput deviceInputWithDevice:(__bridge AVCaptureDevice *)p_sys->device error:&o_returnedError];
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/access/avaudiocapture.m b/modules/access/avaudiocapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e20d8aadf382ee493f2cdfe0cf91a7d9bf951b51..4d6587314c390055836bfe5e9f375aaa08fd3874 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/access/avaudiocapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/access/avaudiocapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,14 +45,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <CoreMedia/CoreMedia.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-+ (void)requestAccessForMediaType:(AVMediaType)mediaType completionHandler:(void (^)(BOOL granted))handler API_AVAILABLE(macos(10.14), ios(7.0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*****************************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,6 +213,11 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// only compile this block if the requestAccessForMediaType method is supported;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// the code inside `if (@available(foo)) {}` is only *executed* when foo is true but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// it is always parsed at compile time; @available is not an #ifdef that protects against
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// undefined types or functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Dbg(p_demux, "Check user consent for access to the audio device");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,6 +237,7 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSError *error = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device error:&error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/audio_output/coreaudio_common.c b/modules/audio_output/coreaudio_common.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 69fd47137050a1d21ac7eadfbfaafe6f557b8ee9..4a58744104a945d1d11014f9b9948f3dd28dde34 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/audio_output/coreaudio_common.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/audio_output/coreaudio_common.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "coreaudio_common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <CoreAudio/CoreAudioTypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void (*lock)(os_unfair_lock *lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void (*unlock)(os_unfair_lock *lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} unfair_lock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ca_init_once(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unfair_lock.lock = dlsym(RTLD_DEFAULT, "os_unfair_lock_lock");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!unfair_lock.lock)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unfair_lock.unlock = dlsym(RTLD_DEFAULT, "os_unfair_lock_unlock");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!unfair_lock.unlock)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unfair_lock.lock = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define os_unfair_lock_lock unfair_lock.lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define os_unfair_lock_unlock unfair_lock.unlock
</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;'>+ static inline uint64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BytesToFrames(struct aout_sys_common *p_sys, size_t i_bytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,6 +136,10 @@ ca_Open(audio_output_t *p_aout)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mach_timebase_info(&p_sys->tinfo) != KERN_SUCCESS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static pthread_once_t once = PTHREAD_ONCE_INIT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pthread_once(&once, ca_init_once);
</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;'>+ assert(p_sys->tinfo.denom != 0 && p_sys->tinfo.numer != 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bff225525d9eb68dace1d5839857fd61e3fd83cf..ce11bdfbc182632592c5e0ba19058187d22b8d20 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/video_output/caopengllayer.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/video_output/caopengllayer.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vlc_atomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <QuartzCore/QuartzCore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// no idea really what version check is needed here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <QuartzCore/CALayer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@protocol CALayerDelegate <NSObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (id < CAAction >)actionForLayer:(CALayer *)layer forKey:(NSString *)key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)displayLayer:(CALayer *)layer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)layoutSublayersOfLayer:(CALayer *)layer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@end
</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;'>+ #import <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <dlfcn.h>
</span> diff --git modules/video_output/macosx.m modules/video_output/macosx.m
index 20aedfc63e440cbb16ec3d0078d7d433434b8131..26ca20e4b449a52b7650a3ef7f2c1337f824bc1e 100644
--- modules/video_output/macosx.m
<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 7e2ad22d7a4..dababf7d6d8 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;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
name VLC2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +23,7 @@ subport lib${name} {
</span> long_description libVLC is the core engine and the interface to the multimedia \
framework on which VLC media player is based. It allows developers \
to create a wide range of multimedia applications using the VLC features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name} VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span> # support libVLC2 up to 10.12
if {${os.major} > 15} {
replaced_by libVLC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +41,7 @@ if {${subport} eq ${name}} {
</span> # rather than trying to keep the patchfiles list empty.
patch {}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name} libVLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name}
</span> }
# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +53,7 @@ supported_archs x86_64
</span> ##
if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
version 2.2.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 7
</span> license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,6 +140,13 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> depends_run-append port:libaacs \
port:libbdplus
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make libVLC2 and libVLC(3) co-installable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vlcprefix ${prefix}/libexec/vlc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${vlcprefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --bindir=${prefix}/bin
</span> pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 10} {
ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,7 +200,9 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> depends_build-append port:libtool port:autoconf port:automake
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MATROSKA_CFLAGS=${prefix}/include/ebml" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MATROSKA_LIBS=-lmatroska -lebml"
</span>
build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,13 +421,13 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete {*}[glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete {*}[glob ${destroot}${vlcprefix}/lib/vlc/plugins/*/*.la]
</span>
if {[variant_isset quartz]} {
if {${subport} ne "lib${name}"} {
copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
<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:#e0ffe0;'>+ # These are already in ${vlcprefix}, so we don't need to bundle them as well
</span> delete ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
delete ${destroot}${applications_dir}/VLC.app/Contents/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -432,31 +440,39 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
# http://trac.macports.org/ticket/35131
xinstall -m 755 -d ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach l [glob -nocomplain ${destroot}${prefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob -nocomplain ${destroot}${vlcprefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>- ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob -nocomplain ${destroot}${prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ foreach d [glob -nocomplain ${destroot}${vlcprefix}/share/locale/*] {
</span> set locale [file tail ${d}]
set ldir ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale/${locale}/LC_MESSAGES
xinstall -m 755 -d ${ldir}
foreach m [glob -nocomplain ${d}/LC_MESSAGES/*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${vlcprefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</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 ^\ :
<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:#e0ffe0;'>+ file delete ${destroot}${prefix}/bin/vlc
</span> system "echo \"#!/bin/sh\nexec \\\"${applications_dir}/VLC.app/Contents/MacOS/VLC\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/vlc"
system "chmod 755 ${destroot}${prefix}/bin/vlc"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # give all executables a suffix (--program-suffix would do that too but isn't supported in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mac-specific autoconf install code).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach a [glob -nocomplain ${destroot}${prefix}/bin/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${a} "${a}2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
delete ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${vlcprefix}/share/applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${vlcprefix}/share/man
</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"
</pre><pre style='margin:0'>
</pre>