[vlc-devel] [PATCH] Fix mmal include paths

[Julian Scheel]

Am 23.05.2014 10:36, schrieb Petri Hintukainen:
> ---
>   configure.ac | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index cd20f82..7ae5cf1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2155,12 +2155,12 @@ AC_ARG_ENABLE(mmal-codec,
>   if test "${enable_mmal_codec}" != "no"; then
>     VLC_SAVE_FLAGS
>     LDFLAGS="${LDFLAGS} -L/opt/vc/lib"
> -  CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vcos/linux"
> +  CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
>     AC_CHECK_HEADERS(interface/mmal/mmal.h,
>       [ AC_CHECK_LIB(bcm_host, bcm_host_init, [
>           VLC_ADD_PLUGIN([mmal_codec])
>           VLC_ADD_LDFLAGS([mmal_codec],[ -L/opt/vc/lib ])
> -        VLC_ADD_CFLAGS([mmal_codec],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vcos/linux ])
> +        VLC_ADD_CFLAGS([mmal_codec],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
>           VLC_ADD_LIBS([mmal_codec],[ -lbcm_host -lmmal ]) ], [
>             AS_IF([test "${enable_mmal_codec}" = "yes"],
>               [ AC_MSG_ERROR([Cannot find bcm library...]) ],
> @@ -3477,12 +3477,12 @@ AC_ARG_ENABLE(mmal-vout,
>   if test "${enable_mmal_vout}" != "no"; then
>     VLC_SAVE_FLAGS
>     LDFLAGS="${LDFLAGS} -L/opt/vc/lib"
> -  CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vcos/linux"
> +  CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
>     AC_CHECK_HEADERS(interface/mmal/mmal.h,
>       [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [
>           VLC_ADD_PLUGIN([mmal_vout])
>           VLC_ADD_LDFLAGS([mmal_vout],[ -L/opt/vc/lib ])
> -        VLC_ADD_CFLAGS([mmal_vout],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vcos/linux ])
> +        VLC_ADD_CFLAGS([mmal_vout],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
>           VLC_ADD_LIBS([mmal_vout],[ -lbcm_host -lmmal ]) ], [
>             AS_IF([test "${enable_mmal_vout}" = "yes"],
>               [ AC_MSG_ERROR([Cannot find bcm library...]) ],
>

Thanks for the patch, paths were indeed wrong for common RPi distributions.
Please merge.

-Julian