On 2016-04-30 22:18:28 +0300, Martin Storsjö wrote:
> On Sat, 30 Apr 2016, Janne Grunau wrote:
>
> >---
> >configure | 8 ++++----
> >1 file changed, 4 insertions(+), 4 deletions(-)
> >
> >diff --git a/configure b/configure
> >index 9e3f230..9ffa471 100755
> >--- a/configure
> >+++ b/configure
> >@@ -2167,6 +2167,7 @@ nvenc_deps_any="dlopen LoadLibrary"
> >nvenc_extralibs='$ldl'
> >omx_deps="dlopen pthreads"
> >omx_extralibs='$ldl'
> >+omx_rpi_select="omx"
> >qsvdec_select="qsv"
> >qsvenc_select="qsv"
> >vaapi_encode_deps="vaapi"
> >@@ -4622,11 +4623,10 @@ enabled libx265 && require_pkg_config x265
> >x265.h x265_api_get &&
> > die "ERROR: libx265 version must be >= 57."; }
> >enabled libxavs && require libxavs xavs.h xavs_encoder_encode
> >-lxavs
> >enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
> >-enabled omx_rpi && enable omx
> >+# add default raspbian include dir for Openmax IL header
>
> OpenMAX IL
fixed locally
> >+enabled omx_rpi && check_header OMX_Core.h
> >-isystem/opt/vc/include/IL &&
> >+ add_cflags -isystem/opt/vc/include/IL
> >enabled omx && { check_header OMX_Core.h ||
> >- { ! enabled cross_compile && enabled
> >omx_rpi && {
> >- add_cflags -isystem/opt/vc/include/IL ;
> >}
> >- check_header OMX_Core.h ; } ||
>
> I guess this is ok. I kinda intentionally wanted it to not even try
> to look there unless it fails without (and only if cross_compile is
> set), but this should in practice be fine as well.
Adding an include path seemed innocent enough so I decided to drop the
check if OMX_Core.h is available without it. I will add it though since
-isystem is searched before the standard system include path
> (The pathological
> case where it fails is if you are cross compiling, but happen to
> have /opt/vc present but don't want to use it. But even then, normal
> -I should take precedence, right?)
-I is searched before -isystem but I assumed from the commit message for
omx_rpi that the headers are compatible anyway.
I'll send an updated patch.
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
