From c5b8d57f44310c8ca4ffb0271d9d664fed0e9a36 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 27 Jun 2019 21:13:13 +0200 Subject: [PATCH 1/3] 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 1d35469119..f3209e3d4e 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 From 124031f4ce4f2edcd65d7e0c1598243f1371eb8a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 27 Jun 2019 21:15:32 +0200 Subject: [PATCH 2/3] ffmpeg: move rkmpp patches to separate patch dir Signed-off-by: Matthias Reichl --- packages/multimedia/ffmpeg/package.mk | 1 + .../ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch | 0 .../ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch | 0 .../{ => rkmpp}/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch | 0 ...10-rkmppdec-set-mastering-display-and-content-light-sid.patch | 0 5 files changed, 1 insertion(+) rename packages/multimedia/ffmpeg/patches/{ => rkmpp}/ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => rkmpp}/ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => rkmpp}/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch (100%) rename packages/multimedia/ffmpeg/patches/{ => rkmpp}/ffmpeg-99.1010-rkmppdec-set-mastering-display-and-content-light-sid.patch (100%) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index f3209e3d4e..f31111bc28 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -38,6 +38,7 @@ else fi if [ "$PROJECT" = "Rockchip" ]; then + PKG_PATCH_DIRS+=" rkmpp" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET rkmpp" PKG_FFMPEG_RKMPP="--enable-rkmpp --enable-libdrm --enable-version3" else diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch b/packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch rename to packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch b/packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch rename to packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch b/packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch rename to packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1010-rkmppdec-set-mastering-display-and-content-light-sid.patch b/packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1010-rkmppdec-set-mastering-display-and-content-light-sid.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-99.1010-rkmppdec-set-mastering-display-and-content-light-sid.patch rename to packages/multimedia/ffmpeg/patches/rkmpp/ffmpeg-99.1010-rkmppdec-set-mastering-display-and-content-light-sid.patch From c58d936966689df6ede61ed2a2ae80762428e8d7 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 2 Jul 2019 10:49:30 +0200 Subject: [PATCH 3/3] ffmpeg: move RPi patch to separate patch dir Signed-off-by: Matthias Reichl --- packages/multimedia/ffmpeg/package.mk | 3 +-- .../ffmpeg-99.1003-pfcd_hevc_optimisations.patch | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename packages/multimedia/ffmpeg/patches/{ => rpi-hevc}/ffmpeg-99.1003-pfcd_hevc_optimisations.patch (100%) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index f31111bc28..eafd020bb3 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -59,6 +59,7 @@ fi if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" + PKG_PATCH_DIRS+=" rpi-hevc" fi if target_has_feature neon; then @@ -83,8 +84,6 @@ pre_configure_target() { if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then PKG_FFMPEG_LIBS="-lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm" PKG_FFMPEG_RPI="--enable-rpi" - else - PKG_FFMPEG_RPI="--disable-rpi" fi } diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1003-pfcd_hevc_optimisations.patch b/packages/multimedia/ffmpeg/patches/rpi-hevc/ffmpeg-99.1003-pfcd_hevc_optimisations.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-99.1003-pfcd_hevc_optimisations.patch rename to packages/multimedia/ffmpeg/patches/rpi-hevc/ffmpeg-99.1003-pfcd_hevc_optimisations.patch