gstreamer1.0-plugins-base_1.16.imx: rebase patches and fix recipe

Current implemetation of recipe has absolute path to patches from
oe-core, which breaks the build if initialization script from Freescale
is not used to bootstrap the environment. Moreover, several patches from
oe-core does not apply cleanly to the NXP tree and should be rebased.

This commit eliminates the hardcoded paths from recipes and collects
patches from oe-core in this layer. Two patches are also rebased to be
cleany applied to NXP source tree.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
similarity index 89%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 4b6cfdd6977b3961358ba4b8ed2a78873be84f7b..4f14186671203a34d2d0be2477552cee9e54e1c1 100644 (file)
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -1,4 +1,11 @@
-From e3f28d15e38f7633d8ed4023fe883b8377c0597e Mon Sep 17 00:00:00 2001
+From ae10bb875c88321a719a3dbcc94c78eb75b4b97f Mon Sep 17 00:00:00 2001
+From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
+Date: Sun, 22 Dec 2019 14:34:16 +0000
+Subject: [PATCH 1/2] Makefile.am: prefix calls to pkg-config with
+ PKG_CONFIG_SYSROOT_DIR
+
+Rebase following patch to match version 1.16.0 of gstreamer
+
 From: Yuqing Zhu <carol.zhu@nxp.com>
 Date: Fri, 20 Apr 2018 02:03:57 +0800
 Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
@@ -9,6 +16,7 @@ Do patch refine base on commit: 990b653c7b6de1937ec759019982d6c5f15770f7
 Upstream-Status: Pending [review on oe-core maillist]
 
 Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
+Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
 ---
  gst-libs/gst/allocators/Makefile.am |  4 ++--
  gst-libs/gst/app/Makefile.am        |  8 ++++----
@@ -16,17 +24,17 @@ Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
  gst-libs/gst/pbutils/Makefile.am    | 12 ++++++------
  gst-libs/gst/riff/Makefile.am       |  8 ++++----
  gst-libs/gst/rtp/Makefile.am        |  8 ++++----
- gst-libs/gst/rtsp/Makefile.am       |  4 ++--
+ gst-libs/gst/rtsp/Makefile.am       |  8 ++++----
  gst-libs/gst/sdp/Makefile.am        |  4 ++--
  gst-libs/gst/tag/Makefile.am        |  8 ++++----
  gst-libs/gst/video/Makefile.am      |  8 ++++----
- 10 files changed, 38 insertions(+), 38 deletions(-)
+ 10 files changed, 40 insertions(+), 40 deletions(-)
 
 diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
-index c4412a1..9f9d14d 100644
+index 3e5f2a692..ca66056d3 100644
 --- a/gst-libs/gst/allocators/Makefile.am
 +++ b/gst-libs/gst/allocators/Makefile.am
-@@ -59,7 +59,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
+@@ -55,7 +55,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
                --c-include "gst/allocators/allocators.h" \
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
@@ -34,8 +42,8 @@ index c4412a1..9f9d14d 100644
 +              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --library=libgstallocators-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
-               --libtool="$(LIBTOOL)" \
-@@ -83,7 +83,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+               --libtool="${LIBTOOL}" \
+@@ -79,7 +79,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
@@ -45,7 +53,7 @@ index c4412a1..9f9d14d 100644
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
-index 5bfd606..c231267 100644
+index 11018b694..bd48a313c 100644
 --- a/gst-libs/gst/app/Makefile.am
 +++ b/gst-libs/gst/app/Makefile.am
 @@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
@@ -71,10 +79,10 @@ index 5bfd606..c231267 100644
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
-index 7fb65f2..5379f79 100644
+index f2d46e8a8..482902746 100644
 --- a/gst-libs/gst/audio/Makefile.am
 +++ b/gst-libs/gst/audio/Makefile.am
-@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
+@@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
                --c-include "gst/audio/audio.h" \
@@ -91,7 +99,7 @@ index 7fb65f2..5379f79 100644
                --library-path="$(top_builddir)/gst-libs/gst/tag/" \
                --include=Gst-@GST_API_VERSION@ \
                --include=GstBase-@GST_API_VERSION@ \
-@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+@@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -103,7 +111,7 @@ index 7fb65f2..5379f79 100644
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
-index 35a6e44..49d6894 100644
+index a771d5a8a..e926a5ef8 100644
 --- a/gst-libs/gst/pbutils/Makefile.am
 +++ b/gst-libs/gst/pbutils/Makefile.am
 @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
@@ -137,7 +145,7 @@ index 35a6e44..49d6894 100644
                --includedir="$(top_builddir)/gst-libs/gst/video/" \
                --includedir="$(top_builddir)/gst-libs/gst/audio/" \
 diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
-index e66ef4f..c8c588a 100644
+index 8f32b48d6..ecec07d1a 100644
 --- a/gst-libs/gst/riff/Makefile.am
 +++ b/gst-libs/gst/riff/Makefile.am
 @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
@@ -163,10 +171,10 @@ index e66ef4f..c8c588a 100644
  #
  #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
-index 77ebeeb..9aee788 100644
+index f6b996324..25122188f 100644
 --- a/gst-libs/gst/rtp/Makefile.am
 +++ b/gst-libs/gst/rtp/Makefile.am
-@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
+@@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
                --c-include "gst/rtp/rtp.h" \
                -I$(top_builddir)/gst-libs \
                -I$(top_srcdir)/gst-libs \
@@ -177,7 +185,7 @@ index 77ebeeb..9aee788 100644
                --library=libgstrtp-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
                --include=GstBase-@GST_API_VERSION@ \
-@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+@@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
@@ -189,29 +197,33 @@ index 77ebeeb..9aee788 100644
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
-index db9d0fd..79027cb 100644
+index 02aaf4f9a..13ac1b395 100644
 --- a/gst-libs/gst/rtsp/Makefile.am
 +++ b/gst-libs/gst/rtsp/Makefile.am
-@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
+@@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
                -I$(top_builddir)/gst-libs \
                -I$(top_srcdir)/gst-libs \
                --add-include-path=$(builddir)/../sdp \
 -              --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+-              --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 +              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
++              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
                --library=libgstrtsp-@GST_API_VERSION@.la \
                --include=Gio-2.0 \
                --include=Gst-@GST_API_VERSION@ \
-@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+@@ -104,8 +104,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../sdp \
 -              --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+-              --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 +              --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
++              --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
-index 6e05cc7..c7cf514 100644
+index cf8c001ad..61b8d83db 100644
 --- a/gst-libs/gst/sdp/Makefile.am
 +++ b/gst-libs/gst/sdp/Makefile.am
 @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
@@ -222,7 +234,7 @@ index 6e05cc7..c7cf514 100644
 +              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --library=libgstsdp-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
-               --libtool="$(LIBTOOL)" \
+               --libtool="${LIBTOOL}" \
 @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
@@ -233,7 +245,7 @@ index 6e05cc7..c7cf514 100644
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
-index c86515b..363e6d2 100644
+index 83bda29eb..6c3accbe0 100644
 --- a/gst-libs/gst/tag/Makefile.am
 +++ b/gst-libs/gst/tag/Makefile.am
 @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
@@ -259,10 +271,10 @@ index c86515b..363e6d2 100644
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
-index 0f7c07e..d642267 100644
+index 22c3f96f9..97342ef3c 100644
 --- a/gst-libs/gst/video/Makefile.am
 +++ b/gst-libs/gst/video/Makefile.am
-@@ -121,8 +121,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
+@@ -126,8 +126,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
                --c-include "gst/video/video.h" \
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
@@ -273,7 +285,7 @@ index 0f7c07e..d642267 100644
                --library=libgstvideo-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
                --include=GstBase-@GST_API_VERSION@ \
-@@ -149,8 +149,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+@@ -154,8 +154,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
@@ -285,5 +297,5 @@ index 0f7c07e..d642267 100644
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 -- 
-2.7.4
+2.17.1
 

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
similarity index 58%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
index 4adf605460c3dc142134421b42b7c63674f4dce1..b3e4326b00e7b6fe543c97ae04912921aaca8238 100644 (file)
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
@@ -1,4 +1,11 @@
-From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001
+From 836769c4a26231f36a48aeadb9e332bd7224c785 Mon Sep 17 00:00:00 2001
+From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
+Date: Sun, 22 Dec 2019 14:49:57 +0000
+Subject: [PATCH 2/2] rtsp: drop incorrect reference to gstreamer-sdp in
+ Makefile.am
+
+Rebase following patch from upstream to match NXP version 1.16:
+
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 26 Oct 2015 17:30:14 +0200
 Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in
@@ -6,22 +13,23 @@ Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in
 
 Upstream-Status: Pending [review on oe-core maillist]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
 ---
  gst-libs/gst/rtsp/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
-index 4f6d9f8..0afa370 100644
+index 13ac1b395..8b03125c7 100644
 --- a/gst-libs/gst/rtsp/Makefile.am
 +++ b/gst-libs/gst/rtsp/Makefile.am
-@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
-               --libtool="$(LIBTOOL)" \
+@@ -82,7 +82,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
                --pkg gio-2.0 \
                --pkg gstreamer-@GST_API_VERSION@ \
+               --pkg gstreamer-base-@GST_API_VERSION@ \
 -              --pkg gstreamer-sdp-@GST_API_VERSION@ \
                --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
                --add-init-section="$(INTROSPECTION_INIT)" \
                --output $@ \
 -- 
-2.6.2
+2.17.1
 

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
index 416982cc23694e25923cc314b57c3d0501bacc0d..ee7a9baf413290d0e4e18f9f2ca5f7a9e2837a98 100644 (file)
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
@@ -7,12 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
 DEPENDS += "iso-codes util-linux"
 DEPENDS_append_imxgpu2d = " virtual/libg2d"
 
-PV = "1.16.0.imx"
-
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
 SRCBRANCH = "MM_04.05.01_1909_L4.19.35"
 SRCREV = "df30480711d68a1c1d2152bf4d6a7b245a85f967" 
@@ -20,9 +14,9 @@ SRC_URI = " \
     ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://make-gio_unix_2_0-dependency-configurable.patch \
-    file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
+    file://0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
     file://0003-riff-add-missing-include-directories-when-calling-in.patch \
-    file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
+    file://0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
 "
 
 S = "${WORKDIR}/git"