From cf8aaeab5bacca7f7f117a5251c1d8dc04af8b99 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 3 Nov 2017 07:38:53 -0700 Subject: [PATCH 1/7] ffmpeg: add v4l2 support --- packages/multimedia/ffmpeg/package.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 9086882a49..5270d2be36 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/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 \ From 8c24c7823195387195dadc71025642b9d3be3d35 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 10 Jun 2018 21:54:12 -0700 Subject: [PATCH 2/7] config/graphic: add default value for V4L2_SUPPORT --- config/graphic | 1 + 1 file changed, 1 insertion(+) diff --git a/config/graphic b/config/graphic index 4af039f6e4..3ed20bb11d 100644 --- a/config/graphic +++ b/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" From 42b160894f814ed84c1a82e1b46691db33d6ba59 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 10 Jun 2018 21:54:30 -0700 Subject: [PATCH 3/7] config/graphic: add V4L2_SUPPORT for vc4 --- config/graphic | 1 + 1 file changed, 1 insertion(+) diff --git a/config/graphic b/config/graphic index 3ed20bb11d..461b9e1fb0 100644 --- a/config/graphic +++ b/config/graphic @@ -94,6 +94,7 @@ get_graphicdrivers() { if listcontains "$GRAPHIC_DRIVERS" "vc4"; then GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4" + V4L2_SUPPORT="yes" VAAPI_SUPPORT="no" VDPAU_SUPPORT="no" fi From bc6edc4feda1895a51d58df29ba3f6991c04d9e7 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 10 Jun 2018 21:55:10 -0700 Subject: [PATCH 4/7] config/graphic: add support for freedreno --- config/graphic | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/graphic b/config/graphic index 461b9e1fb0..55c64a50e0 100644 --- a/config/graphic +++ b/config/graphic @@ -99,6 +99,13 @@ get_graphicdrivers() { 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 + # remove leading comma if present [[ $GALLIUM_DRIVERS =~ ^, ]] && GALLIUM_DRIVERS="${GALLIUM_DRIVERS:1}" [[ $DRI_DRIVERS =~ ^, ]] && DRI_DRIVERS="${DRI_DRIVERS:1}" From 487df8b8b0b421e9bd63b71a301f92aa8989c44a Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 10 Jun 2018 21:55:55 -0700 Subject: [PATCH 5/7] config/graphic: add support for etnaviv --- config/graphic | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/graphic b/config/graphic index 55c64a50e0..b9e9e34339 100644 --- a/config/graphic +++ b/config/graphic @@ -106,6 +106,13 @@ get_graphicdrivers() { 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 + # remove leading comma if present [[ $GALLIUM_DRIVERS =~ ^, ]] && GALLIUM_DRIVERS="${GALLIUM_DRIVERS:1}" [[ $DRI_DRIVERS =~ ^, ]] && DRI_DRIVERS="${DRI_DRIVERS:1}" From 778de4e059980b543605321fbbe5017e862032d5 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 10 Jun 2018 21:57:39 -0700 Subject: [PATCH 6/7] libdrm: add support for freedreno --- packages/graphics/libdrm/package.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index ef6e61cf42..6b6cf23277 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -35,7 +35,6 @@ get_graphicdrivers PKG_DRM_CONFIG="-Dnouveau=false \ -Domap=false \ -Dexynos=false \ - -Dfreedreno=false \ -Dtegra=false \ -Detnaviv=false" @@ -54,6 +53,9 @@ 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" + PKG_MESON_OPTS_TARGET="-Dlibkms=false \ $PKG_DRM_CONFIG \ -Dcairo-tests=false \ From e8772de4a7725af2119436f6d8effe11a7a365f5 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 10 Jun 2018 21:58:05 -0700 Subject: [PATCH 7/7] libdrm: add support for etnaviv --- packages/graphics/libdrm/package.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index 6b6cf23277..d31ff61044 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -35,8 +35,7 @@ get_graphicdrivers PKG_DRM_CONFIG="-Dnouveau=false \ -Domap=false \ -Dexynos=false \ - -Dtegra=false \ - -Detnaviv=false" + -Dtegra=false" listcontains "$GRAPHIC_DRIVERS" "(i915|i965)" && PKG_DRM_CONFIG+=" -Dintel=true" || PKG_DRM_CONFIG+=" -Dintel=false" @@ -56,6 +55,9 @@ listcontains "$GRAPHIC_DRIVERS" "vc4" && 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 \