<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/25514ec35106cb0203d7f40684abe989dc788b71">https://github.com/macports/macports-ports/commit/25514ec35106cb0203d7f40684abe989dc788b71</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 25514ec multimedia/mpv: update to 0.26.0. Fixes: https://trac.macports.org/ticket/54023 (#54023)
</span>25514ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 25514ec35106cb0203d7f40684abe989dc788b71
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Mon Jul 31 08:37:50 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> multimedia/mpv: update to 0.26.0. Fixes: https://trac.macports.org/ticket/54023 (#54023)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Changes:
</span><span style='display:block; white-space:pre;color:#404040;'> - Refresh 10.6 patchset.
</span><span style='display:block; white-space:pre;color:#404040;'> - Add my github handle (non-functional.)
</span><span style='display:block; white-space:pre;color:#404040;'> - Update used waf version.
</span><span style='display:block; white-space:pre;color:#404040;'> - Declare that port does not install any libraries.
</span><span style='display:block; white-space:pre;color:#404040;'> - Disable previously missed features like DVB input.
</span><span style='display:block; white-space:pre;color:#404040;'> - Disable Cocoa on 10.6 and below - default to X11 on these platforms.
</span><span style='display:block; white-space:pre;color:#404040;'> - Enca + libguess replaced by uchardet.
</span><span style='display:block; white-space:pre;color:#404040;'> - Use system GCC on 10.6 and below. No need for a special clang
</span><span style='display:block; white-space:pre;color:#404040;'> version any longer.
</span><span style='display:block; white-space:pre;color:#404040;'> - Apple Remote support only available on 10.7 and higher.
</span><span style='display:block; white-space:pre;color:#404040;'> - Prepare for the new VTB hwaccel API in FFMPEG, but keep using the
</span><span style='display:block; white-space:pre;color:#404040;'> old API for now.
</span><span style='display:block; white-space:pre;color:#404040;'> - Add CUDA hwaccel feature on 10.6 and higher. Might need to be disabled
</span><span style='display:block; white-space:pre;color:#404040;'> later on if it causes trouble.
</span><span style='display:block; white-space:pre;color:#404040;'> - Update comments and notes.
</span><span style='display:block; white-space:pre;color:#404040;'> - Automatically disable hardware decoding lines in example config file
</span><span style='display:block; white-space:pre;color:#404040;'> if hardware decoding is not available.
</span><span style='display:block; white-space:pre;color:#404040;'> - Switch between backends based upon system version in example config
</span><span style='display:block; white-space:pre;color:#404040;'> file.
</span><span style='display:block; white-space:pre;color:#404040;'> - Add support for the latest and greatest python 3.6 for generating
</span><span style='display:block; white-space:pre;color:#404040;'> documentation. Old variant retained as a legacy variant that
</span><span style='display:block; white-space:pre;color:#404040;'> automatically pulls in the newest one for a smooth upgrade path.
</span><span style='display:block; white-space:pre;color:#404040;'> - Prepare for new javascript support - disabled by default, since the
</span><span style='display:block; white-space:pre;color:#404040;'> required dependency is not ported yet.
</span>---
multimedia/mpv/Portfile | 200 ++++++++++------
multimedia/mpv/files/config-maintainer | 7 +-
...o_out_ao_coreaudio_exclusive.c-compile-fix.diff | 6 +-
multimedia/mpv/files/patch-misc-add-strnlen.diff | 2 +-
..._macosx_compat.h-fix-YES-NO-macro-warnings.diff | 18 --
...x_compat.m-add-subscripting-implementation.diff | 67 ------
...-video_out_cocoa_common.m-define-constants.diff | 22 --
...-video_out_cocoa_common.m-port-lightsensor.diff | 45 ----
...cocoa_common.m-wrap-convertRectFromBacking.diff | 25 --
...ew.h-remove-NSDraggingDestination-protocol.diff | 17 --
...rtPointToBacking-with-userSpaceScaleFactor.diff | 15 --
...ertRectFromScreen-with-convertScreenToBase.diff | 18 --
...ertRectToBacking-with-userSpaceScaleFactor.diff | 30 ---
...-video_out_cocoa_window.m-fullscreen-fixes.diff | 26 --
...t_opengl_common.c-hide-GL3-timer-functions.diff | 4 +-
...deo_out_opengl_common.c-hide-GL320-section.diff | 4 +-
...-video_out_opengl_common.h-guard-GL3-stuff.diff | 15 +-
...t_opengl_context_cocoa.c-hardcode-OpenGL-2.diff | 262 ---------------------
...out_opengl_utils.c-hide-pbo-texture-upload.diff | 18 --
...eo_out_opengl_video.c-fix-compile-warnings.diff | 16 +-
...out_opengl_video.c-hide-pbo-texture-upload.diff | 17 ++
..._opengl_video.c-remove-timer-functionality.diff | 241 ++++++++++---------
...engl.c-guard-GL3-and-backport-old-behavior.diff | 18 +-
...ftools_checks_custom.py-disable-libarclite.diff | 12 -
...s_detections_compiler.py-support-older-GCC.diff | 13 +
.../mpv/files/patch-wscript-support-older-GCC.diff | 13 +
26 files changed, 335 insertions(+), 796 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/Portfile b/multimedia/mpv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c44e99a..75b9867 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup github 1.0
</span> PortGroup waf 1.0
# Please revbump mpv whenever ffmpeg{,-devel} is updated!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mpv-player mpv 0.22.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mpv-player mpv 0.26.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories multimedia
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ionic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ionic @ionic}
</span> platforms darwin
description mpv is a movie player based on MPlayer and mplayer2.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ long_description ${description} It plays most MPEG/VOB, AVI, Ogg/OGM, \
</span> and even H.264 movies.
homepage http://www.mpv.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set waf_version 1.8.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set waf_version 1.9.8
</span> set waf_distfile waf-${waf_version}
set mpv_distfile ${distfiles}
master_sites-append https://waf.io/:waf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,13 @@ distfiles-append ${waf_distfile}:waf
</span> extract.only-delete ${waf_distfile}
checksums ${mpv_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1bcf046072e25a6363fd9e2cebb8b5751d1e0f0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7b52b765516a33cbfc4bcaad7e5b727b92029519cc7ac3b83efe35f4d6e5a70c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9218deaee02382a74af81f1f08d3a088ca2c4ae4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 069875c74ce60f5db337aa4040416795c421a8b94641a886652516585d150eb1 \
</span> ${waf_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bb1dcd10a0c336a5497bb1247a301c27f997078c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d1a5d0e0f42a0101f5832abb33cd71018505405f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span>
depends_build path:bin/pkg-config:pkgconfig
depends_lib path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,14 +66,24 @@ configure.args-append --enable-manpage-build \
</span> --enable-libass \
--enable-coreaudio \
--enable-cocoa \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-cplugins \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-zlib \
</span> --disable-html-build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-videotoolbox-hwaccel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-videotoolbox-hwaccel-old \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-videotoolbox-hwaccel-new \
</span> --disable-videotoolbox-gl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-cuda-hwaccel \
</span> --disable-opensles \
--disable-egl-drm \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-egl-angle-lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-egl-angle-win32 \
</span> --disable-audiounit \
--disable-ios-gl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-mali-fbdev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-mali-fbdev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-direct3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-android \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-rpi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dvbin
</span>
# mpv autodetects many support libs. To prevent undeclared
# dependencies, explicitly disable everything optional first.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,27 +101,24 @@ configure.args-append --disable-pdf-build \
</span> --disable-vapoursynth \
--disable-vapoursynth-lazy \
--disable-libarchive \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-enca \
</span> --disable-rubberband \
--disable-pulse \
--disable-jack \
--disable-openal \
--disable-gl-cocoa \
--disable-x11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xext \
</span> --disable-xv \
--disable-gl-x11 \
--disable-egl-x11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xrandr \
</span> --disable-caca \
--disable-jpeg \
--disable-tv \
--disable-lua \
--disable-apple-remote \
--disable-gl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-zsh-comp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-zsh-comp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-javascript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-uchardet
</span>
# Fix picking up the correct talloc version.
# -isystem has the added benefit of moving the include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,27 +146,17 @@ platform macosx {
</span>
# Force clang compiler as installed by Xcode's CLT's... hopefully.
compiler.blacklist-append *gcc* cc macports-*
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-apple-remote \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-apple-remote
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang is required to build mpv.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Part of getting mpv to work on SL -- c.f. #44662
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We'll keep this at clang 3.4, because this is the last version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not requiring a C++11 ABI. Older systems will need this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port to bootstrap a newer clang version in a somewhat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # complicated process. Hence, let's assume clang 3.4 will be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # available for quite some time and only pull that in. It
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # should be new enough for compiling mpv (for now.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append *gcc* cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-delete macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Reorder list, move older or unknown versions to the end.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-delete clang macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append clang macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable Cocoa output.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Users on old systems will need to embrace X11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --enable-cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-cocoa
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-apple-remote \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-apple-remote
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,13 +178,24 @@ platform darwin {
</span>
# VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
# It provides support for H264, H263, MPEG1, MPEG2 and MPEG4.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that the new API requires FFMPEG 3.4 (currently unreleased or only available as ffmpeg-devel.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Switch to the new API once ffmpeg 3.4 hits the "stable" ffmpeg port.
</span> if {${os.major} > 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-videotoolbox-hwaccel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-videotoolbox-hwaccel-old \
</span> --disable-videotoolbox-gl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-videotoolbox-hwaccel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-videotoolbox-hwaccel-old \
</span> --enable-videotoolbox-gl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It looks like mpv expects a CUDA API version 7050 or higher, which might mean >= 7.0.50.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If that's the case, only 10.9+ have support for that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also, it might be necessary to have the CUDA SDK installed before installing ffmpeg.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Let's hope for the best, for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-cuda-hwaccel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-cuda-hwaccel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.major} > 11} {
notes-append {
This config file already defines the necessary video output settings to make\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,8 +205,7 @@ platform darwin {
</span> notes-append {
Sadly, your system is incapable of utilizing mpv's hardware decoding features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Please make sure to edit the file after copying and replace the "vo=" line with\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options suited for your system or mpv won't work as expected. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The example config file will not include a hardware decoding option.\
</span> Consult ``man mpv'' for further information.
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,40 +215,27 @@ platform darwin {
</span> patchfiles-append patch-misc-import-CoreVideo.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Versions 10.6 and below don't support XCode 4, which is required for ARCLite.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We will have to patch mpv for unofficial Cocoa support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make mpv work as good as possible on 10.6 and below. No Cocoa support, instead concentrate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on getting the OpenGL output to work via X11.
</span> # Also fix some other minor compile issues only manifesting on 10.6 and below along the way.
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-waftools_checks_custom.py-disable-libarclite.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-wscript-support-older-GCC.diff \
</span> patch-misc-add-strnlen.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-waftools_detections_compiler.py-support-older-GCC.diff \
</span> patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_window.m-fullscreen-fixes.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_common.m-define-constants.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_common.m-port-lightsensor.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_cocoa_common.m-wrap-convertRectFromBacking.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff \
</span> patch-video_out_opengl_video.c-fix-compile-warnings.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-osdep_macosx_compat.m-add-subscripting-implementation.diff \
</span> patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff \
patch-video_out_opengl_common.h-guard-GL3-stuff.diff \
patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff \
patch-video_out_opengl_common.c-hide-GL320-section.diff \
patch-video_out_opengl_common.c-hide-GL3-timer-functions.diff \
patch-video_out_opengl_video.c-remove-timer-functionality.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-video_out_opengl_utils.c-hide-pbo-texture-upload.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-video_out_opengl_video.c-hide-pbo-texture-upload.diff
</span>
notes-append {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- On systems older than Lion (10.7), Cocoa output support is currently\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- being patched by the MacPorts maintainer to make it work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It is known to be broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ On systems older than Lion (10.7), Cocoa output support is not available.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Please do not expect it to work or be bug free.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The X11 backend should have been enabled automatically.
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,12 +249,32 @@ platform darwin {
</span> } else {
reinplace -W "${worksrcpath}/TOOLS" "/@@NETWORK@@/d" config-maintainer
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "s/@@HWDEC@@//" config-maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "/@@HWDEC@@/d" config-maintainer
</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 {${os.major} > 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "s/@@HWDEC_CUDA@@//" config-maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "/@@HWDEC_CUDA@@/d" config-maintainer
</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 {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "s/@@BACKEND@@/x11/" config-maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "s/@@BACKEND@@/cocoa/" config-maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
# Shameless copy from ipe-tools.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.versions {27 35}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.versions {27 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 07-30-2018.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dict set python.legacy_versions 35 36
</span> set python.default_version 27
set python.version ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,6 +295,24 @@ foreach ver ${python.versions} {
</span> eval $variant_line
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Create legacy python variants, mapping to the replacement version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dict for {legacy_ver replace_ver} ${python.legacy_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant_line {variant python${legacy_ver} description }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line " {Legacy variant for python${legacy_ver} mapping to python${replace_ver}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line " requires python${replace_ver}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach over ${python.versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${legacy_ver} == ${over} || ${replace_ver} == ${over}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</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;'>+ append variant_line " conflicts python${over}"
</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;'>+ append variant_line " { }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set default python variant.
set variant_none true
foreach ver ${python.versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,10 +416,15 @@ variant libarchive description {Enable transparent handling of Zip files and oth
</span> --enable-libarchive
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant enca description {Enable encoding support via ENCA} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:enca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-enca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-enca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 07-30-2018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant enca requires uchardet description {Legacy compatibility variant for enable encoding support via ENCA. Will be removed soon.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You have enabled the legacy enca variant.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Upstream removed support for ENCA in version 0.23.0 in favor of uchardet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The uchardet variant has been enabled automatically.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant rubberband description {Enable support for the Rubber Band library, adding audio pitch and speed control} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,22 +460,17 @@ variant x11 {
</span> port:xorg-libXrandr
configure.args-delete --disable-x11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xrandr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-xv
</span> configure.args-append --enable-x11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xrandr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-xv
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opengl description {Enable glx output support. Both the CoreVideo and X11 outputs are supported} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-gl-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gl-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant opengl description {Enable OpenGL output support. Both the CoreVideo and X11 (GLX) outputs are supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-gl-cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gl-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace --disable-gl \
--enable-gl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,3 +525,15 @@ variant zsh description {Enable/install zsh completion support} {
</span> configure.args-replace --disable-zsh-comp \
--enable-zsh-comp
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#variant javascript description {Enable JavaScript support via mujs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append port:mujs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace --disable-javascript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# --enable-javascript
</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;'>+variant uchardet description {Enable the uchardet encoding detector} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:uchardet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-uchardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-uchardet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/config-maintainer b/multimedia/mpv/files/config-maintainer
</span><span style='display:block; white-space:pre;color:#808080;'>index 912b2a6..7bf2f57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/config-maintainer
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/config-maintainer
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,9 @@
</span> # Write your default config options here!
[default]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-vo=opengl-hq:backend=cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+vo=opengl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+profile=opengl-hq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+opengl-backend=@@BACKEND@@
</span> ao=coreaudio
sub-scale=3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +14,8 @@ volume-max=800
</span>
framedrop=vo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-hwdec=videotoolbox
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@HWDEC@@hwdec=videotoolbox
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@HWDEC_CUDA@@#hwdec=cuda
</span>
#alang=en,eng,de,ger
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff b/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 26de454..75f621c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> --- audio/out/ao_coreaudio_exclusive.c.orig
+++ audio/out/ao_coreaudio_exclusive.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreAudio/HostTime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavutil/intreadwrite.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavutil/intfloat.h>
</span>
+#include <unistd.h>
+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-misc-add-strnlen.diff b/multimedia/mpv/files/patch-misc-add-strnlen.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fee76d0..2ea1eea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-misc-add-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-misc-add-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@
</span> +#endif /* !defined (COMPAT_H) */
--- ta/ta.h.orig
+++ ta/ta.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,8 @@
</span> #include <stdbool.h>
#include <stdarg.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff b/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ca6a247..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- osdep/macosx_compat.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ osdep/macosx_compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,6 +66,15 @@ static const NSEventModifierFlags NSEven
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)setObject: (id)object forKeyedSubscript:(id)key;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Don't blindly redefine YES and NO, undefine them first. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #undef YES
</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;'>-+#ifdef NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #undef NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __has_feature(objc_bool)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define YES __objc_yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NO __objc_no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff b/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a0f8aa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ osdep/macosx_compat.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This file is part of mpv.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * mpv is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * the Free Software Foundation; either version 2 of the License, or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * (at your option) any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * mpv is distributed in the hope that it will be useful,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * GNU General Public License for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * You should have received a copy of the GNU General Public License along
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * with mpv; if not, write to the Free Software Foundation, Inc.,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
</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;'>-+#include "osdep/macosx_compat.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined (MAC_OS_X_VERSION_10_8) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@implementation NSArray (SubscriptingAdditions)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (id)objectAtIndexedSubscript:(NSUInteger)index
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [self objectAtIndex:index];
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@implementation NSMutableArray (SubscriptingAdditions)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)setObject:(id)object atIndexedSubscript:(NSUInteger)index
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (index == [self count])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self addObject:object];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self replaceObjectAtIndex:index withObject:object];
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@implementation NSDictionary (SubscriptingAdditions)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (id)objectForKeyedSubscript:(id)key
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [self objectForKey:key];
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@implementation NSMutableDictionary (SubscriptingAdditions)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)setObject:(id)object forKeyedSubscript:(id)key
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self setObject:object forKey:key];
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- wscript_build.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wscript_build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -404,6 +404,7 @@ def build(ctx):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( "osdep/ar/HIDRemote.m", "apple-remote" ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( "osdep/macosx_application.m", "cocoa" ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( "osdep/macosx_events.m", "cocoa" ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ( "osdep/macosx_compat.m" ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( "osdep/semaphore_osx.c" ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( "osdep/subprocess.c" ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( "osdep/subprocess-posix.c", "posix-spawn" ),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff b/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cfa8c00..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa_common.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa_common.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <CoreVideo/CoreVideo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "cocoa_common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "video/out/cocoa/window.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +51,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common/msg.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* not used on OS X < 10.8 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(MAC_OS_X_VERSION_10_8) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define kIOPMAssertionTypePreventUserIdleDisplaySleep CFSTR("PreventUserIdleDisplaySleep")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp* now,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CVTimeStamp* outputTime, CVOptionFlags flagsIn,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVOptionFlags* flagsOut, void* displayLinkContext);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff b/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 07f25fd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa_common.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa_common.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,6 +91,9 @@ struct vo_cocoa_state {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t last_lmuvalue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int last_lux;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IONotificationPortRef light_sensor_io_port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFRunLoopSourceRef light_sensor_notify_rl_source;
</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;'>- struct mp_log *log;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -237,8 +240,18 @@ static void cocoa_init_light_sensor(stru
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // subscribe to notifications from the light sensor driver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s->light_sensor_io_port = IONotificationPortCreate(kIOMasterPortDefault);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IONotificationPortSetDispatchQueue(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s->light_sensor_io_port, dispatch_get_main_queue());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((s->light_sensor_notify_rl_source = IONotificationPortGetRunLoopSource (s->light_sensor_io_port)) != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFRunLoopAddSource (CFRunLoopGetCurrent (), s->light_sensor_notify_rl_source, kCFRunLoopCommonModes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MP_WARN (vo, "can't start ambient light sensor connection\n");
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io_object_t n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IOServiceAddInterestNotification(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,6 +273,13 @@ static void cocoa_init_light_sensor(stru
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void cocoa_uninit_light_sensor(struct vo_cocoa_state *s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (s->light_sensor_io_port) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (s->light_sensor_notify_rl_source) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFRunLoopSourceInvalidate (s->light_sensor_notify_rl_source);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s->light_sensor_notify_rl_source = NULL;
</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;'>- IONotificationPortDestroy(s->light_sensor_io_port);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IOObjectRelease(s->light_sensor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_common.m-wrap-convertRectFromBacking.diff b/multimedia/mpv/files/patch-video_out_cocoa_common.m-wrap-convertRectFromBacking.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4065bfa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_common.m-wrap-convertRectFromBacking.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa_common.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa_common.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,9 +135,11 @@ static void queue_new_video_size(struct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([s->window conformsToProtocol: @protocol(MpvSizing)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- id<MpvSizing> win = (id<MpvSizing>) s->window;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRect r = NSMakeRect(0, 0, w, h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!opts->hidpi_window_scale) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = [s->current_screen convertRectFromBacking:r];
</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;'>- [win queueNewVideoSize:NSMakeSize(r.size.width, r.size.height)];
</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;'>-@@ -522,8 +524,10 @@ static void create_ui(struct vo *vo, str
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRect wr =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSMakeRect(win->x0, win->y0, win->x1 - win->x0, win->y1 - win->y0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!opts->hidpi_window_scale)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wr = [s->current_screen convertRectFromBacking:wr];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s->window = create_window(wr, s->current_screen, opts->border, adapter);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent = [s->window contentView];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff b/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d85411b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa/events_view.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa/events_view.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,9 +16,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "video/out/cocoa/mpvadapter.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@interface MpvEventsView : NSView <NSDraggingDestination>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@interface MpvEventsView : NSView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <NSDraggingDestination>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(nonatomic, retain) MpvCocoaAdapter *adapter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)setFullScreen:(BOOL)willBeFullscreen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)clear;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff b/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cc263cd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa/events_view.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa/events_view.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (NSPoint)convertPointToPixels:(NSPoint)point
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- point = [self convertPoint:point fromView:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- point = [self convertPointToBacking:point];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFloat scale_factor = [self.window userSpaceScaleFactor];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ point = NSMakePoint (point.x * scale_factor, point.y * scale_factor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // flip y since isFlipped returning YES doesn't affect the backing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // coordinate system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- point.y = -point.y;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff b/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63bc2a7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa/events_view.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa/events_view.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,7 +133,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (BOOL)containsMouseLocation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRect vF = [[self.window screen] visibleFrame];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRect vFW = [self.window convertRectFromScreen:vF];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint vFStart = vF.origin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint vFEnd = NSMakePoint (vFStart.x + vF.size.width, vFStart.y + vF.size.height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint vFStartW = [self.window convertScreenToBase:vFStart];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint vFEndW = [self.window convertScreenToBase:vFEnd];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRect vFW = NSMakeRect (vFStartW.x, vFStartW.y, vFEndW.x - vFStartW.x, vFEndW.y - vFStartW.y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRect vFV = [self convertRect:vFW fromView:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSPoint pt = [self convertPoint:[self mouseLocation] fromView:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff b/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b95cac7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa/video_view.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa/video_view.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * with mpv. If not, see <http://www.gnu.org/licenses/>.
</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;'>-+#import <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "osdep/macosx_compat.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "video/out/cocoa_common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "video_view.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +40,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (NSRect)frameInPixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [self convertRectToBacking:[self frame]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRect cur_frame = self.frame;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint frame_point = cur_frame.origin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSSize frame_extents = cur_frame.size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFloat scale_factor = [self.window userSpaceScaleFactor];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint conv_frame_point = NSMakePoint (frame_point.x * scale_factor, frame_point.y * scale_factor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSSize conv_frame_extents = NSMakeSize (frame_extents.width * scale_factor, frame_extents.height * scale_factor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRect conv_frame = NSMakeRect (conv_frame_point.x, conv_frame_point.y, conv_frame_extents.width, conv_frame_extents.height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return conv_frame;
</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;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff b/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fca6af1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/cocoa/window.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/cocoa/window.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * with mpv. If not, see <http://www.gnu.org/licenses/>.
</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;'>-+#import <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavutil/common.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "input/keycodes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +32,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)setCenteredContentSize:(NSSize)newSize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSFullScreenWindowMask = 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSApplicationPresentationFullScreen = 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSApplicationPresentationAutoHideToolbar = 0,
</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;'>- @implementation MpvVideoWindow {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSSize _queued_video_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL3-timer-functions.diff b/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL3-timer-functions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e6d39b..be2222f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL3-timer-functions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL3-timer-functions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- video/out/opengl/common.c.orig
+++ video/out/opengl/common.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -276,7 +276,6 @@ static const struct gl_functions gl_func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -277,7 +277,6 @@ static const struct gl_functions gl_func
</span> {0}
},
},
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> {
.ver_core = 330,
.extension = "GL_ARB_timer_query",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -310,6 +309,7 @@ static const struct gl_functions gl_func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,6 +310,7 @@ static const struct gl_functions gl_func
</span> {0}
},
},
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff b/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a1ec9e..e0d8152 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- video/out/opengl/common.c.orig
+++ video/out/opengl/common.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,6 +265,7 @@ static const struct gl_functions gl_func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,6 +266,7 @@ static const struct gl_functions gl_func
</span> .ver_exclude = 1,
.ver_es_exclude = 320,
},
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> {
.ver_core = 320,
.extension = "GL_ARB_sync",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -275,6 +276,7 @@ static const struct gl_functions gl_func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,6 +277,7 @@ static const struct gl_functions gl_func
</span> {0}
},
},
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff b/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 35cbf9e..c1fadeb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,17 @@
</span> --- video/out/opengl/common.h.orig
+++ video/out/opengl/common.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,6 +194,7 @@ struct GL {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</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 __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</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;'>+ struct GL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct GL GL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,6 +192,7 @@ struct GL {
</span>
void (GLAPIENTRY *InvalidateFramebuffer)(GLenum, GLsizei, const GLenum *);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +19,7 @@
</span> GLsync (GLAPIENTRY *FenceSync)(GLenum, GLbitfield);
GLenum (GLAPIENTRY *ClientWaitSync)(GLsync, GLbitfield, GLuint64);
void (GLAPIENTRY *DeleteSync)(GLsync sync);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,6 +209,7 @@ struct GL {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,6 +207,7 @@ struct GL {
</span> void (GLAPIENTRY *GetQueryObjecti64v)(GLuint, GLenum, GLint64 *);
void (GLAPIENTRY *GetQueryObjectuiv)(GLuint, GLenum, GLuint *);
void (GLAPIENTRY *GetQueryObjectui64v)(GLuint, GLenum, GLuint64 *);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff b/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 67777f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,262 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/opengl/common.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/opengl/common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,6 +474,7 @@ void mpgl_load_functions2(GL *gl, void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (shader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_verbose(log, "GL_SHADING_LANGUAGE_VERSION='%s'\n", shader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined (__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (gl->version >= 300) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -488,7 +489,9 @@ void mpgl_load_functions2(GL *gl, void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *ext = (char*)gl->GetString(GL_EXTENSIONS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/opengl/common.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/opengl/common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</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;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common/msg.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "misc/bstr.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +38,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if HAVE_GL_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <OpenGL/glext.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_IOS_GL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <OpenGLES/ES2/glext.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/opengl/video.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/opengl/video.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,12 +382,22 @@ const struct m_sub_options gl_video_conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgb10", GL_RGB10},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgb10_a2", GL_RGB10_A2},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgb16", GL_RGB16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgb16f", GL_RGB16F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgb32f", GL_RGB32F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"rgb16f", GL_RGB16F_ARB},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"rgb32f", GL_RGB32F_ARB},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgba12", GL_RGBA12},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgba16", GL_RGBA16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgba16f", GL_RGBA16F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"rgba32f", GL_RGBA32F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"rgba16f", GL_RGBA16F_ARB},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"rgba32f", GL_RGBA32F_ARB},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"auto", 0})),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT_CHOICE_OR_INT("dither-depth", dither_depth, 0, -1, 16,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ({"no", -1}, {"auto", 0})),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3111,7 +3121,11 @@ static void check_gl_features(struct gl_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool have_texrg = gl->mpgl_caps & MPGL_CAP_TEX_RG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool have_tex16 = !gl->es || (gl->mpgl_caps & MPGL_CAP_EXT16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const GLint auto_fbo_fmts[] = {GL_RGBA16, GL_RGBA16F, GL_RGB10_A2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const GLint auto_fbo_fmts[] = {GL_RGBA16, GL_RGBA16F_ARB, GL_RGB10_A2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GL_RGBA8, 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLint user_fbo_fmts[] = {p->opts.fbo_format, 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const GLint *fbo_fmts = user_fbo_fmts[0] ? user_fbo_fmts : auto_fbo_fmts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/opengl/context_cocoa.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/opengl/context_cocoa.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,12 +48,17 @@ static void *cocoa_glgetaddr(const char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static CGLError test_gl_version(struct vo *vo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGLContextObj *ctx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGLPixelFormatObj *pix,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGLOpenGLProfile version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGLPixelFormatObj *pix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ , CGLOpenGLProfile version
</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;'>- CGLPixelFormatAttribute attrs[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kCGLPFAOpenGLProfile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (CGLPixelFormatAttribute) version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kCGLPFAAccelerated,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // leave this as the last entry of the array to not break the fallback
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,16 +95,22 @@ static bool create_gl_context(struct MPG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct cgl_context *p = ctx->priv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGLError err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGLOpenGLProfile gl_versions[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kCGLOGLPVersion_3_2_Core,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kCGLOGLPVersion_Legacy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int n = 0; n < MP_ARRAY_SIZE(gl_versions); n++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = test_gl_version(ctx->vo, &p->ctx, &p->pix, gl_versions[n]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err == kCGLNoError)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = test_gl_version(ctx->vo, &p->ctx, &p->pix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err != kCGLNoError) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,4 +175,4 @@ const struct mpgl_driver mpgl_driver_coc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .swap_buffers = cocoa_swap_buffers,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .control = cocoa_control,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .uninit = cocoa_uninit,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/opengl/formats.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/opengl/formats.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,24 +42,49 @@ const struct gl_format gl_formats[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Non-normalized integer formats.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Follows ES 3.0 as to which are color-renderable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_R8UI, GL_RED_INTEGER, T_U8, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_R8UI, GL_RED_INTEGER_EXT, T_U8, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RG8UI, GL_RG_INTEGER, T_U8, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB8UI, GL_RGB_INTEGER, T_U8, F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGBA8UI, GL_RGBA_INTEGER, T_U8, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_R16UI, GL_RED_INTEGER, T_U16, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGB8UI_EXT, GL_RGB_INTEGER_EXT, T_U8, F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGBA8UI_EXT, GL_RGBA_INTEGER_EXT, T_U8, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_R16UI, GL_RED_INTEGER_EXT, T_U16, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RG16UI, GL_RG_INTEGER, T_U16, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB16UI, GL_RGB_INTEGER, T_U16, F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGBA16UI, GL_RGBA_INTEGER, T_U16, F_CR | F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGB16UI_EXT, GL_RGB_INTEGER_EXT, T_U16, F_GL3 | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGBA16UI_EXT, GL_RGBA_INTEGER_EXT, T_U16, F_CR | F_GL3 | F_ES3},
</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;'>- // On GL3+ or GL2.1 with GL_ARB_texture_float, floats work fully.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_R16F, GL_RED, T_FL, F_F16 | F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RG16F, GL_RG, T_FL, F_F16 | F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB16F, GL_RGB, T_FL, F_F16 | F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGBA16F, GL_RGBA, T_FL, F_F16 | F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGB16F_ARB, GL_RGB, T_FL, F_F16 | F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGBA16F_ARB, GL_RGBA, T_FL, F_F16 | F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_R32F, GL_RED, T_FL, F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RG32F, GL_RG, T_FL, F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB32F, GL_RGB, T_FL, F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGBA32F, GL_RGBA, T_FL, F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGB32F_ARB, GL_RGB, T_FL, F_CF | F_GL3 | F_GL2F},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGBA32F_ARB, GL_RGBA, T_FL, F_CF | F_GL3 | F_GL2F},
</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;'>- // Note: we simply don't support float anything on ES2, despite extensions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We also don't bother with non-filterable float formats, and we ignore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,15 +94,25 @@ const struct gl_format gl_formats[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // F_EXTF16 implies extensions that also enable 16 bit floats fully.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_R16F, GL_RED, T_FL, F_F16 | F_CF | F_ES32 | F_EXTF16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RG16F, GL_RG, T_FL, F_F16 | F_CF | F_ES32 | F_EXTF16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB16F, GL_RGB, T_FL, F_F16 | F_TF | F_ES32 | F_EXTF16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGBA16F, GL_RGBA, T_FL, F_F16 | F_CF | F_ES32 | F_EXTF16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGB16F_ARB, GL_RGB, T_FL, F_F16 | F_TF | F_ES32 | F_EXTF16},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGBA16F_ARB, GL_RGBA, T_FL, F_F16 | F_CF | F_ES32 | F_EXTF16},
</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;'>- // On ES3.0+, 16 bit floats are texture-filterable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Don't bother with 32 bit floats; they exist but are neither CR nor TF.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_R16F, GL_RED, T_FL, F_F16 | F_TF | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RG16F, GL_RG, T_FL, F_F16 | F_TF | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB16F, GL_RGB, T_FL, F_F16 | F_TF | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGBA16F, GL_RGBA, T_FL, F_F16 | F_TF | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGB16F_ARB, GL_RGB, T_FL, F_F16 | F_TF | F_ES3},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {GL_RGBA16F_ARB, GL_RGBA, T_FL, F_F16 | F_TF | F_ES3},
</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;'>- // These might be useful as FBO formats.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {GL_RGB10_A2, GL_RGBA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,10 +248,19 @@ int gl_format_type(const struct gl_forma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLenum gl_integer_format_to_base(GLenum format)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (format) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RED_INTEGER: return GL_RED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case GL_RED_INTEGER_EXT: return GL_RED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RG_INTEGER: return GL_RG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RGB_INTEGER: return GL_RGB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RGBA_INTEGER: return GL_RGBA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case GL_RGB_INTEGER_EXT: return GL_RGB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case GL_RGBA_INTEGER_EXT: return GL_RGBA;
</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;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,7 +283,11 @@ int gl_format_components(GLenum format)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (format) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RED:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RED_INTEGER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case GL_RED_INTEGER_EXT:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_LUMINANCE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RG:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,10 +295,18 @@ int gl_format_components(GLenum format)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_LUMINANCE_ALPHA:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RGB:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RGB_INTEGER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case GL_RGB_INTEGER_EXT:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RGBA:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GL_RGBA_INTEGER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case GL_RGBA_INTEGER_EXT:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_utils.c-hide-pbo-texture-upload.diff b/multimedia/mpv/files/patch-video_out_opengl_utils.c-hide-pbo-texture-upload.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8af8d9e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_utils.c-hide-pbo-texture-upload.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- video/out/opengl/utils.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ video/out/opengl/utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1226,6 +1226,7 @@ void gl_pbo_upload_tex(struct gl_pbo_upl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pbo->index = (pbo->index + 1) % NUM_PBO_BUFFERS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo->buffers[pbo->index]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *data = gl->MapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, needed_size,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1243,6 +1244,7 @@ void gl_pbo_upload_tex(struct gl_pbo_upl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</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;'>- no_pbo:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_upload_tex(gl, target, format, type, dataptr, stride, x, y, w, h);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_video.c-fix-compile-warnings.diff b/multimedia/mpv/files/patch-video_out_opengl_video.c-fix-compile-warnings.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8797472..3204208 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_video.c-fix-compile-warnings.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_opengl_video.c-fix-compile-warnings.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- video/out/opengl/video.c.orig
+++ video/out/opengl/video.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -998,7 +998,7 @@ static void uninit_video(struct gl_video
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -968,7 +968,7 @@ static void uninit_video(struct gl_video
</span> gl->DeleteTextures(1, &plane->gl_texture);
gl_pbo_upload_uninit(&plane->pbo);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
// Invalidate image_params to ensure that gl_video_config() will call
// init_video() on uninitialized gl_video.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1045,7 +1045,7 @@ static void pass_prepare_src_tex(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1073,7 +1073,7 @@ static void pass_prepare_src_tex(struct
</span> static void render_pass_quad(struct gl_video *p, int vp_w, int vp_h,
const struct mp_rect *dst)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,21 +18,21 @@
</span>
struct gl_transform t;
gl_transform_ortho(&t, 0, vp_w, 0, vp_h);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2945,7 +2945,7 @@ struct voctrl_performance_data gl_video_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3000,7 +3000,7 @@ void gl_video_perfdata(struct gl_video *
</span> // This assumes nv12, with textures set to GL_NEAREST filtering.
static void reinterleave_vdpau(struct gl_video *p, struct gl_hwdec_frame *frame)
{
- struct gl_hwdec_frame res = {0};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct gl_hwdec_frame res = {{0}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct gl_hwdec_frame res = {{{0}}};
</span> for (int n = 0; n < 2; n++) {
struct fbotex *fbo = &p->vdpau_deinterleave_fbo[n];
// This is an array of the 2 to-merge planes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3008,7 +3008,7 @@ static bool gl_video_upload_image(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3063,7 +3063,7 @@ static bool pass_upload_image(struct gl_
</span>
if (p->hwdec_active) {
// Hardware decoding
- struct gl_hwdec_frame gl_frame = {0};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct gl_hwdec_frame gl_frame = {{0}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct gl_hwdec_frame gl_frame = {{{0}}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_describe(p, "map frame (hwdec)");
</span> gl_timer_start(p->upload_timer);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ok = p->hwdec->driver->map_frame(p->hwdec, vimg->mpi, &gl_frame) >= 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_stop(p->upload_timer);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_video.c-hide-pbo-texture-upload.diff b/multimedia/mpv/files/patch-video_out_opengl_video.c-hide-pbo-texture-upload.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2b18722
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_opengl_video.c-hide-pbo-texture-upload.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- video/out/opengl/video.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ video/out/opengl/video.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3216,10 +3216,14 @@ static void check_gl_features(struct gl_
</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;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!gl->MapBufferRange && p->opts.pbo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p->opts.pbo = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MP_WARN(p, "Disabling PBOs (GL2.1/GLES2 unsupported).\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</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;'>+ p->forced_dumb_mode = p->opts.dumb_mode > 0 || !have_fbo || !have_texrg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool voluntarily_dumb = check_dumb_mode(p);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_opengl_video.c-remove-timer-functionality.diff b/multimedia/mpv/files/patch-video_out_opengl_video.c-remove-timer-functionality.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1fa817..1cabee8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_opengl_video.c-remove-timer-functionality.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_opengl_video.c-remove-timer-functionality.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,72 @@
</span> --- video/out/opengl/utils.c.orig
+++ video/out/opengl/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1057,6 +1057,7 @@ void gl_sc_generate(struct gl_shader_cac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sc->needs_reset = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -466,7 +466,9 @@ struct sc_entry {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int num_uniforms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bstr frag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bstr vert;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct gl_timer *timer;
</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 gl_shader_cache {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -521,7 +523,9 @@ void gl_sc_reset(struct gl_shader_cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL *gl = sc->gl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sc->needs_reset) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_stop(gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl->UseProgram(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int n = 0; n < sc->num_uniforms; n++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,7 +558,9 @@ static void sc_flush_cache(struct gl_sha
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ talloc_free(e->vert.start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ talloc_free(e->frag.start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ talloc_free(e->uniforms);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_free(e->timer);
</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;'>+ sc->num_entries = 0;
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1143,7 +1149,9 @@ struct mp_pass_perf gl_sc_generate(struc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *entry = (struct sc_entry){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .vert = bstrdup(NULL, *vert),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .frag = bstrdup(NULL, *frag),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .timer = gl_timer_create(gl),
</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;'>+ // build vertex shader from vao and cache the locations of the uniform variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1168,10 +1176,17 @@ struct mp_pass_perf gl_sc_generate(struc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl->ActiveTexture(GL_TEXTURE0);
</span>
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_start(entry->timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sc->needs_reset = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return gl_timer_measure(entry->timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mp_pass_perf dummy = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return dummy;
</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> // Maximum number of simultaneous query objects to keep around. Reducing this
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // number might cause rendering to block until the result of a previous query is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1179,6 +1194,7 @@ struct mp_pass_perf gl_sc_generate(struc
</span> // available
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1182,6 +1183,7 @@ void gl_timer_stop(struct gl_timer *time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QUERY_OBJECT_NUM 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct gl_timer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL *gl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLuint query[QUERY_OBJECT_NUM];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1292,6 +1308,7 @@ void gl_timer_stop(GL *gl)
</span> if (gl->EndQuery)
gl->EndQuery(GL_TIME_ELAPSED);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,176 +87,129 @@
</span> #include "common.h"
#include "math.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,6 +177,7 @@ void gl_sc_generate(struct gl_shader_cac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void gl_sc_reset(struct gl_shader_cache *sc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void gl_sc_unbind(struct gl_shader_cache *sc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,6 +179,7 @@ struct mpv_global;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void gl_sc_set_cache_dir(struct gl_shader_cache *sc, struct mpv_global *global,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *dir);
</span>
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
struct gl_timer;
struct gl_timer *gl_timer_create(GL *gl);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,6 +189,7 @@ int gl_timer_sample_count(struct gl_time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t gl_timer_last_us(struct gl_timer *timer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t gl_timer_avg_us(struct gl_timer *timer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t gl_timer_peak_us(struct gl_timer *timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,6 +187,7 @@ void gl_timer_free(struct gl_timer *time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void gl_timer_start(struct gl_timer *timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void gl_timer_stop(GL *gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mp_pass_perf gl_timer_measure(struct gl_timer *timer);
</span> +#endif
#define NUM_PBO_BUFFERS 3
--- video/out/opengl/video.c.orig
+++ video/out/opengl/video.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,9 +193,11 @@ struct gl_video {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLuint dither_texture;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int dither_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,8 +256,10 @@ struct gl_video {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct pass_info pass_redraw[PASS_INFO_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct pass_info *pass;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int pass_idx;
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
struct gl_timer *upload_timer;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gl_timer *render_timer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gl_timer *present_timer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct gl_timer *blit_timer;
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- struct mp_image_params real_image_params; // configured format
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct mp_image_params image_params; // texture format (mind hwdec case)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2467,7 +2469,9 @@ static void pass_render_frame(struct gl_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // start the render timer here. it will continue to the end of this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // function, to render the time needed to draw (excluding screen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // presentation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // hooks and saved textures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct saved_tex saved_tex[SHADER_MAX_SAVED];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2903,14 +2905,20 @@ void gl_video_render_frame(struct gl_vid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc.y1 = -p->vp_h - p->dst_rect.y0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc.y0 = -p->vp_h - p->dst_rect.y1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_start(p->render_timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_start(p->blit_timer);
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->use_linear = p->opts.linear_scaling || p->opts.sigmoid_upscaling;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_read_video(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2526,12 +2530,16 @@ static void pass_render_frame(struct gl_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_opt_hook_point(p, "SCALED", NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_stop(p->render_timer);
</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;'>- static void pass_draw_to_screen(struct gl_video *p, int fbo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl->BlitFramebuffer(rc.x0, rc.y0, rc.x1, rc.y1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc.x0, rc.y0, rc.x1, rc.y1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL_COLOR_BUFFER_BIT, GL_NEAREST);
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_start(p->present_timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_stop(gl);
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (p->dumb_mode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_render_frame_dumb(p, fbo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2566,7 +2574,9 @@ static void pass_draw_to_screen(struct g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_dither(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- finish_pass_direct(p, fbo, p->vp_w, p->vp_h, &p->dst_rect);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl->BindFramebuffer(GL_READ_FRAMEBUFFER, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl->BindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_stop(p->present_timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_record(p, gl_timer_measure(p->blit_timer));
</span> +#endif
<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;'>- // Draws an interpolate frame to fbo, based on the frame timing in t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2745,6 +2755,7 @@ static void gl_video_interpolate_frame(s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->frames_drawn += 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;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void timer_dbg(struct gl_video *p, const char *name, struct gl_timer *t)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (gl_timer_sample_count(t) > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2754,6 +2765,7 @@ static void timer_dbg(struct gl_video *p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int)gl_timer_peak_us(t));
</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;'>+@@ -2990,12 +2998,14 @@ static void frame_perf_data(struct pass_
</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;'>- // (fbo==0 makes BindFramebuffer select the screen backbuffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2896,10 +2908,12 @@ done:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->frames_rendered++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Report performance metrics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer_dbg(p, "upload", p->upload_timer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer_dbg(p, "render", p->render_timer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer_dbg(p, "present", p->present_timer);
</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;'>- // vp_w/vp_h is the implicit size of the target framebuffer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2924,6 +2938,7 @@ void gl_video_resize(struct gl_video *p,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->hwdec->driver->overlay_adjust(p->hwdec, vp_w, abs(vp_h), src, dst);
</span> }
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static struct voctrl_performance_entry gl_video_perfentry(struct gl_timer *t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void gl_video_perfdata(struct gl_video *p, struct voctrl_performance_data *out)
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return (struct voctrl_performance_entry) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2941,6 +2956,7 @@ struct voctrl_performance_data gl_video_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .present = gl_video_perfentry(p->present_timer),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *out = (struct voctrl_performance_data){0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame_perf_data(p->pass_fresh, &out->fresh);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame_perf_data(p->pass_redraw, &out->redraw);
</span> }
+#endif
// This assumes nv12, with textures set to GL_NEAREST filtering.
static void reinterleave_vdpau(struct gl_video *p, struct gl_hwdec_frame *frame)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3009,9 +3025,13 @@ static bool gl_video_upload_image(struct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (p->hwdec_active) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Hardware decoding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gl_hwdec_frame gl_frame = {{0}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3066,10 +3076,14 @@ static bool pass_upload_image(struct gl_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct gl_hwdec_frame gl_frame = {{{0}}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_describe(p, "map frame (hwdec)");
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
gl_timer_start(p->upload_timer);
+#endif
bool ok = p->hwdec->driver->map_frame(p->hwdec, vimg->mpi, &gl_frame) >= 0;
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_stop(p->upload_timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_stop(gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_record(p, gl_timer_measure(p->upload_timer));
</span> +#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> vimg->hwdec_mapped = true;
if (ok) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- struct mp_image layout = {0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3041,7 +3061,9 @@ static bool gl_video_upload_image(struct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Software decoding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3100,7 +3114,9 @@ static bool pass_upload_image(struct gl_
</span> assert(mpi->num_planes == p->plane_count);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_describe(p, "upload frame (swdec)");
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
gl_timer_start(p->upload_timer);
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> for (int n = 0; n < p->plane_count; n++) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3057,7 +3079,9 @@ static bool gl_video_upload_image(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct texplane *plane = &vimg->planes[n];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3113,8 +3129,10 @@ static bool pass_upload_image(struct gl_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0, 0, plane->w, plane->h);
</span> gl->BindTexture(plane->gl_target, 0);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> +#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_stop(p->upload_timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_stop(gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_record(p, gl_timer_measure(p->upload_timer));
</span> +#endif
return true;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3294,9 +3318,11 @@ static void init_gl(struct gl_video *p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl->BindFramebuffer(GL_FRAMEBUFFER, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3310,8 +3328,10 @@ static void init_gl(struct gl_video *p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (p->texture_16bit_depth > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MP_VERBOSE(p, "16 bit texture depth: %d.\n", p->texture_16bit_depth);
</span>
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- p->upload_timer = gl_timer_create(p->gl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->render_timer = gl_timer_create(p->gl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->present_timer = gl_timer_create(p->gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p->upload_timer = gl_timer_create(gl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p->blit_timer = gl_timer_create(gl);
</span> +#endif
debug_check_gl(p, "after init_gl");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3316,9 +3342,11 @@ void gl_video_uninit(struct gl_video *p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3331,8 +3351,10 @@ void gl_video_uninit(struct gl_video *p)
</span>
gl->DeleteTextures(1, &p->lut_3d_texture);
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
gl_timer_free(p->upload_timer);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_free(p->render_timer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_timer_free(p->present_timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_timer_free(p->blit_timer);
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpgl_osd_destroy(p->osd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < PASS_INFO_MAX; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ talloc_free(p->pass_fresh[i].desc.start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ talloc_free(p->pass_redraw[i].desc.start);
</span> --- video/out/opengl/video.h.orig
+++ video/out/opengl/video.h
@@ -20,6 +20,10 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,24 +223,24 @@
</span> #include "options/m_option.h"
#include "sub/osd.h"
#include "common.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,7 +157,9 @@ void gl_video_render_frame(struct gl_vid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,7 +160,9 @@ void gl_video_render_frame(struct gl_vid
</span> void gl_video_resize(struct gl_video *p, int vp_w, int vp_h,
struct mp_rect *src, struct mp_rect *dst,
struct mp_osd_res *osd);
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- struct voctrl_performance_data gl_video_perfdata(struct gl_video *p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void gl_video_perfdata(struct gl_video *p, struct voctrl_performance_data *out);
</span> +#endif
struct mp_csp_equalizer;
struct mp_csp_equalizer *gl_video_eq_ptr(struct gl_video *p);
void gl_video_eq_update(struct gl_video *p);
--- video/out/vo_opengl.c.orig
+++ video/out/vo_opengl.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,7 +339,9 @@ static int control(struct vo *vo, uint32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +311,9 @@ static int control(struct vo *vo, uint32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vo->want_redraw = true;
</span> return true;
case VOCTRL_PERFORMANCE_DATA:
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *(struct voctrl_performance_data *)data = gl_video_perfdata(p->renderer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_video_perfdata(p->renderer, (struct voctrl_performance_data *)data);
</span> +#endif
return true;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff b/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bc3d3b8..a311e89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> #include <libavutil/common.h>
#include "config.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,8 +114,10 @@ struct gl_priv {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,8 +85,10 @@ struct gl_priv {
</span> int last_pattern;
int matches, mismatches;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,26 +22,26 @@
</span> };
static void resize(struct gl_priv *p)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,11 +157,13 @@ static void draw_frame(struct vo *vo, st
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gl_priv *p = vo->priv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GL *gl = p->gl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,11 +130,13 @@ static void draw_frame(struct vo *vo, st
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpgl_start_frame(p->glctx);
</span>
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (gl->FenceSync && p->num_vsync_fences < p->opts->vsync_fences) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gl->FenceSync && p->num_vsync_fences < p->opts.vsync_fences) {
</span> GLsync fence = gl->FenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);;
if (fence)
p->vsync_fences[p->num_vsync_fences++] = fence;
}
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_video_render_frame(p->renderer, frame, gl->main_fb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_video_render_frame(p->renderer, frame, p->glctx->main_fb);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,11 +202,13 @@ static void flip_page(struct vo *vo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->opts->pattern[0] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,11 +175,13 @@ static void flip_page(struct vo *vo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p->opts.pattern[0] = 0;
</span> }
}
+#if !defined(__APPLE__) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- while (p->opts->vsync_fences > 0 && p->num_vsync_fences >= p->opts->vsync_fences) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (p->opts.vsync_fences > 0 && p->num_vsync_fences >= p->opts.vsync_fences) {
</span> gl->ClientWaitSync(p->vsync_fences[0], GL_SYNC_FLUSH_COMMANDS_BIT, 1e9);
gl->DeleteSync(p->vsync_fences[0]);
MP_TARRAY_REMOVE_AT(p->vsync_fences, p->num_vsync_fences, 0);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff b/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1ce92be..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- waftools/checks/custom.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ waftools/checks/custom.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,8 +112,7 @@ def check_cocoa(ctx, dependency_identifi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fragment = load_fragment('cocoa.m'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compile_filename = 'test.m',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- framework_name = ['Cocoa', 'IOKit', 'OpenGL', 'QuartzCore'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- includes = ctx.srcnode.abspath(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- linkflags = '-fobjc-arc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ includes = ctx.srcnode.abspath())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return fn(ctx, dependency_identifier)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-waftools_detections_compiler.py-support-older-GCC.diff b/multimedia/mpv/files/patch-waftools_detections_compiler.py-support-older-GCC.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..680c281
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-waftools_detections_compiler.py-support-older-GCC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- waftools/detections/compiler.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ waftools/detections/compiler.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,9 +41,7 @@ def __add_generic_flags__(ctx):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __add_gcc_flags__(ctx):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx.env.CFLAGS += ["-Wall", "-Wundef", "-Wmissing-prototypes", "-Wshadow",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-Wno-switch", "-Wparentheses", "-Wpointer-arith",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "-Wno-pointer-sign",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # GCC bug 66425
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "-Wno-unused-result"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-Wno-pointer-sign"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __add_clang_flags__(ctx):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-wscript-support-older-GCC.diff b/multimedia/mpv/files/patch-wscript-support-older-GCC.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..71387bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/patch-wscript-support-older-GCC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wscript.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wscript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1000,6 +1000,10 @@ def configure(ctx):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while re.match('\$\{([^}]+)\}', ctx.env[varname]):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx.env[varname] = Utils.subst_vars(ctx.env[varname], ctx.env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Support older GCC versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ctx.env.CCLNK_TGT_F = ['-o', '']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ctx.env.CXXLNK_TGT_F = ['-o', '']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx.parse_dependencies(build_options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx.parse_dependencies(main_dependencies)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx.parse_dependencies(audio_output_features)
</span></pre><pre style='margin:0'>
</pre>