[vlc-commits] configure: add header check for VideoToolbox

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Sep 11 12:39:36 2015 +0200| [e503f5b00f04c42706312c2a45e3376556dc996c] | committer: Felix Paul Kühne

configure: add header check for VideoToolbox

This fixes compilation for Darwin platforms without this framework

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e503f5b00f04c42706312c2a45e3376556dc996c
---

 configure.ac                     |    7 +++++++
 modules/codec/Makefile.am        |    5 ++---
 modules/video_chroma/Makefile.am |    5 ++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3089154..55513bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3831,6 +3831,13 @@ then
 fi
 
 dnl
+dnl  VideoToolbox plugins
+AC_CHECK_HEADERS(VideoToolbox/VideoToolbox.h, [
+    VLC_ADD_PLUGIN([videotoolbox])
+    VLC_ADD_PLUGIN([cvpx_i420])
+  ])
+
+dnl
 dnl  ncurses module
 dnl
 AC_ARG_ENABLE(ncurses,
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 0fed892..b66da01 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -288,9 +288,8 @@ codec_LTLIBRARIES += $(LTLIBvorbis)
 libvideotoolbox_plugin_la_SOURCES = video_chroma/copy.c video_chroma/copy.h packetizer/h264_nal.c packetizer/h264_nal.h codec/videotoolbox.m
 libvideotoolbox_plugin_la_CFLAGS = $(AM_CFLAGS) -fobjc-arc
 libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
-if HAVE_DARWIN
-codec_LTLIBRARIES += libvideotoolbox_plugin.la
-endif
+EXTRA_LTLIBRARIES += libvideotoolbox_plugin.la
+codec_LTLIBRARIES += $(LTLIBvideotoolbox)
 
 ### FFmpeg/libav ###
 
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index 9c7831b..fde545d 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -116,8 +116,7 @@ chroma_LTLIBRARIES += \
 	libd3d11_surface_plugin.la
 endif
 
-if HAVE_DARWIN
 libcvpx_i420_plugin_la_SOURCES = video_chroma/cvpx_i420.c video_chroma/copy.c video_chroma/copy.h
 libcvpx_i420_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
-chroma_LTLIBRARIES += libcvpx_i420_plugin.la
-endif
+EXTRA_LTLIBRARIES += libcvpx_i420_plugin.la
+chroma_LTLIBRARIES += $(LTLIBcvpx_i420)