<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c0fff8944a6d33e366abc4321e385189a3d9d1d9">https://github.com/macports/macports-ports/commit/c0fff8944a6d33e366abc4321e385189a3d9d1d9</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 c0fff89 VLC: upgrade to 2.2.6 and FFmpeg 3
</span>c0fff89 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c0fff8944a6d33e366abc4321e385189a3d9d1d9
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Aug 19 10:36:34 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> VLC: upgrade to 2.2.6 and FFmpeg 3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/54480
</span>---
multimedia/VLC/Portfile | 295 ++++++-----------------
multimedia/VLC/files/patch-ffmpeg3-compat.diff | 231 ++++++++++++++++++
multimedia/VLC/files/patch-use-NSGetEnviron.diff | 40 +++
3 files changed, 351 insertions(+), 215 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8086f8d..222feb2 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;'>@@ -5,6 +5,14 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[file exists ${prefix}/etc/macports/locales.tcl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # experimental feature to cut down the NLS/locale files, which take up over 50% of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the install footprint for VLC. This feature loads the locale_select PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if its configuration file exist; a variant is then added which prunes all translations from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${destroot}${prefix}/share/locale except those whitelisted in etc/macports/locales.tcl .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup locale_select 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name VLC
categories multimedia devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,15 +33,19 @@ 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-devel libVLC-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name} VLC-devel
</span> homepage http://www.videolan.org/vlc/libvlc.html
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ffmpeg-VLC {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set FFMPEG_VLC_PREFIX ${prefix}/lib/vlc/ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set use_ffmpeg_VLC no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ffmpeg-VLC {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set FFMPEG_VLC_PREFIX ${prefix}/lib/vlc/ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name} libVLC-devel VLC-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name} VLC-devel
</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;'>@@ -44,8 +56,7 @@ supported_archs x86_64
</span> ################### ports VLC and libVLC ###################
##
if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.2.6
</span> license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +65,8 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> distname vlc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2fe178bb9a4b2ad5ca0294d3e52ceb992b22e8ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b2727834bcbbf0d274e3a0b4a3317f3b914f9ad4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8
</span>
if {[info exist ::env(MACPORTS_COMPRESS_WORKDIR)] && $::env(MACPORTS_COMPRESS_WORKDIR)} {
# Enable HFS compression.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,8 +78,11 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:ffmpeg-VLC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:a52dec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ffmpeg-VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:a52dec \
</span> port:avahi \
port:bzip2 \
port:faad2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,44 +203,51 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> static_assert.patch \
no-sparkle.patch \
patch-vlc-no-O4.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpegVLC.diff \
</span> patch-soundfont-path.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ffmpegVLC.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
reinplace "s:-lstdc\+\+:-lc++:" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure.ac \
</span> ${worksrcpath}/modules/access/Makefile.am
}
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/modules/codec/fluidsynth.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch source using ffmpeg to use the correct header file locations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach module {access codec/avcodec demux/avformat hw/vdpau packetizer video_chroma} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cf [glob -nocomplain ${worksrcpath}/modules/${module}/*.c] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${cf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cf [glob -nocomplain ${worksrcpath}/modules/${module}/*.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${cf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch source using ffmpeg to use the correct header file locations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir {libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach module {access codec/avcodec demux/avformat hw/vdpau packetizer video_chroma} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cf [glob -nocomplain ${worksrcpath}/modules/${module}/*.c] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${dir}/|${dir}-VLC/|g" ${cf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cf [glob -nocomplain ${worksrcpath}/modules/${module}/*.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${dir}/|${dir}-VLC/|g" ${cf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${dir}/|${dir}-VLC/|g" ${worksrcpath}/configure.ac ${worksrcpath}/configure
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${worksrcpath}/configure.ac ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|postproc/|postproc-VLC/|g" ${worksrcpath}/configure.ac ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|libpostproc/|libpostproc-VLC/|g" ${worksrcpath}/modules/video_filter/postproc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBAVUTIL_AV|HAVE_LIBAVUTIL_VLC_AV|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|postproc/|postproc-VLC/|g" ${worksrcpath}/configure.ac ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|libpostproc/|libpostproc-VLC/|g" ${worksrcpath}/modules/video_filter/postproc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|HAVE_LIBAVUTIL_AV|HAVE_LIBAVUTIL_VLC_AV|g" \
</span> ${worksrcpath}/modules/codec/avcodec/avcommon.h \
${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBAVFORMAT_AV|HAVE_LIBAVFORMAT_VLC_AV|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|HAVE_LIBAVFORMAT_AV|HAVE_LIBAVFORMAT_VLC_AV|g" \
</span> ${worksrcpath}/modules/codec/avcodec/avcommon.h \
${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBAVCODEC_AV|HAVE_LIBAVCODEC_VLC_AV|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|HAVE_LIBAVCODEC_AV|HAVE_LIBAVCODEC_VLC_AV|g" \
</span> ${worksrcpath}/modules/codec/avcodec/avcommon.h \
${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBSWSCALE_SW|HAVE_LIBSWSCALE_VLC_SW|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|HAVE_LIBSWSCALE_SW|HAVE_LIBSWSCALE_VLC_SW|g" \
</span> ${worksrcpath}/modules/codec/avcodec/avcommon.h \
${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-configure {
system -W ${worksrcpath} "patch -Np0 -i ${filespath}/patch-static_assert.diff"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,9 +261,11 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
configure.env-append \
CXXCPP="${configure.cxx} -E"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # splice in ffmpeg-VLC's pkgconfig path, hoping that PKG_CONFIG_PATH hasn't been set by anyone else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # splice in ffmpeg-VLC's pkgconfig path, hoping that PKG_CONFIG_PATH hasn't been set by anyone else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span> PKG_CONFIG_PATH=${FFMPEG_VLC_PREFIX}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
# gl.c:121:3: error: Platform not recognized.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -439,8 +462,8 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> description {Enable all variants (except freerdp, currently)} {}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # this patchfile can probably go with VLC 2.2.2, or should be reviewed then.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # update 2.2.2 : lua 5.3 gives compiler syntax errors so we stick with 5.2 for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # this patchfile can probably go with VLC 2.2.2, or should be reviewed then.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # update 2.2.2 : lua 5.3 gives compiler syntax errors so we stick with 5.2 for now.
</span> patchfiles-append patch-for-lua52.diff
# make 10.12 and later ignore all QTKit code in modules/gui/macosx/open.m
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,14 +475,9 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> default_variants-append +qtkit
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-macosx-eyetv --enable-macosx-eyetv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-macosx-vlc-app --enable-macosx-vlc-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use-NSGetEnviron.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/Appkit/AppKit/" ${worksrcpath}/configure.ac
</span> reinplace "/Sparkle.framework/d" \
${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
reinplace "/SDKROOT/d" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,14 +488,6 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
${worksrcpath}/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/argv/s/environ/*_NSGetEnviron()/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/misc/inhibit/xdg.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/stream_filter/decomp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/extern char \\*\\*environ;/#include <crt_externs.h>/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/misc/inhibit/xdg.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/stream_filter/decomp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>@@ -486,8 +496,14 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> file mkdir "${worksrcpath}/contrib/lib"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-macosx-eyetv --enable-macosx-eyetv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-macosx-vlc-app --enable-macosx-vlc-app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete {*}[glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
</span>
if {[variant_isset qt4] || [variant_isset qt5] || [variant_isset quartz]} {
if {${subport} ne "lib${name}"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,10 +521,20 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> delete ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
# http://trac.macports.org/ticket/35131
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib ${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}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob -nocomplain ${destroot}${prefix}/lib/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/[file tail ${l}] ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
ln -s ${prefix}/lib/vlc/lua ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/lua
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/locale ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob -nocomplain ${destroot}${prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set locale [file tail ${d}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ldir ${destroot}${applications_dir}/VLC.app/Contents/MacOS/share/locale/${locale}/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${ldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach m [glob -nocomplain ${d}/LC_MESSAGES/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/locale/${locale}/LC_MESSAGES/[file tail ${m}] ${ldir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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:#e0e0e0;'>@@ -529,179 +555,18 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> system "${prefix}/lib/vlc/vlc-cache-gen -f ${prefix}/lib/vlc"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# outcomment when the port:fluid-soundfont* ports have been made available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# notes-append "MIDI support requires installing one or more SoundFont files,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in ${prefix}/share/sounds/sf2, for instance from one of the port:fluid-soundfont-* ports"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "MIDI support requires installing one or more SoundFont files,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in ${prefix}/share/sounds/sf2, for instance from port:generaluser-soundfont."
</span> }
##
################# support port ffmpeg-VLC ##################
##
if {${subport} eq "ffmpeg-VLC"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.8.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories multimedia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers gmail.com:rjvbertin openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Custom FFMpeg 2.8.6 build for port:VLC and port:libVLC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description Custom FFMpeg build for VLC and libVLC v2.2.x . It installs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a private copy of FFMpeg v2.8.6 .
</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;'>- homepage http://www.ffmpeg.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://www.ffmpeg.org/releases/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ffmpeg-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5b61b6b0521d39ca31dcfb7fff1dfa26d9e7667a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62
</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:gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libvpx is static only so can be considered a build dependency (#47934)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libvpx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:lame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append V=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;'>- # enable auto configure of asm optimizations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires Xcode 3.1 or better on Leopard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {9 3.1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch [get_canonical_archs] i386] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang-3.1 hits https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang-139 hits https://trac.macports.org/ticket/38141
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 422.1.7}
</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;'>- configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --prefix=${FFMPEG_VLC_PREFIX} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --progs-suffix=-VLC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --build-suffix=-VLC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-encoder=vorbis \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libopenjpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-avdevice \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devices \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-avfilter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-filters \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-protocol=concat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-bsfs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-bzlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-avresample \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libmp3lame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libvpx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libbluray \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-sdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libxcb --disable-libxcb-shm --disable-libxcb-xfixes --disable-libxcb-shape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared --disable-static --enable-pthreads \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-rpath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-stripping \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --cc=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is the old gpl2 variant. VLC is GPL2'ed, so we can just as well build ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # with these components.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gpl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-postproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --arch=${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ASFLAGS='[get_canonical_archflags]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-yasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {source "${portpath}/Portfile.ffmpeg.tcl"} err]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Error reading Portfile.ffmpeg.tcl: $err"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</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;'>- if {${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-asm
</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;'>- # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+ up to (excluding) 10.11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if {(${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)) && (${os.major} < 15)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Due to a bug in ffmpeg(?), we have to enable VDA on 10.11 as well, even though it shouldn't be supported.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # More information: https://github.com/mpv-player/mpv/issues/2299
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-vda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-vda
</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;'>- # VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It provides support for H264, H263, MPEG1, MPEG2 and MPEG4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-videotoolbox
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-videotoolbox
</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;'>- # Apple GCC has problems with SIMD intrinsics and -Werror=no-missing-prototypes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure-no-error-on-missing-prototypes.diff
</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;'>- # kCVPixelFormatType_OneComponent8 used in avfoundation indev is only available on 10.8+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-indev=avfoundation
</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;'>- # configure isn't autoconf and they do use a dep cache
</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;'>- platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:,-compatibility_version,$\(LIBMAJOR\)::" ${worksrcpath}/configure
</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;'>- destroot.target install-libs install-headers
</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 -force ${destroot}${prefix}/share/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We need to make sure that the linker will use our libraries and not one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from a location like ${prefix}/lib . That's why we use --build-suffix, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that still requires us to provide pkg-config files with the standard names:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pc [glob ${destroot}${FFMPEG_VLC_PREFIX}/lib/pkgconfig/*.pc] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set standardname [strsed ${pc} "s/-VLC.pc/.pc/"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s [file tail ${pc}] ${standardname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # oblige dependent code to include files from our own renamed header file directories, so it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cannot include mismatching headers by accident (e.g. those from ffmpeg 3.x).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${FFMPEG_VLC_PREFIX}/include/${dir} ${destroot}${FFMPEG_VLC_PREFIX}/include/${dir}-VLC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach header [glob -nocomplain ${destroot}${FFMPEG_VLC_PREFIX}/include/*/*.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${header}
</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;'>- # packageable: ${destroot}${FFMPEG_VLC_PREFIX}/{include,lib/lib*VLC.dylib,lib/pkgconfig}
</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.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "ffmpeg-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
# kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpeg3-compat.diff b/multimedia/VLC/files/patch-ffmpeg3-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7dc5411
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,231 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Submitted By: Armin K <krejzi au email do com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: 2016-05-06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Initial Package Version: 2.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream Status: Committed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: Upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fixes building against ffmpeg3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Rediffed for version 2.2.3 by Bruce Dubbs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2016-04-04 19:45:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2016-05-06 22:39:24.859030920 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36549,7 +36549,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil < 55\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "libavutil < 55") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($PKG_CONFIG --exists --print-errors "libavutil > 55") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_status = 0; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36843,7 +36843,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_status = 0; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36927,7 +36927,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_status = 0; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45119,7 +45119,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg) av_vdpau_ver="55.42.100"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_status = 0; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur modules/codec/avcodec/audio.c modules/codec/avcodec/audio.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/audio.c 2015-12-08 10:18:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/audio.c 2016-05-06 22:39:24.859030920 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,12 +36,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vlc_codec.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vlc_avcodec.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "avcodec.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavcodec/avcodec.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavutil/mem.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libavutil/audioconvert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "avcodec.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;'>+ * decoder_sys_t : decoder descriptor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur modules/codec/avcodec/avcommon_compat.h modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/avcommon_compat.h 2015-03-01 08:07:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/avcommon_compat.h 2016-05-06 22:39:24.859030920 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -506,6 +506,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* HAVE_LIBAVUTIL_AVUTIL_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBAVUTIL_VERSION_MAJOR >= 55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define FF_API_AUDIOCONVERT 1
</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;'>++/* libavutil/pixfmt.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef PixelFormat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define PixelFormat AVPixelFormat
</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;'>+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <libavformat/avformat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur modules/codec/avcodec/encoder.c modules/codec/avcodec/encoder.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/encoder.c 2015-10-21 11:36:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/encoder.c 2016-05-06 22:39:24.860030887 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vlc_cpu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavcodec/avcodec.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libavutil/audioconvert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "avcodec.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "avcommon.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +310,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &psz_namecodec ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC; /* handed chroma output */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i_cat = VIDEO_ES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1017,7 +1016,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->frame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_sys->frame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_sys->frame )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1088,7 +1087,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVFrame *frame = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( likely(p_pict) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame = p_sys->frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avcodec_get_frame_defaults( frame );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_frame_unref( frame );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1329,7 +1329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //How much we need to copy from new packet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avcodec_get_frame_defaults( p_sys->frame );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_frame_unref( p_sys->frame );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->frame->format = p_sys->p_context->sample_fmt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1451,7 +1451,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avcodec_get_frame_defaults( p_sys->frame );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_frame_unref( p_sys->frame );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->b_variable )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur modules/codec/avcodec/vaapi.c modules/codec/avcodec/vaapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/vaapi.c 2014-11-16 12:57:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/vaapi.c 2016-05-06 22:39:24.860030887 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -595,7 +595,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Only VLD supported */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_va->setup = Setup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_va->get = Get;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_va->release = Release;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur modules/codec/avcodec/video.c modules/codec/avcodec/video.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/video.c 2016-04-04 19:45:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/video.c 2016-05-06 22:39:24.860030887 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -234,7 +234,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_codec = p_codec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_codec_id = i_codec_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->psz_namecodec = psz_namecodec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->p_ff_pic = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_sys->p_ff_pic = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->b_delayed_open = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_va = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_sem_init( &p_sys->sem_mt, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -446,7 +446,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( ffmpeg_OpenCodec( p_dec ) < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avcodec_free_frame( &p_sys->p_ff_pic );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_frame_free( &p_sys->p_ff_pic );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_sem_destroy( &p_sys->sem_mt );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free( p_sys );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return VLC_EGENERIC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -826,7 +826,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wait_mt( p_sys );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->p_ff_pic )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avcodec_free_frame( &p_sys->p_ff_pic );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_frame_free( &p_sys->p_ff_pic );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->p_va )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_va_Delete( p_sys->p_va );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-07-14 17:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2017-07-14 17:19:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2305,8 +2305,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --enable-avcodec libavcodec codec (default enabled)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "${enable_avcodec}" != "no"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavutil < 55],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavutil < 56],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2364,8 +2364,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavcodec >= 60.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 60.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2398,8 +2398,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "x${have_avcodec}" = "xyes"], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavcodec >= 60.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 60.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3162,8 +3162,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libav) av_vdpau_ver="55.26.0" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg) av_vdpau_ver="55.42.100"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavcodec >= 60.10.100], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 60.10 or libav.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-use-NSGetEnviron.diff b/multimedia/VLC/files/patch-use-NSGetEnviron.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..36d84f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-use-NSGetEnviron.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/misc/inhibit/orig.xdg.c 2014-08-14 09:20:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/misc/inhibit/xdg.c 2017-08-18 14:11:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix_spawnattr_t attr;
</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;'>+-extern char **environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void Timer (void *data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pid_t pid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv, environ);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argv, *_NSGetEnviron());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/stream_filter/orig.decomp.c 2015-04-13 21:54:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/stream_filter/decomp.c 2017-08-18 14:11:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64_t pts_delay;
</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;'>+-extern char **environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const size_t bufsize = 65536;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_VMSPLICE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,7 +361,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!posix_spawn_file_actions_adddup2 (&actions, comp[0], 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !posix_spawn_file_actions_adddup2 (&actions, uncomp[1], 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !posix_spawnp (&p_sys->pid, path, &actions, NULL, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- environ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *_NSGetEnviron()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (vlc_clone (&p_sys->thread, Thread, stream,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLC_THREAD_PRIORITY_INPUT) == 0)
</span></pre><pre style='margin:0'>
</pre>