Merge pull request #2766 from lrusak/v4l2

some v4l2 and libdrm updates

config/graphic

@@ -20,6 +20,7 @@ get_graphicdrivers() {
   COMPOSITE_SUPPORT="no"
   VDPAU_SUPPORT="no"
   VAAPI_SUPPORT="no"
+  V4L2_SUPPORT="no"
 
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
     GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
@@ -93,6 +94,21 @@ get_graphicdrivers() {
 
   if listcontains "$GRAPHIC_DRIVERS" "vc4"; then
     GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
+  if listcontains "$GRAPHIC_DRIVERS" "freedreno"; then
+    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,freedreno"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
+  if listcontains "$GRAPHIC_DRIVERS" "etnaviv"; then
+    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,etnaviv,imx"
+    V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"
   fi

packages/graphics/libdrm/package.mk

@@ -35,9 +35,7 @@ get_graphicdrivers
 PKG_DRM_CONFIG="-Dnouveau=false \
                 -Domap=false \
                 -Dexynos=false \
-                -Dfreedreno=false \
+                -Dtegra=false"
-                -Dtegra=false \
-                -Detnaviv=false"
 
 listcontains "$GRAPHIC_DRIVERS" "(i915|i965)" &&
   PKG_DRM_CONFIG+=" -Dintel=true" || PKG_DRM_CONFIG+=" -Dintel=false"
@@ -54,6 +52,12 @@ listcontains "$GRAPHIC_DRIVERS" "vmware" &&
 listcontains "$GRAPHIC_DRIVERS" "vc4" &&
   PKG_DRM_CONFIG+=" -Dvc4=true" || PKG_DRM_CONFIG+=" -Dvc4=false"
 
+listcontains "$GRAPHIC_DRIVERS" "freedreno" &&
+  PKG_DRM_CONFIG+=" -Dfreedreno=true" || PKG_DRM_CONFIG+=" -Dfreedreno=false"
+
+listcontains "$GRAPHIC_DRIVERS" "etnaviv" &&
+  PKG_DRM_CONFIG+=" -Detnaviv=true" || PKG_DRM_CONFIG+=" -Detnaviv=false"
+
 PKG_MESON_OPTS_TARGET="-Dlibkms=false \
                        $PKG_DRM_CONFIG \
                        -Dcairo-tests=false \

packages/multimedia/ffmpeg/package.mk

@@ -35,6 +35,13 @@ PKG_BUILD_FLAGS="-gold"
 # Dependencies
 get_graphicdrivers
 
+if [ "$V4L2_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libdrm"
+  PKG_FFMPEG_V4L2="--enable-v4l2_m2m --enable-libdrm"
+else
+  PKG_FFMPEG_V4L2="--disable-v4l2_m2m"
+fi
+
 if [ "$VAAPI_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva"
   PKG_FFMPEG_VAAPI="--enable-vaapi"
@@ -154,6 +161,7 @@ configure_target() {
               --enable-mdct \
               --enable-rdft \
               --disable-crystalhd \
+              $PKG_FFMPEG_V4L2 \
               $PKG_FFMPEG_VAAPI \
               $PKG_FFMPEG_VDPAU \
               $PKG_FFMPEG_RPI \