12 files changed, 10 insertions, 14 deletions

diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
index 3830846b3..9db0051a1 100644
--- a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;b
 
 SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2"
 
-S = "${WORKDIR}/git/subprojects/gst-examples"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 
 inherit meson pkgconfig features_check
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb
index accca06ab..bf61d4192 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
 SRC_URI[sha256sum] = "c3e4179ba183c2d3101edf87ff70dd07e728c766a5fee34e6ecded76ca5802df"
 
-S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb
index 7f5cd0b3d..7aa22436c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb
@@ -190,7 +190,7 @@ GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protoc
 SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
 SRCREV = "7bb1254fcb0a0dcb1ecb4ac21efbc5068151943d"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 
 inherit use-imx-headers
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb
index 6859d26b5..ed6e02435 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb
@@ -121,7 +121,7 @@ GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;prot
 SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
 SRCREV = "858ae5a1fb2bd2692ca7ebbd5bde2eee14e1842d"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 
 inherit use-imx-headers
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb
index 933adb5ef..28044ccd1 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb
@@ -114,7 +114,7 @@ GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;prot
 SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
 SRCREV = "626a972e9ef448f1017cfad07a3486a0fb340a0d"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
index f09a5bc77..cc2cedfd5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
@@ -18,8 +18,6 @@ SRCBRANCH ?= "master"
 SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit pkgconfig meson use-imx-headers
 
 # libg2d on i.MX8 SoCs with a DPU is emulated via the DPU.
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
index 55bb975b4..23b8c72cb 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
@@ -16,7 +16,7 @@ SRC_URI = " \
             "
 SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5"
 
-S = "${WORKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
+S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
 
 DEPENDS += "gstreamer1.0-plugins-base"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
index 0ba9a1aea..cac54e88a 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
@@ -18,7 +18,7 @@ RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 
 PNREAL = "gst-python"
 
-S = "${WORKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
 
 EXTRA_OEMESON += "\
     -Dtests=disabled \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
index c866d2332..58255b992 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_
 
 SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b"
 
-S = "${WORKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
 
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
index dde7b5b1d..3993730ec 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.24.0.tar.
 
 SRC_URI[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596"
 
-S = "${WORKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 
 inherit meson pkgconfig features_check upstream-version-is-even
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb
index 8daeed667..a5fc88444 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb
@@ -103,7 +103,7 @@ GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
 SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
 SRCREV = "e0d37a7d773a502956f54eced8cd701ec7fa5ff5"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 
 PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled"
 
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index a96b5b31a..d7ac9b474 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -42,8 +42,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=
 SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
 SRCREV = "370510ef8137874339df18a2a35ec1d04d98fa0b"
 
-S = "${WORKDIR}/git"
-
 inherit meson pkgconfig use-imx-headers
 
 PLATFORM:mx6-nxp-bsp = "MX6"