[vlc-commits] [Git][videolan/vlc][master] build: fix samplebufferdisplay linking

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
7c71cd83 by Maxime Chapelet at 2023-09-19T10:15:52+00:00
build: fix samplebufferdisplay linking

Add explicit dependencies to CoreVideo and CoreGraphics and fix UI framework dependency for meson

- - - - -


2 changed files:

- modules/video_output/Makefile.am
- modules/video_output/apple/meson.build


Changes:

=====================================
modules/video_output/Makefile.am
=====================================
@@ -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


=====================================
modules/video_output/apple/meson.build
=====================================
@@ -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



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7c71cd835672b16a3394ff0b62f84332c67700b7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7c71cd835672b16a3394ff0b62f84332c67700b7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance