vlc | branch: master | Alexandre Janniaux <[email protected]> | Tue Feb 2 16:26:16 2021 +0100| [c82c99522446be5f50296721d5716ae604eed426] | committer: Alexandre Janniaux
video_filter: Makefile: fix ci_filters's LDFLAGS The libci_filter_plugin_la_LDFLAGS must always contains the value of $(AM_LDFLAGS) since it is at least defined once. Otherwise, automake won't automatically define it to $(AM_LDFLAGS) $(LDFLAGS) and the plugin won't be built correctly (ie, built as a convenience library because of the lack of -rpath definition in LDFLAGS). In addition, the frameworks were not correctly set for iOS, which was not a problem in static build because there is no linkage, nor in dynamic build before because the plugin was built as a convenience library, thus not linked nor installed to the device with the bundle script. Since the frameworks are mostly common between MacOSX and iOS, just add the corresponding OpenGL framework for each target, and define the other frameworks out of any automake condition. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c82c99522446be5f50296721d5716ae604eed426 --- modules/video_filter/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am index d265d44f2f..1c856b393b 100644 --- a/modules/video_filter/Makefile.am +++ b/modules/video_filter/Makefile.am @@ -111,14 +111,16 @@ video_filter_LTLIBRARIES = \ # macOS / iOS hardware video filters libci_filters_plugin_la_SOURCES = video_filter/ci_filters.m codec/vt_utils.c codec/vt_utils.h -if HAVE_OSX libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage \ - -Wl,-framework,CoreVideo -Wl,-framework,OpenGL + -Wl,-framework,CoreVideo +if HAVE_OSX +libci_filters_plugin_la_LDFLAGS += -Wl,-framework,OpenGL video_filter_LTLIBRARIES += libci_filters_plugin.la endif if HAVE_IOS +libci_filters_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES video_filter_LTLIBRARIES += libci_filters_plugin.la endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
