On Sat, Dec 03, 2016 at 12:33:04PM +0200, Martin Storsjö wrote:
> On Sat, 3 Dec 2016, Diego Biurrun wrote:
> >--- a/configure
> >+++ b/configure
> >@@ -4677,14 +4677,12 @@ enabled libx265 && require_pkg_config x265
> >x265.h x265_api_get &&
> >enabled libxavs && require libxavs "stdint.h xavs.h"
> >xavs_encoder_encode -lxavs
> >enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
> >-enabled mmal && { check_lib interface/mmal/mmal.h
> >mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
> >- { ! enabled cross_compile && {
> >- add_cflags -isystem/opt/vc/include/
> >-isystem/opt/vc/include/interface/vmcs_host/linux
> >-isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline ;
> >- add_extralibs -L/opt/vc/lib/
> >-lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ;
> >- check_lib interface/mmal/mmal.h
> >mmal_port_connect ; }
> >- check_lib interface/mmal/mmal.h
> >mmal_port_connect ; } ||
> >- die "ERROR: mmal not found"; }
> >-enabled mmal && check_func_headers interface/mmal/mmal.h
> >"MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"
> >+enabled mmal && { { ! enabled cross_compile &&
> >+ add_cflags -isystem/opt/vc/include/
> >-isystem/opt/vc/include/interface/vmcs_host/linux
> >-isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
> >+ add_ldflags -L/opt/vc/lib/ ; }
> >+ check_lib interface/mmal/mmal.h
> >mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
> >+ die "ERROR: mmal not found"; } &&
> >+ check_func_headers interface/mmal/mmal.h
> >"MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"
> >enabled omx && { check_header OMX_Core.h || die "ERROR:
> >OpenMAX IL headers not found"; }
> >enabled omx_rpi && { ! enabled cross_compile && add_cflags
> >-isystem/opt/vc/include/IL
> > check_header OMX_Core.h || die "ERROR:
> > OpenMAX IL headers not found"; }
> >--
> >2.1.4
>
> So, previously this first tried to check for the headers/libs in the
> existing include paths, before trying to add the /opt/vc/include paths (for
> non-cross builds) and trying again.
>
> Now for a non-cross build, it'd hardcode adding /opt/vc/include paths even
> if the headers would be found in the existing include path.
OK, it was a tad hard for me to be sure what the original intention was.
(Note that it redundantly checks twice after setting the flags.)
It should be one check before and one after setting the flags?
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
