[vlc-devel] [PATCH 1/4] mmal: update the code from the one actually used in Raspbian

[Rémi Denis-Courmont]

Le perjantaina 17. tammikuuta 2020, 18.00.55 EET Steve Lhomme a écrit :
> From: John Cox <jc at kynesim.co.uk>
> 
> Tested with basic video playback on a RPI 3B+
> 
> This is the code from the Raspbian patch ported to the 4.0 architecture.
> 
> Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
> ---
>  modules/hw/mmal/Makefile.am    |    7 +-
>  modules/hw/mmal/codec.c        |  784 +++++++++--------
>  modules/hw/mmal/deinterlace.c  |  803 +++++++++--------
>  modules/hw/mmal/mmal_picture.c | 1023 +++++++++++++++++++++-
>  modules/hw/mmal/mmal_picture.h |  123 ++-
>  modules/hw/mmal/subpic.c       |  229 +++++
>  modules/hw/mmal/subpic.h       |   52 ++
>  modules/hw/mmal/vout.c         | 1492 +++++++++++++++++++-------------
>  8 files changed, 3148 insertions(+), 1365 deletions(-)
>  create mode 100644 modules/hw/mmal/subpic.c
>  create mode 100644 modules/hw/mmal/subpic.h
> 
> diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am
> index b921f38537d..f6bb51b3ff0 100644
> --- a/modules/hw/mmal/Makefile.am
> +++ b/modules/hw/mmal/Makefile.am
> @@ -4,13 +4,16 @@ mmaldir = $(pluginsdir)/mmal
>  AM_CFLAGS += $(CFLAGS_mmal)
>  AM_LDFLAGS += -rpath '$(mmaldir)' $(LDFLAGS_mmal)
> 
> -libmmal_vout_plugin_la_SOURCES = vout.c mmal_picture.c mmal_picture.h
> +libmmal_vout_plugin_la_SOURCES = vout.c subpic.c subpic.h mmal_picture.c
> mmal_picture.h libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS)
> +if ENABLE_QT
> +libmmal_vout_plugin_la_CFLAGS += -DHAVE_QT
> +endif

This can't be right. HAVE_QT means that Qt is available at build time, but 
since the plugin is not linking with Qt, the conditional can't have any valid 
bearing.

-- 
Реми Дёни-Курмон
http://www.remlab.net/