From bd90c3657cff52227e1e42c6ea3f67b478c1a9d0 Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Wed, 5 Oct 2016 14:21:51 -0400 Subject: [PATCH] build: fix v4l2 build with system installed ffmpeg Missing ffmpeg/libav build flags in v4l2 Makefile. This fix the build of this last when deps are installed on system (i.e. using contrib, where the path doesn't contain the implementation name). Change-Id: I966e501ddfdeba95a87ff89ee77faa4938ebe15d Tuleap: #1058 --- src/media/video/v4l2/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/media/video/v4l2/Makefile.am b/src/media/video/v4l2/Makefile.am index 3c3626d83a..fae0dd59d4 100644 --- a/src/media/video/v4l2/Makefile.am +++ b/src/media/video/v4l2/Makefile.am @@ -10,5 +10,8 @@ if RING_ACCEL libv4l2_la_SOURCES += vaapi.h vaapi.cpp endif -AM_CXXFLAGS = @UDEV_CFLAGS@ @LIBVA_CFLAGS@ @LIBVA_DRM_CFLAGS@ @LIBVA_X11_CFLAGS@ -libv4l2_la_LIBADD = @UDEV_LIBS@ @X11_LIBS@ @LIBVA_LIBS@ @LIBVA_DRM_LIBS@ @LIBVA_X11_LIBS@ +AM_CXXFLAGS = @LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ +AM_CXXFLAGS += @UDEV_CFLAGS@ @LIBVA_CFLAGS@ @LIBVA_DRM_CFLAGS@ @LIBVA_X11_CFLAGS@ + +libv4l2_la_LIBADD = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ +libv4l2_la_LIBADD += @UDEV_LIBS@ @X11_LIBS@ @LIBVA_LIBS@ @LIBVA_DRM_LIBS@ @LIBVA_X11_LIBS@ -- GitLab