[vlc-commits] vout/caopengllayer: fix build with macOS SDKs < 10.14

Marvin Scholz git at videolan.org
Mon Feb 24 18:35:32 CET 2020


vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon Feb 24 18:08:46 2020 +0100| [baf1b28219f9803a68a384b6fbdb2975c01dbd8b] | committer: Marvin Scholz

vout/caopengllayer: fix build with macOS SDKs < 10.14

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=baf1b28219f9803a68a384b6fbdb2975c01dbd8b
---

 modules/video_output/caopengllayer.m | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 7681a9e945..7a4c1ee819 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -86,7 +86,14 @@ static int Control          (vout_display_t *vd, int query, va_list ap);
 /**
  * View subclass which is backed by a VLCCAOpenGLLayer
  */
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101400
+// macOS SDKs lower than 10.14 did not have a NSViewLayerContentScaleDelegate
+// protocol definition, but its not needed, it will work fine without it as the
+// delegate method even existed before, just not the protocol.
+ at interface VLCVideoLayerView : NSView <CALayerDelegate>
+#else
 @interface VLCVideoLayerView : NSView <CALayerDelegate, NSViewLayerContentScaleDelegate>
+#endif
 {
     vout_display_t *_vlc_vd; // All accesses to this must be @synchronized(self)
 }



More information about the vlc-commits mailing list