From a0e7fc79e3ddfb79cc2fe6cca01e4006560ff90a Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 17 Oct 2017 12:11:04 +0200 Subject: [PATCH] check if Allegro headers are present when building zynqultrascaleplus The Zynq UltraScale+ uses a custom version of OMX implementing several 3rd party extensions. Make sure those are present when building this target. https://bugzilla.gnome.org/show_bug.cgi?id=788064 --- configure.ac | 4 ++++ meson.build | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index fac333daa6..1b65c1f67d 100644 --- a/configure.ac +++ b/configure.ac @@ -296,6 +296,10 @@ AC_CHECK_DECLS([OMX_VIDEO_CodingHEVC], ], [[$VIDEO_HEADERS]]) AM_CONDITIONAL(HAVE_HEVC, test "x$HAVE_HEVC" = "xyes") +if test "x$ac_cv_omx_target" = "xzynqultrascaleplus"; then + AC_CHECK_HEADER([OMX_Allegro.h], [], [AC_ERROR([Need Allegro OMX headers to build for Zynq UltraScale+. Use --with-omx-header-path= argument to specify the path of those headers.])], [AC_INCLUDES_DEFAULT]) +fi + dnl *** set variables based on configure arguments *** dnl set license and copyright notice diff --git a/meson.build b/meson.build index 5c6425bace..6656dbc0b4 100644 --- a/meson.build +++ b/meson.build @@ -267,6 +267,13 @@ elif omx_target == 'bellagio' cdata.set('USE_OMX_TARGET_BELLAGIO', 1) elif omx_target == 'zynqultrascaleplus' cdata.set('USE_OMX_TARGET_ZYNQ_USCALE_PLUS', 1) + have_allegro_header = cc.has_header ( + 'OMX_Allegro.h', + args : gst_omx_args, + required : false) + if not have_allegro_header + error ('Need Allegro OMX headers to build for Zynq UltraScale+. Use with_omx_header_path option to specify the path of those headers.') + endif elif omx_target == 'tizonia' cdata.set('USE_OMX_TARGET_TIZONIA', 1) tizil_dep = dependency('tizilheaders', version : tizil_req)