From 1d862db9c1975bfec80ab00c19d4e2f9c2ade735 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Thu, 10 Dec 2015 14:41:44 +1100 Subject: [PATCH] libgstgl: gstglcontext_cocoa: kCGLPFAStereo has been deprecated in 10.11 Also since the version scheme has changed (to include the micro number) since 10.10, use the MAC_OS_X_VERSION_* macro to avoid confusion. --- gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m index bde90f1c6a..ac1e0d6928 100644 --- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m @@ -90,7 +90,6 @@ struct pixel_attr static struct pixel_attr pixel_attrs[] = { {kCGLPFAAllRenderers, "All Renderers"}, {kCGLPFADoubleBuffer, "Double Buffered"}, - {kCGLPFAStereo, "Stereo"}, {kCGLPFAAuxBuffers, "Aux Buffers"}, {kCGLPFAColorSize, "Color Size"}, {kCGLPFAAlphaSize, "Alpha Size"}, @@ -115,20 +114,23 @@ static struct pixel_attr pixel_attrs[] = { {kCGLPFAAcceleratedCompute, "Accelerated Compute"}, {kCGLPFAOpenGLProfile, "OpenGL Profile"}, {kCGLPFAVirtualScreenCount, "Virtual Screen Count"}, -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090 +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11 + {kCGLPFAStereo, "Stereo"}, +#endif +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9 {kCGLPFACompliant, "Compliant"}, {kCGLPFARemotePBuffer, "Remote PBuffer"}, {kCGLPFASingleRenderer, "Single Renderer"}, {kCGLPFAWindow, "Window"}, #endif -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 // {kCGLPFAOffScreen, "Off Screen"}, // {kCGLPFAPBuffer, "PBuffer"}, #endif -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 // {kCGLPFAFullScreen, "Full Screen"}, #endif -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 // {kCGLPFAMPSafe, "MP Safe"}, // {kCGLPFAMultiScreen, "Multi Screen"}, // {kCGLPFARobust, "Robust"},