mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxvideo: fix mac os 10.14 build

Browse source 
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
This commit is contained in:
Dan Kegel 2019-03-19 06:22:29 -07:00
parent a8ea9f0d05
commit dfe1f6d803
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/osxvideo/Makefile.am
View file

@ -5,6 +5,7 @@ libgstosxvideo_la_SOURCES = osxvideosink.m cocoawindow.m
libgstosxvideo_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ libgstosxvideo_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstosxvideo_la_OBJCFLAGS = $(GST_OBJCFLAGS) $(GST_BASE_CFLAGS) \ libgstosxvideo_la_OBJCFLAGS = $(GST_OBJCFLAGS) $(GST_BASE_CFLAGS) \
-Wno-deprecated-declarations \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstosxvideo_la_LIBADD = \ libgstosxvideo_la_LIBADD = \
$(GST_LIBS) \ $(GST_LIBS) \

6
sys/osxvideo/meson.build
View file

@ -10,9 +10,15 @@ osxvideo_cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], required
have_objc = add_languages('objc', required : get_option('osxvideo')) have_objc = add_languages('objc', required : get_option('osxvideo'))
if have_objc and osxvideo_opengl_dep.found() and osxvideo_cocoa_dep.found() 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', gstosxvideo = library('gstosxvideo',
osxvideo_sources, osxvideo_sources,
c_args : gst_plugins_good_args, c_args : gst_plugins_good_args,
objc_args : osxvideo_gst_plugins_good_objc_args,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstvideo_dep, osxvideo_opengl_dep, osxvideo_cocoa_dep], dependencies : [gstvideo_dep, osxvideo_opengl_dep, osxvideo_cocoa_dep],
install : true, install : true,