diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2018-05-18 10:55:21 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2019-04-12 14:29:19 +0530 |
| commit | d7c589122b45d4f7735d561a028739d4e92f4805 (patch) | |
| tree | 6dc1b3f02c7f6a317f8bf47a2a93f37dd483f7bd | |
| parent | 9b68aaeeb5c80e2ebb9aeb638c13ca46c5676e14 (diff) | |
| download | gst-omx-d7c589122b45d4f7735d561a028739d4e92f4805.tar.gz | |
testegl: properly detect and use rpi specific libs
Use pkg-config to detect and configure rpi specific libs used in testegl
rather than hardcoding their flags.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | examples/egl/Makefile.am | 8 | ||||
| -rw-r--r-- | examples/egl/meson.build | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cb4071a..381928d 100644 --- a/configure.ac +++ b/configure.ac @@ -253,6 +253,10 @@ if test "x$ac_cv_omx_target" = "xtizonia"; then AC_SUBST(TIZONIA_LIBDIR) fi +if test "x$ac_cv_omx_target" = "xrpi"; then + PKG_CHECK_MODULES([BRCMEGL], [brcmegl]) +fi + AC_ARG_WITH([omx-header-path], AS_HELP_STRING([--with-omx-header-path],[path of external OpenMAX IL header files]), [omx_header_path="$withval"], [omx_header_path="none"]) diff --git a/examples/egl/Makefile.am b/examples/egl/Makefile.am index 3c3fe3a..ed8d4ed 100644 --- a/examples/egl/Makefile.am +++ b/examples/egl/Makefile.am @@ -18,6 +18,7 @@ testegl_LDADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(GST_GL_LIBS) \ + $(BRCMEGL_LIBS) \ -lm if HAVE_GLES2 @@ -32,12 +33,9 @@ if HAVE_X11 testegl_LDADD += $(X11_LIBS) endif -if USE_OMX_TARGET_RPI -testegl_LDADD += -lbcm_host -endif - testegl_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ - $(GST_GL_CFLAGS) + $(GST_GL_CFLAGS) \ + $(BRCMEGL_CFLAGS) diff --git a/examples/egl/meson.build b/examples/egl/meson.build index fabbc65..5ba6fc4 100644 --- a/examples/egl/meson.build +++ b/examples/egl/meson.build @@ -16,6 +16,11 @@ if x11_dep.found() or omx_target == 'rpi' gles2_dep = cc.find_library ('GLESv2') endif + if omx_target == 'rpi' + brcmegl_dep = dependency('brcmegl', required : true) + optional_deps += brcmegl_dep + endif + executable ('testegl', sources : egl_sources, c_args : gst_omx_args, |