diff options
| author | Dan Kegel <dank@kegel.com> | 2019-03-19 16:22:29 +0300 |
|---|---|---|
| committer | Dan Kegel <dank@kegel.com> | 2019-04-09 02:27:13 +0300 |
| commit | dfe1f6d803aa24094f53de1d7434f80767ce3056 (patch) | |
| tree | 59b0c90e11f01b5c90e1469b7f905fe282ae893c /sys/osxvideo | |
| parent | a8ea9f0d05fff9181cba88561840c4f1d66fe321 (diff) | |
osxvideo: fix mac os 10.14 build
lockFocusIfCanDraw is deprecated in mac os 10.14. Apple suggests a
different way to do what that does, but for now, just suppress the deprecation.
There's no way to disable just that deprecation, so shut them all down.
OpenGL is also deprecated in mac os 10.14. There is a gentle way to
turn off just those deprecations (GL_SILENCE_DEPRECATION), but since
this commit turns them all off, that's moot.
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/577
Diffstat (limited to 'sys/osxvideo')
| -rw-r--r-- | sys/osxvideo/Makefile.am | 1 | ||||
| -rw-r--r-- | sys/osxvideo/meson.build | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sys/osxvideo/Makefile.am b/sys/osxvideo/Makefile.am index a9a3d765b..597ebda0b 100644 --- a/sys/osxvideo/Makefile.am +++ b/sys/osxvideo/Makefile.am @@ -5,6 +5,7 @@ libgstosxvideo_la_SOURCES = osxvideosink.m cocoawindow.m libgstosxvideo_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) libgstosxvideo_la_OBJCFLAGS = $(GST_OBJCFLAGS) $(GST_BASE_CFLAGS) \ + -Wno-deprecated-declarations \ $(GST_PLUGINS_BASE_CFLAGS) libgstosxvideo_la_LIBADD = \ $(GST_LIBS) \ diff --git a/sys/osxvideo/meson.build b/sys/osxvideo/meson.build index 9011610bb..0f6ec1af7 100644 --- a/sys/osxvideo/meson.build +++ b/sys/osxvideo/meson.build @@ -10,9 +10,15 @@ osxvideo_cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], required have_objc = add_languages('objc', required : get_option('osxvideo')) if have_objc and osxvideo_opengl_dep.found() and osxvideo_cocoa_dep.found() + + # lockFocusIfCanDraw and OpenGL are deprecated in mac os 10.14 + # Could also have used GL_SILENCE_DEPRECATION for the latter + osxvideo_gst_plugins_good_objc_args = gst_plugins_good_args + ['-Wno-deprecated-declarations'] + gstosxvideo = library('gstosxvideo', osxvideo_sources, c_args : gst_plugins_good_args, + objc_args : osxvideo_gst_plugins_good_objc_args, include_directories : [configinc], dependencies : [gstvideo_dep, osxvideo_opengl_dep, osxvideo_cocoa_dep], install : true, |