Skip to content
Snippets Groups Projects
Commit 7c71cd83 authored by Maxime Chapelet's avatar Maxime Chapelet Committed by Steve Lhomme
Browse files

build: fix samplebufferdisplay linking

Add explicit dependencies to CoreVideo and CoreGraphics and fix UI framework dependency for meson
parent cba3cbaa
No related branches found
No related tags found
1 merge request!4271build: fix samplebufferdisplay vout linking
Pipeline #386752 passed with stages
in 23 minutes and 50 seconds
......@@ -79,10 +79,10 @@ libsamplebufferdisplay_plugin_la_SOURCES = video_output/apple/VLCSampleBufferDis
libsamplebufferdisplay_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
if HAVE_OSX
libsamplebufferdisplay_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
-Wl,-framework,AVFoundation,-framework,AVKit,-framework,Cocoa,-framework,CoreMedia,-framework,QuartzCore
-Wl,-framework,AVFoundation,-framework,AVKit,-framework,Cocoa,-framework,CoreMedia,-framework,QuartzCore,-framework,CoreGraphics,-framework,CoreVideo
else
libsamplebufferdisplay_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
-Wl,-framework,AVFoundation,-framework,AVKit,-framework,UIKit,-framework,CoreMedia,-framework,QuartzCore
-Wl,-framework,AVFoundation,-framework,AVKit,-framework,UIKit,-framework,CoreMedia,-framework,QuartzCore,-framework,CoreGraphics,-framework,CoreVideo
endif
vout_LTLIBRARIES += libsamplebufferdisplay_plugin.la
endif
......
......@@ -20,6 +20,12 @@ vlc_modules += {
'dependencies' : [foundation_dep, corefoundation_dep, corevideo_dep, darwingl_dep],
}
if have_osx
uifwk_dep = cocoa_dep
else
uifwk_dep = uikit_dep
endif
vlc_modules += {
'name' : 'samplebufferdisplay',
'sources' : files(
......@@ -28,7 +34,7 @@ vlc_modules += {
'../../codec/vt_utils.h'
),
'objc_args' : ['-fobjc-arc'],
'dependencies' : [avfoundation_dep, avkit_dep, cocoa_dep, coremedia_dep, quartz_dep],
'dependencies' : [avfoundation_dep, avkit_dep, uifwk_dep, coremedia_dep, quartz_dep, corevideo_dep, coregraphics_dep],
}
if have_ios or have_tvos
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment