From c4b17555e136e73a54d3e13a213070d0e2798b93 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 27 Jun 2019 21:13:13 +0200 Subject: [PATCH] ffmpeg: move v4l2 request api patches to separate patch dir Signed-off-by: Matthias Reichl --- packages/multimedia/ffmpeg/package.mk | 3 +-- .../ffmpeg-95.0001-avutil-add-av_buffer_pool_reclaim.patch | 0 .../ffmpeg-95.0002-Add-common-V4L2-request-API-code.patch | 0 .../ffmpeg-95.0003-Add-V4L2-request-API-mpeg2-hwaccel.patch | 0 .../ffmpeg-95.0004-Add-V4L2-request-API-h264-hwaccel.patch | 0 .../ffmpeg-95.0005-Add-V4L2-request-API-hevc-hwaccel.patch | 0 ...-Add-and-use-private-linux-headers-for-V4L2-request-A.patch | 0 7 files changed, 1 insertion(+), 2 deletions(-) rename packages/multimedia/ffmpeg/patches/{ => v4l2-request-api}/ffmpeg-95.0001-avutil-add-av_buffer_pool_reclaim.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => v4l2-request-api}/ffmpeg-95.0002-Add-common-V4L2-request-API-code.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => v4l2-request-api}/ffmpeg-95.0003-Add-V4L2-request-API-mpeg2-hwaccel.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => v4l2-request-api}/ffmpeg-95.0004-Add-V4L2-request-API-h264-hwaccel.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => v4l2-request-api}/ffmpeg-95.0005-Add-V4L2-request-API-hevc-hwaccel.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => v4l2-request-api}/ffmpeg-95.0006-Add-and-use-private-linux-headers-for-V4L2-request-A.patch (100%) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index ba72c2463f..d3b1048f48 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -45,10 +45,9 @@ else fi if [ "$PROJECT" = "Allwinner" ]; then + PKG_PATCH_DIRS+=" v4l2-request-api" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libdrm systemd" # systemd is needed for libudev PKG_FFMPEG_V4L2_REQUEST="--enable-v4l2-request --enable-libudev --enable-libdrm" -else - PKG_FFMPEG_V4L2_REQUEST="--disable-v4l2-request --disable-libudev" fi if build_with_debug; then diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-95.0001-avutil-add-av_buffer_pool_reclaim.patch b/packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0001-avutil-add-av_buffer_pool_reclaim.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-95.0001-avutil-add-av_buffer_pool_reclaim.patch rename to packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0001-avutil-add-av_buffer_pool_reclaim.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-95.0002-Add-common-V4L2-request-API-code.patch b/packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0002-Add-common-V4L2-request-API-code.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-95.0002-Add-common-V4L2-request-API-code.patch rename to packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0002-Add-common-V4L2-request-API-code.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-95.0003-Add-V4L2-request-API-mpeg2-hwaccel.patch b/packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0003-Add-V4L2-request-API-mpeg2-hwaccel.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-95.0003-Add-V4L2-request-API-mpeg2-hwaccel.patch rename to packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0003-Add-V4L2-request-API-mpeg2-hwaccel.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-95.0004-Add-V4L2-request-API-h264-hwaccel.patch b/packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0004-Add-V4L2-request-API-h264-hwaccel.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-95.0004-Add-V4L2-request-API-h264-hwaccel.patch rename to packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0004-Add-V4L2-request-API-h264-hwaccel.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-95.0005-Add-V4L2-request-API-hevc-hwaccel.patch b/packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0005-Add-V4L2-request-API-hevc-hwaccel.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-95.0005-Add-V4L2-request-API-hevc-hwaccel.patch rename to packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0005-Add-V4L2-request-API-hevc-hwaccel.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-95.0006-Add-and-use-private-linux-headers-for-V4L2-request-A.patch b/packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0006-Add-and-use-private-linux-headers-for-V4L2-request-A.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-95.0006-Add-and-use-private-linux-headers-for-V4L2-request-A.patch rename to packages/multimedia/ffmpeg/patches/v4l2-request-api/ffmpeg-95.0006-Add-and-use-private-linux-headers-for-V4L2-request-A.patch