aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2020-11-28 00:19:12 +0000
committerAndrei Gherzan <andrei@gherzan.com>2021-02-26 12:49:18 +0000
commit946fc1ee5f8d8350a5ec2831070f3cc4ccc2621a (patch)
treec841654b7e069d39807b9235767c209c49c0d812
parent45a9819a43bf27b3fce5ffe7460318c81639c96b (diff)
downloadmeta-raspberrypi-946fc1ee5f8d8350a5ec2831070f3cc4ccc2621a.tar.gz
meta-raspberrypi-946fc1ee5f8d8350a5ec2831070f3cc4ccc2621a.tar.bz2
meta-raspberrypi-946fc1ee5f8d8350a5ec2831070f3cc4ccc2621a.zip
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 <quaresma.jose@gmail.com>
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-config-files-path.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0003-no-timeout-on-get-state.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0004-Properly-handle-drain-requests-while-flushing.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend10
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend12
7 files changed, 10 insertions, 12 deletions
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
index c8af7da..c8af7da 100644
--- 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
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
index 6903c17..6903c17 100644
--- 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
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
index 4342326..4342326 100644
--- 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
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
index 144ced6..144ced6 100644
--- 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
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
index 3245294..3245294 100644
--- 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
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:"