From 946fc1ee5f8d8350a5ec2831070f3cc4ccc2621a Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 28 Nov 2020 00:19:12 +0000 Subject: [PATCH] gstreamer1.0-omx: consolidate the append usage and only use one move patches from gstreamer1.0-omx-1.18 => gstreamer1.0-omx and use PN on FILESEXTRAPATHS Signed-off-by: Jose Quaresma --- ...-to-acquire-buffer-when-src-pad-isn-t-activ.patch | 0 .../0001-config-files-path.patch | 0 .../0003-no-timeout-on-get-state.patch | 0 ...operly-handle-drain-requests-while-flushing.patch | 0 ...rt-gst_omx_video_dec_set_format-if-there-s-.patch | 0 .../gstreamer/gstreamer1.0-omx_%.bbappend | 10 ++++++++++ .../gstreamer/gstreamer1.0-omx_1.18%.bbappend | 12 ------------ 7 files changed, 10 insertions(+), 12 deletions(-) rename recipes-multimedia/gstreamer/{gstreamer1.0-omx-1.18 => gstreamer1.0-omx}/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-omx-1.18 => gstreamer1.0-omx}/0001-config-files-path.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-omx-1.18 => gstreamer1.0-omx}/0003-no-timeout-on-get-state.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-omx-1.18 => gstreamer1.0-omx}/0004-Properly-handle-drain-requests-while-flushing.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-omx-1.18 => gstreamer1.0-omx}/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch (100%) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-config-files-path.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-config-files-path.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0003-no-timeout-on-get-state.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0003-no-timeout-on-get-state.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0004-Properly-handle-drain-requests-while-flushing.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0004-Properly-handle-drain-requests-while-flushing.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index a36d628..8cd97ca 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,3 +1,13 @@ +FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" + +SRC_URI_append_rpi = " \ + file://0001-config-files-path.patch \ + file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ + file://0003-no-timeout-on-get-state.patch \ + file://0004-Properly-handle-drain-requests-while-flushing.patch \ + file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ +" + GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend deleted file mode 100644 index 5660655..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# -# Need to make this conditional to gstreamer1 -# -SRC_URI_append_rpi = " \ - file://0001-config-files-path.patch \ - file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ - file://0003-no-timeout-on-get-state.patch \ - file://0004-Properly-handle-drain-requests-while-flushing.patch \ - file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ -" - -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/gstreamer1.0-omx-1.18:"