meta-openembedded/all: adapt to UNPACKDIR changes

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

I've verified that bitbake -c patch world works with these, but did not run a world
build; the majority of recipes shouldn't need further fixups, but if there are
some that still fall out, they can be fixed in followups.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

87 files changed, 63 insertions, 112 deletions

diff --git a/meta-oe/recipes-graphics/aml/aml_git.bb b/meta-oe/recipes-graphics/aml/aml_git.bb
index 2633e0d215..a0b27bd256 100644
--- a/meta-oe/recipes-graphics/aml/aml_git.bb
+++ b/meta-oe/recipes-graphics/aml/aml_git.bb
@@ -10,7 +10,6 @@ SRCREV = "b83f3576ce4187d9285f06e9066ef43a691464d4"
 
 PV = "0.3.0+git"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
diff --git a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb
index a6872ef0cd..8a8e783309 100644
--- a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb
+++ b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb
@@ -10,7 +10,7 @@ DEPENDS += "boost cairo libsigc++-3"
 SRC_URI = "https://www.cairographics.org/releases/cairomm-${PV}.tar.xz"
 SRC_URI[sha256sum] = "b81255394e3ea8e8aa887276d22afa8985fc8daef60692eb2407d23049f03cfb"
 
-S = "${WORKDIR}/cairomm-${PV}"
+S = "${UNPACKDIR}/cairomm-${PV}"
 
 FILES:${PN}-doc += "${datadir}/devhelp"
 FILES:${PN}-dev += "${libdir}/cairomm-*/"
diff --git a/meta-oe/recipes-graphics/cglm/cglm_0.9.6.bb b/meta-oe/recipes-graphics/cglm/cglm_0.9.6.bb
index cbcd6c0c6e..b2673f1e9b 100644
--- a/meta-oe/recipes-graphics/cglm/cglm_0.9.6.bb
+++ b/meta-oe/recipes-graphics/cglm/cglm_0.9.6.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https"
 # Tag v0.9.6
 SRCREV = "144d1e7c29b3b0c6dede7917a0476cc95248559c"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG[build_tests] = "-Dbuild_tests=true,-Dbuild_tests=false,"
 
diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
index 1ee2657bd0..1018e0675e 100644
--- a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
+++ b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " --with-systemdsystemunitdir=${systemd_unitdir}/system \
                  --disable-staticimages --with-rootdir=${root_prefix}"
diff --git a/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
index de91d027e5..f4a257ce89 100644
--- a/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
+++ b/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
@@ -14,7 +14,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f"
 
-S = "${WORKDIR}/DirectFB-examples-${PV}"
+S = "${UNPACKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc
index 4d962ab5d9..0dc410b2cb 100644
--- a/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -28,7 +28,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g
            file://0001-libdirect-remove-use-of-keyword-register.patch \
            "
 
-S = "${WORKDIR}/DirectFB-${PV}"
+S = "${UNPACKDIR}/DirectFB-${PV}"
 
 LDFLAGS:append = " -lm"
 
diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb
index 50504caf9f..ef6dc14ca6 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=stable-2.x;protocol=
 
 SRCREV = "abbe08b7a487325182758d5285b54437a914207b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake gettext pkgconfig python3-dir python3native setuptools3-base mime-xdg
 
diff --git a/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb b/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
index 9f1cbb47fb..810be40013 100644
--- a/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
+++ b/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=32fd56d355bd6a61017655d8da26b67c"
 SRC_URI = "git://gitlab.freedesktop.org/emersion/drm_info.git;branch=master;protocol=https"
 SRCREV = "c1f5ca4cf750b26eb26c1d9d5c2ef057acbcfefc"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb
index efcf5a9ea6..72187696e3 100644
--- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb
+++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb
@@ -7,7 +7,6 @@ DEPENDS = "libpng zlib"
 SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master"
 
 SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8"
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
     sed \
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb
index 6c06748499..2736f61004 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_git.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \
            file://0001-fbida-Include-missing-sys-types.h.patch \
 "
 SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
index d470ff12d4..af77ec913e 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
@@ -22,7 +22,6 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
            file://0001-Fix-Translations-containing-invalid-directives-hs.patch \
            file://CVE-2024-25081_CVE-2024-25082.patch \
 "
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DENABLE_DOCS=OFF"
 PACKAGECONFIG = "readline"
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb
index 4db453bc66..c5c547186f 100644
--- a/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb
+++ b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb
@@ -17,4 +17,3 @@ PV .= "+git"
 SRC_URI = "git://github.com/HamzaM3/ftgl;protocol=https;branch=master \
            file://0001-Fix-type-mismatch-with-latest-FreeType.patch"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
index fcf1bd9cae..959463e962 100644
--- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
+++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
@@ -41,7 +41,6 @@ SRC_URI = " \
 
 SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46"
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext update-alternatives pkgconfig python3native perlnative features_check
 # depends on virtual/libx11
diff --git a/meta-oe/recipes-graphics/glad/glad_2.0.8.bb b/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
index 4065c27e6f..ea4ee6eac6 100644
--- a/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
+++ b/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae570f26774ac096cff8f992091a223c"
 
 SRC_URI = "git://github.com/Dav1dde/glad.git;protocol=https;branch=glad2"
 SRCREV = "73db193f853e2ee079bf3ca8a64aa2eaf6459043"
-S = "${WORKDIR}/git"
 
 inherit python_setuptools_build_meta
 
diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
index e313d7a192..e6fd0edd21 100644
--- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
+++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
@@ -20,7 +20,6 @@ SRC_URI = " \
 SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447"
 PV .= "+0.9.9.9+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
index 16ab6d6fd4..ef9b194f9a 100644
--- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
+++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
@@ -18,7 +18,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)"
 
 DEPENDS = "gtk+"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit features_check autotools binconfig pkgconfig gettext
 
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb
index 43367aa415..f912686c41 100644
--- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb
+++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 
 SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz"
 SRC_URI[sha256sum] = "6201b5f93dcaeafa92fc0ec4ad4baeaf60acf16fc8f019bbf061cf4ebf27938a"
-S = "${WORKDIR}/${BPN}-gtk3-${PV}"
+S = "${UNPACKDIR}/${BPN}-gtk3-${PV}"
 
 DEPENDS = " \
     gperf-native \
diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 9c9bf10398..66e9f8a0c4 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -15,7 +15,6 @@ inherit autotools pkgconfig lib_package
 AUTO_LIBNAME_PKGS = ""
 
 SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
diff --git a/meta-oe/recipes-graphics/libdecor/libdecor_0.2.3.bb b/meta-oe/recipes-graphics/libdecor/libdecor_0.2.3.bb
index 9c6807d7e6..35deb8d2aa 100644
--- a/meta-oe/recipes-graphics/libdecor/libdecor_0.2.3.bb
+++ b/meta-oe/recipes-graphics/libdecor/libdecor_0.2.3.bb
@@ -12,7 +12,6 @@ DEPENDS = " \
     wayland-protocols \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "15afd30a6e23e949d022ff18f17dd7fdbd3361e4"
 
 PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}"
diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb
index db648ec8c2..e59de6f0ca 100644
--- a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb
+++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb
@@ -18,7 +18,7 @@ inherit autotools features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
-S = "${WORKDIR}/xforms-${PV}"
+S = "${UNPACKDIR}/xforms-${PV}"
 
 DEPENDS = "libxpm jpeg libx11 virtual/libgl"
 RDEPENDS:${PN} = "bash"
diff --git a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
index a737a735b7..f26caf6940 100644
--- a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
+++ b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
@@ -13,7 +13,6 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 
 inherit meson pkgconfig features_check
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= "\
   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
index 4f702029d9..d707b6c9b4 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "dfb15ac5f8ce7a4952dc12d2aed9747518c5e6b335c0e31636d23f93c6
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sdlgfx/files/"
 
-S = "${WORKDIR}/SDL_gfx-${PV}"
+S = "${UNPACKDIR}/SDL_gfx-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
index 01137bb0ca..29fb8cb4aa 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.
            file://configure.patch"
 SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
 
-S = "${WORKDIR}/SDL_image-${PV}"
+S = "${UNPACKDIR}/SDL_image-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
index 35f278c890..d87c15aebc 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.
 
 SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
 
-S = "${WORKDIR}/SDL_mixer-${PV}"
+S = "${UNPACKDIR}/SDL_mixer-${PV}"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
index 93466872ac..ef4d13ebb6 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
@@ -14,6 +14,6 @@ SRC_URI = " \
   file://am_foreign.patch \
 "
 
-S = "${WORKDIR}/SDL_net-${PV}"
+S = "${UNPACKDIR}/SDL_net-${PV}"
 
 SRC_URI[sha256sum] = "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb b/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
index c104444319..2cf3e88f17 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
 "
 SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
 
-S = "${WORKDIR}/SDL_ttf-${PV}"
+S = "${UNPACKDIR}/SDL_ttf-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
index d3dbf13ae7..c15e986dc3 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
@@ -9,7 +9,7 @@ DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp"
 SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
 SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af2156097ce30a"
 
-S = "${WORKDIR}/SDL2_image-${PV}"
+S = "${UNPACKDIR}/SDL2_image-${PV}"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
index b24c8782cf..46e6ba0774 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
 SRC_URI[sha256sum] = "cb760211b056bfe44f4a1e180cc7cb201137e4d1572f2002cc1be728efd22660"
 
-S = "${WORKDIR}/SDL2_mixer-${PV}"
+S = "${UNPACKDIR}/SDL2_mixer-${PV}"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
index d26a545f83..4a7ada94cb 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315"
 SRC_URI = " \
   https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
 "
-S = "${WORKDIR}/SDL2_net-${PV}"
+S = "${UNPACKDIR}/SDL2_net-${PV}"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 35870c4814..8122b88a68 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -31,7 +31,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 
 UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
 
-S = "${WORKDIR}/SDL-${PV}"
+S = "${UNPACKDIR}/SDL-${PV}"
 
 SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
 
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb
index 7e3a06f34f..3b17f350df 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98241180d857fe975e4b60d44d6c01a5"
 
 SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz"
 SRC_URI[sha256sum] = "27e845b1b7dc0a91a85f1a1f18892ed205adb38caf767741eb258008d8264de0"
-S = "${WORKDIR}/sdl2-compat-${PV}"
+S = "${UNPACKDIR}/sdl2-compat-${PV}"
 
 DEPENDS += "libsdl3"
 
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
index 8ef20521a9..ac425f6ad2 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
@@ -9,7 +9,6 @@ DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp"
 SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.2.x"
 SRCREV = "11154afb7855293159588b245b446a4ef09e574f"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
index f914d1dcff..1f82f95d65 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL3_ttf-${PV}.tar.gz
 "
 SRC_URI[sha256sum] = "63547d58d0185c833213885b635a2c0548201cc8f301e6587c0be1a67e1e045d"
 
-S = "${WORKDIR}/SDL3_ttf-${PV}"
+S = "${UNPACKDIR}/SDL3_ttf-${PV}"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb
index 7a2a37f69a..9579cb73a1 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "\
 
 SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz"
 
-S = "${WORKDIR}/SDL3-${PV}"
+S = "${UNPACKDIR}/SDL3-${PV}"
 
 SRC_URI[sha256sum] = "6340e58879b2d15830c8460d2f589a385c444d1faa2a4828a9626c7322562be8"
 
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
index e518461d7d..ff5df428e8 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
@@ -47,7 +47,6 @@ inherit cmake
 SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https"
 SRCREV = "10e9eb75f73e973725dc75c373de5d89807af028"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}"
 
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb
index 4196449f3a..d7c96492b2 100644
--- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb
@@ -11,7 +11,7 @@ SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-f
 
 SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516"
 
-S = "${WORKDIR}/git/libyui-ncurses"
+S = "${UNPACKDIR}/${BP}/libyui-ncurses"
 
 inherit cmake gettext pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb
index 419a9522a4..d86aa4da91 100644
--- a/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
 
 SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516"
 
-S = "${WORKDIR}/git/libyui"
+S = "${UNPACKDIR}/${BP}/libyui"
 
 inherit cmake gettext pkgconfig
 
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb
index 1228748701..ede5c16f3f 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \
 
 SRC_URI = "\
         git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=release/v9.2;name=demo \
-        git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.2;name=lvgl;subdir=git/lvgl \
+        git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.2;name=lvgl;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/lvgl \
         file://0001-thorvg-fix-build-with-gcc-15.patch;patchdir=lvgl \
         "
 SRCREV_demo = "c924e24c7aa55317521bcd9dd75ce9337508f5a5"
@@ -24,7 +24,6 @@ require lv-conf.inc
 
 inherit cmake
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
         if [ "${LVGL_CONFIG_USE_SDL}" -eq 1 ] ; then
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
index 935e84ad23..28306a1101 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
@@ -17,7 +17,6 @@ SRCREV = "7f07a129e8d77f4984fff8e623fd5be18ff42e74"
 inherit cmake
 
 EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON"
-S = "${WORKDIR}/git"
 
 require lv-conf.inc
 
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
index 9065050c62..2b26ec57ae 100644
--- a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
+++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/any1/neatvnc;branch=v0.8;protocol=https"
 
 SRCREV = "07081567ab21a2b099ceb41ae8cab872a31cbb9a"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "libdrm pixman aml zlib"
 
diff --git a/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb b/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb
index a44e79362d..c31ad985d9 100644
--- a/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb
+++ b/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb
@@ -5,7 +5,6 @@ SECTION = "graphics"
 LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://src/nyancat.c;beginline=27;endline=49;md5=285f7ac87da4a631f348800687d845bd"
 
-S = "${WORKDIR}/git"
 
 SRCREV = "5ffb6c5c03d0e9156db8f360599d4f0449bb16b9"
 SRC_URI = " \
diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb
index 1210af70ea..917492c982 100644
--- a/meta-oe/recipes-graphics/openbox/obconf_git.bb
+++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb
@@ -16,7 +16,6 @@ SRC_URI = " \
     file://0001-Fix-function-protype-visibility.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext pkgconfig mime mime-xdg features_check
 # depends on openbox, which is X11-only
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
index 231bf84573..6c383e3423 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https
            file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
            "
 SRCREV = "210a8a5690d0da66f02d49420d7176a21ef409dc"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
index 0e88e84aff..d3c96cd66f 100644
--- a/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
+++ b/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
@@ -15,7 +15,6 @@ SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e"
 
 SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 inherit native
 
diff --git a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb
index 896195c57d..d99c6ceac0 100644
--- a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb
@@ -12,7 +12,7 @@ inherit gnomebase features_check
 SRC_URI[archive.sha256sum] = "539f5aa60e9bdc6b955bb448e2a62cc14562744df690258040fbb74bf885755d"
 REQUIRED_DISTRO_FEATURES = "x11"
 
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/"
diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb
index 2ec89bc05b..88cdce26d1 100644
--- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb
+++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb
@@ -10,6 +10,5 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=h
 PV = "2020.06.15+git"
 SRCREV = "e1642fb691d29b1462504b58916f7f514a963e80"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig meson
diff --git a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb
index 039816e4a0..c794f41370 100644
--- a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb
+++ b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SRCREV = "715e29fd4cd71b6e452ae0f4e36d917b43122ce8"
 SRC_URI = "git://github.com/fukuchi/libqrencode.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb
index 8aab26c824..c5a0cdc6aa 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb
@@ -8,7 +8,6 @@ SRCREV = "34c3c40787f440da9c2947cd63a41e6c4d1f95b9"
 SRC_URI = " \
     git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \
 "
-S = "${WORKDIR}/git"
 
 DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms"
 
diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
index bf3070701f..567f7a55e8 100644
--- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
+++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
@@ -4,7 +4,6 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "graphics"
 
-S = "${WORKDIR}/git"
 SRCREV = "f09ba2777714871bddb70d049878af34b94fa54d"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https"
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb
index 4d9d4d3dd0..258c78e509 100644
--- a/meta-oe/recipes-graphics/surf/surf_2.1.bb
+++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \
            "
 SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig features_check
 
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb
index 0d45ee765c..f4923f3f00 100644
--- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb
+++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRCREV = "4767ea922bcc460e70b87b1d303ebdfed0897da8"
 SRC_URI = "git://github.com/tesseract-ocr/tessdata.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_5.5.1.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.5.1.bb
index 213dfada23..4bc0f5b88f 100644
--- a/meta-oe/recipes-graphics/tesseract/tesseract_5.5.1.bb
+++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.5.1.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRCREV = "3b7c70e34dea179549ed3e995872e2e019eb8477"
 SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "leptonica"
 
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
index 98777970b0..dd4f79c314 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
@@ -7,7 +7,6 @@ RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
 
 LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
 
-S = "${WORKDIR}/git"
 
 inherit autotools cmake features_check pkgconfig systemd
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb
index 15449b216a..38a5126eea 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
     file://44-source-code-pro-fonts-fontconfig.conf \
 "
 SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e"
-S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it"
+S = "${UNPACKDIR}/source-code-pro-2.030R-ro-1.050R-it"
 
 UPSTREAM_CHECK_URI = "https://github.com/adobe-fonts/source-code-pro/tags"
 UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+\.\d+)R"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.300.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.300.bb
index beb2cf2ff7..4a3b8e471e 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.300.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.300.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://OFL.txt;md5=6c56db018aa8803f8aff326829e3ce32"
 
 SRCNAME = "AbyssinicaSIL"
 SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 UPSTREAM_CHECK_URI = "https://software.sil.org/abyssinica/download/"
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
index ea734182de..82b2541a60 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
@@ -8,7 +8,7 @@ RPROVIDES:${PN} = "virtual-chinese-font"
 FONT_PACKAGES = "${PN}"
 
 SRC_URI = "https://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.${PV}.2.orig.tar.bz2"
-S = "${WORKDIR}/ttf-arphic-uming-0.2.20080216.2"
+S = "${UNPACKDIR}/ttf-arphic-uming-0.2.20080216.2"
 
 require ttf.inc
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
index 90a11ca4d6..9dc23fc4c7 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
@@ -17,7 +17,7 @@ RDEPENDS:${PN}-common = ""
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
            file://30-dejavu-aliases.conf"
 
-S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf"
+S = "${UNPACKDIR}/dejavu-fonts-ttf-${PV}/ttf"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dejavu/files/dejavu/"
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
index cc9213ec5b..06ab2a7921 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
@@ -9,7 +9,7 @@ PV = "0.1+git"
 
 SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git/data/fonts"
+S = "${UNPACKDIR}/${BP}/data/fonts"
 
 do_install:append() {
     for f in Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf \
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
index 84cd30d3c0..f50da65ddc 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://OFL;md5=33a5bf7b98a9c0ae87430760ba762295 \
 
 SRC_URI = "https://archive.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz "
 
-S = "${WORKDIR}/ttf-sil-gentium-${PV}"
+S = "${UNPACKDIR}/ttf-sil-gentium-${PV}"
 
 do_install:append() {
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb
index c142f1dd02..0697e69399 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb
@@ -23,8 +23,7 @@ SRC_URI = "git://github.com/google/fonts.git;protocol=https;branch=main;subpath=
            git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \
            git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install:append() {
     install -d ${D}${datadir}/fonts/truetype/
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
index 8101c7d7a0..373bdb4bde 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../COPYRIGHT.TXT;md5=70d34478e38b1ad9995079f9921f9ef7
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2"
 
-S = "${WORKDIR}/hunkyfonts-${PV}/TTF"
+S = "${UNPACKDIR}/hunkyfonts-${PV}/TTF"
 
 PACKAGES = "ttf-hunky-sans ttf-hunky-serif"
 FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
index 85a64000ee..2c671840e2 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5
 SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \
     file://OFL.txt"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \
     ${datadir}/doc/ttf-inconsolata/*"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb
index 89c48d5fe2..165ea7576a 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb
@@ -10,7 +10,7 @@ SRC_URI = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip "
 
 SRC_URI[sha256sum] = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"
 
-S = "${WORKDIR}/IPAfont00303"
+S = "${UNPACKDIR}/IPAfont00303"
 
 PACKAGES = "ttf-ipag ttf-ipagp ttf-ipam ttf-ipamp"
 FONT_PACKAGES = "ttf-ipag ttf-ipagp ttf-ipam ttf-ipamp"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
index ab7308e735..bb2930ae0b 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
@@ -15,7 +15,7 @@ SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${P
 
 SRC_URI[sha256sum] = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"
 
-S = "${WORKDIR}/liberation-fonts-ttf-${PV}"
+S = "${UNPACKDIR}/liberation-fonts-ttf-${PV}"
 
 do_install:append () {
     install -d ${D}${datadir}/fonts/TTF/
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb
index 7b0828574c..92717da32f 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb
@@ -11,7 +11,6 @@ SRCREV = "4b0192046158094654e865245832c66d2104219e"
 SRC_URI = "git://github.com/liberationfonts/liberation-fonts.git;branch=main;protocol=https"
 
 DEPENDS = "fontforge-native"
-S = "${WORKDIR}/git"
 
 PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
 FONT_PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
index 65d0f0bb35..d4c7a2f219 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
@@ -10,8 +10,7 @@ SRC_URI[sha256sum] = "de5750f7048973f851961050f76b8b58e9bda400d5007c3078d9317fbe
 
 DEPENDS = "fontforge-native"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 FONT_PACKAGES = "${PN}"
 FILES:${PN} = "${datadir}"
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb
index 8340cccbb4..43ec61772b 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb
@@ -11,7 +11,6 @@ SRCREV = "a403c9b7f509dad5e58dde85ef63b1c36fde3a21"
 SRC_URI = "git://github.com/pravins/lohit.git;branch=master;protocol=https"
 
 DEPENDS = "fontforge-native"
-S = "${WORKDIR}/git"
 FONT_PACKAGES = "${PN}"
 FILES:${PN} = "${datadir}"
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
index 4adada04fa..1ae1d1a2b4 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE_E;md5=ac161e96eda00db9a3aec7870b5d9658 \
                     file://LICENSE_J;md5=a120ca8d7c8e4a475d5277c9aeb95221 \
 "
 SRC_URI = "http://downloads.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz"
-S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}"
+S = "${UNPACKDIR}/mplus-TESTFLIGHT-${PV}"
 
 PACKAGESPLITFUNCS:prepend = "split_ttf_mplus_packages "
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
index 9d6a9a6c2e..b5dae22a9d 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
@@ -11,7 +11,6 @@ SRCREV = "aac7ccaa4d1dea4543453b96f7d6fc47066a57ff"
 PACKAGES = "${PN}-color ${PN}-regular"
 FONT_PACKAGES = "${PN}-color ${PN}-regular"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf"
 FILES:${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
index 25ce8e930d..9c9f2e566d 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 SRC_URI = "https://github.com/google/roboto/releases/download/v${PV}/roboto-android.zip"
 SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} = "${datadir}/fonts/truetype/*.ttf"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
index 76016c57b9..b72307519c 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=97d739900be6e852830f55aa3c07d4a0"
 RPROVIDES:${PN} = "virtual-japanese-font"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2"
-S = "${WORKDIR}/sazanami-20040629"
+S = "${UNPACKDIR}/sazanami-20040629"
 
 PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
 FONT_PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
index 156dc983d7..b224f46869 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://IPA_Font_License_Agreement_v1.0.txt;md5=6cd3351ba979c
 SRC_URI = "https://launchpad.net/takao-fonts/trunk/15.03/+download/TakaoFonts_00303.01.tar.xz"
 SRC_URI[sha256sum] = "e9871f72ac69acb3e277aebbee7ca01fbebf54800733e29fafdc46133fc3552f"
 
-S = "${WORKDIR}/TakaoFonts_00303.01"
+S = "${UNPACKDIR}/TakaoFonts_00303.01"
 
 PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
 FONT_PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
index 8512b1fd19..ff89f7466a 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1
 UPSTREAM_CHECK_URI = "https://repology.org/project/fonts:ubuntu/packages"
 UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/ubuntu-font-family-${PV}"
+S = "${UNPACKDIR}/ubuntu-font-family-${PV}"
 
 PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans"
 FONT_PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
index 4cc5afd4a7..c7be162b1b 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://osdn.jp/dl/vlgothic/VLGothic-${PV}.tar.xz"
 
 SRC_URI[sha256sum] = "297a3813675fbea12c5813b55a78091c9a5946515ecbf9fde8b8102e01c579f4"
 
-S = "${WORKDIR}/VLGothic"
+S = "${UNPACKDIR}/VLGothic"
 
 do_install:append () {
     install -D -m644 ${S}/LICENSE_E.mplus ${D}${datadir}/licenses/${PN}/COPYING_MPLUS.txt
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
index dc85617a9b..8d721d00ad 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wqy/files/wqy-zenhei/"
 UPSTREAM_CHECK_REGEX = "wqy-zenhei/(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/wqy-zenhei"
+S = "${UNPACKDIR}/wqy-zenhei"
 
 do_install:append () {
     sed -i -e '/<string>[^W]/d' ${S}/44-wqy-zenhei.conf
diff --git a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb
index e80aebc89b..5aea738c15 100644
--- a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb
+++ b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb
@@ -14,7 +14,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "libev libx11 libxi libxfixes"
 
-S = "${WORKDIR}/git"
 
 do_install:append() {
     # LICENSE is installed to /usr/share/licenses but we don't want it in the package
diff --git a/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb b/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb
index db3c045588..3ba561a54e 100644
--- a/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb
+++ b/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb
@@ -8,7 +8,6 @@ DEPENDS = "virtual/libx11 libxext xorgproto"
 SRCREV = "79f1506a3307d3275b0fdfb2e110c173f68e6f78"
 SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit features_check meson pkgconfig
 
diff --git a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb
index 3f44e537a4..a7db743239 100644
--- a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb
+++ b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb
@@ -15,6 +15,5 @@ RDEPENDS:${PN} = "libvdpau"
 SRCREV = "d3c5bd63bf8878d59b22d618d2bb5116db392d28"
 SRC_URI = "git://anongit.freedesktop.org/vdpau/vdpauinfo;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
index 02af1c6ed0..1cc2da7a49 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
@@ -12,7 +12,6 @@ SRC_URI:append:toolchain-clang = "file://fix-clang-private-operator.patch"
 
 SRCREV_FORMAT = "vk-gl-cts"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig cmake cmake-qemu features_check python3native
 
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc
index 68e8a3b0a9..4e7155cd7f 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc
@@ -11,15 +11,15 @@ python __anonymous() {
 }
 
 SRC_URI += " \
-    https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \
-    git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=git/external/spirv-tools/src;rev=04b4a204aa501992ae85a207be1e200e195c98e1 \
-    git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=git/external/glslang/src;rev=0549c7127c2fbab2904892c9d6ff491fa1e93751 \
-    git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=git/external/spirv-headers/src;rev=e7294a8ebed84f8c5bd3686c68dbe12a4e65b644 \
-    git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \
-    git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \
-    git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=git/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \
-    git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=git/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \
-    git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=git/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \
-    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \
-    git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=git/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \
+    https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \
+    git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=04b4a204aa501992ae85a207be1e200e195c98e1 \
+    git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=0549c7127c2fbab2904892c9d6ff491fa1e93751 \
+    git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=e7294a8ebed84f8c5bd3686c68dbe12a4e65b644 \
+    git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \
+    git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \
+    git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \
+    git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \
+    git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \
+    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \
+    git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \
 "
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
index 45b9464711..563da1007a 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
@@ -11,16 +11,16 @@ python __anonymous() {
 }
 
 SRC_URI += " \
-    https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \
-    git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=git/external/spirv-tools/src;rev=3364b982713a0440d1d342dd5eec65b122a61b71 \
-    git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=git/external/glslang/src;rev=1b65bd602b23d401d1c4c86dfa90a36a52c66294 \
-    git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=git/external/spirv-headers/src;rev=767e901c986e9755a17e7939b3046fc2911a4bbd \
-    git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \
-    git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \
-    git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=git/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \
-    git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=git/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \
-    git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=git/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \
-    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \
-    git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=git/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \
+    https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \
+    git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=3364b982713a0440d1d342dd5eec65b122a61b71 \
+    git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=1b65bd602b23d401d1c4c86dfa90a36a52c66294 \
+    git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=767e901c986e9755a17e7939b3046fc2911a4bbd \
+    git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \
+    git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \
+    git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \
+    git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \
+    git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \
+    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \
+    git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \
     file://0001-Fix-missing-include-cstdint-causing-build-failures.patch;patchdir=external/amber/src \
 "
diff --git a/meta-oe/recipes-graphics/wayland/libei_1.4.1.bb b/meta-oe/recipes-graphics/wayland/libei_1.4.1.bb
index a2705785ae..764616906f 100644
--- a/meta-oe/recipes-graphics/wayland/libei_1.4.1.bb
+++ b/meta-oe/recipes-graphics/wayland/libei_1.4.1.bb
@@ -16,7 +16,6 @@ DEPENDS = " \
 
 SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 SRCREV = "9e0413cbc7d3ae6656266890425f152589ddf74d"
 
 inherit meson pkgconfig
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
index c1f5f4ed8e..bb909a313a 100644
--- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
+++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=maste
 DEPENDS = "pugixml"
 DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
 
-S = "${WORKDIR}/git"
 SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3"
 
 inherit cmake pkgconfig features_check
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
index 74f80e1844..1493eed7af 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \
            file://starting-fix.patch \
            file://CVE-2020-29074.patch \
            "
-S = "${WORKDIR}/git"
 
 DEPENDS = "\
         jpeg \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb
index 8b4526fc5e..8fd2ae2e84 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb
@@ -9,6 +9,5 @@ DEPENDS += "virtual/libx11 libdrm xorgproto"
 SRCREV = "8bbdb2ae3bb8ef649999a8da33ddbe11a04763b8"
 SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc;branch=master"
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} += "xserver-xorg-module-exa"
diff --git a/meta-oe/recipes-graphics/yad/yad_6.0.bb b/meta-oe/recipes-graphics/yad/yad_6.0.bb
index 9e46215fd8..64c12f5904 100644
--- a/meta-oe/recipes-graphics/yad/yad_6.0.bb
+++ b/meta-oe/recipes-graphics/yad/yad_6.0.bb
@@ -13,6 +13,5 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "gtk+3 glib-2.0-native intltool-native"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${datadir}/icons/"
diff --git a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb
index 3acf70235e..7562271d90 100644
--- a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb
+++ b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb
@@ -8,7 +8,6 @@ PV = "1.0.4+git"
 SRC_URI = "git://github.com/ReimuNotMoe/ydotool;protocol=https;branch=master"
 SRCREV = "0c295346d55afcc6aebaaee564333b3e1efabcbd"
 
-S = "${WORKDIR}/git"
 
 inherit cmake systemd