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>
2026-07-16 16:27:27 +00:00 · 2025-06-20 16:06:53 +02:00
parent 188491dd2b
commit fc78d37ff0
1054 changed files with 385 additions and 1160 deletions
@@ -12,7 +12,6 @@ SRCREV = "c540ce2431bdeac73359029d4592b45790e1d154"
 SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x \
          "

-S = "${WORKDIR}/git"

 inherit autotools pkgconfig

@@ -9,7 +9,6 @@ DEPENDS = "libusb1 openssl pcsc-lite"
 SRCREV = "190d6dee96ca70f8b614932b1498332b1504632b"
 SRC_URI = "git://repo.or.cz/oscam.git;protocol=https;nobranch=1"

-S = "${UNPACKDIR}/git"

 inherit cmake

@@ -16,7 +16,6 @@ SRCREV = "cc602833684953fc3e6f1c89d4f08f6dfef179e3"
 PV = "4.3+git"
 PKGV = "4.3+git${GITPKGV}"

-S = "${WORKDIR}/git"

 EXTRA_OECONF += "--arch=${TARGET_ARCH} \
                 --disable-hdhomerun_static \
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https"
 SRCREV = "1878e784321673561039a6a37076b2736f4dc98f"

-S = "${WORKDIR}/git"

 inherit pkgconfig cmake dos2unix

@@ -8,7 +8,6 @@ DEPENDS = "libebml"
 SRC_URI = "git://github.com/Matroska-Org/libmatroska.git;branch=v1.x;protocol=https"
 SRCREV = "f5315fddda2d434e47035c038549a808d8b8eac7"

-S = "${WORKDIR}/git"

 inherit pkgconfig cmake

@@ -15,7 +15,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "d2edc7710c72cbf3ab297c414e35ebda"
 SRC_URI[sha256sum] = "916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0"

-S = "${WORKDIR}/alsaequal"
+S = "${UNPACKDIR}/alsaequal"

 EXTRA_OEMAKE = " \
    Q='' \
@@ -9,7 +9,6 @@ SRCREV = "10aece4157eb79315da205f39e19bf6ab3ee30d0"
 SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main;tag=v${PV} \
           file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch"

-S = "${WORKDIR}/git"

 inherit cmake pkgconfig

@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \

 SRCREV = "959573c2cccef5cf074f5b2fa7941abbd699c5f4"

-S = "${WORKDIR}/git"

 PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf"
@@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55

 # Uppercase letters are not allowed in the recipe name, thus the recipe can not be named cdparanoia-III and
 # we need to add the path to the extracted sources explicitely:
-S = "${WORKDIR}/cdparanoia-III-${PV}"
+S = "${UNPACKDIR}/cdparanoia-III-${PV}"

 # cdparanoia Makefile can not be used with several threads (because the static library target and the shared
 # library target use object files which are compiled in the same directory, the object files are just removed
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669"
 SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;nobranch=1"
 SRCREV = "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa"

-S = "${WORKDIR}/git"

 DEPENDS:append:x86 = " nasm-native"
 DEPENDS:append:x86-64 = " nasm-native"
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/foo86/dcadec.git;protocol=https;branch=master \
           file://0001-define-BASELIB-make-variable.patch \
          "

-S = "${WORKDIR}/git"

 inherit lib_package

@@ -9,7 +9,6 @@ DEPENDS = "glib-2.0 dbus dleyna-core"

 SRC_URI = "git://github.com/01org/${BPN}.git;branch=master;protocol=https"
 SRCREV = "de913c35e5c936e2d40ddbd276ee902cd802bd3a"
-S = "${WORKDIR}/git"

 inherit autotools pkgconfig

@@ -15,7 +15,6 @@ PV .= "+git"

 SRC_URI = "git://github.com/01org/${BPN}.git;branch=master;protocol=https"
 SRCREV = "1c6853f5bc697dc0a8774fd70dbc915c4dbe7c5b"
-S = "${WORKDIR}/git"

 inherit autotools pkgconfig

@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/01org/${BPN}.git;branch=master;protocol=https \
           file://0001-add-gupnp-1.2-API-support.patch \
          "
 SRCREV = "50fd1ec9d51328e7dea98874129dc8d6fe3ea1dd"
-S = "${WORKDIR}/git"

 inherit autotools pkgconfig

@@ -14,7 +14,6 @@ RDEPENDS:${PN} = "dleyna-connector-dbus"
 PV .= "+git"
 SRC_URI = "git://github.com/01org/${BPN}.git;branch=master;protocol=https"
 SRCREV = "eb895ae82715e9889a948ffa810c0f828b4f4c76"
-S = "${WORKDIR}/git"

 inherit autotools pkgconfig

@@ -13,7 +13,7 @@ SRC_URI = "https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2;down
          file://0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch \
          "
 SRC_URI[sha256sum] = "f39e2f0ebed7e32bce83522062ad4d414f67fccd5df1b647618524497e15e057"
-S = "${WORKDIR}/${BPN}-3d43b280298c"
+S = "${UNPACKDIR}/${BPN}-3d43b280298c"

 inherit perlnative

@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875"
 SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=https;branch=master"
 SRCREV = "801f67f671929311e0c9952c5f92d6e147c7b003"

-S = "${WORKDIR}/git"

 SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7"
 SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e"
@@ -13,7 +13,6 @@ SRC_URI += "file://0001-Remove-defining-const-as-nothing.patch"

 SRCREV = "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88"

-S = "${WORKDIR}/git"

 EXTRA_OECONF += "--enable-shared"

@@ -13,7 +13,6 @@ SRC_URI = " \
 "
 SRCREV = "9f2edaa3cbd456997cb420fb68b6f960faaafd12"

-S = "${WORKDIR}/git"

 inherit cmake pkgconfig lib_package

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8"
 SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master"
 SRCREV = "870dd32d42f626dc2246d34b2224ffb6fd73e205"

-S = "${WORKDIR}/git"

 DEPENDS = "pugixml sqlite3 zlib fmt spdlog util-linux-libuuid libupnp libnsl2"

@@ -15,11 +15,10 @@ SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
 SRCREV_FORMAT = "default_common"
 SRC_URI = " \
    git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH} \
-    git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;branch=master;destsuffix=git/common;name=common \
+    git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/common;name=common \
    file://0001-tracers-Fix-buffer-overflow.patch \
 "

-S = "${WORKDIR}/git"

 EXTRA_OECONF += " \
    --disable-graphviz \
@@ -11,7 +11,6 @@ SRCBRANCH ?= "master"
 SRCREV = "dac03d5e4102080a8f3ef274a6a6583455962095"
 SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-gstd-Remove-redundant-rpaths.patch"
-S = "${WORKDIR}/git"

 # Remove the +really when upstream version is > 1.0
 PV = "1.0+really0.15.2"
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \
           file://0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch \
           "

-S = "${WORKDIR}/git"
 PV = "6.1.6"

 JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds"
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c528b75b07425b5c1d2e34de98c397b5"

 SRC_URI = "git://github.com/AOMediaCodec/libavif.git;protocol=https;branch=v1.0.x"

-S = "${WORKDIR}/git"
 SRCREV = "d1c26facaf5a8a97919ceee06814d05d10e25622"

 DEPENDS = "dav1d"
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/Avnu/libavtp.git;branch=master;protocol=https"
 SRC_URI:append:libc-musl = " file://0001-provide-64bit-host-to-network-conversion-macros.patch"
 SRCREV = "3599a5bf2d18fc3ae89b64f208d8380e6ee3a866"

-S = "${WORKDIR}/git"

 inherit meson pkgconfig

@@ -18,7 +18,6 @@ SRCREV = "35ed4b91291d9f3d08e4b51acfb51163e65df8f8"

 PE = "1"

-S = "${WORKDIR}/git"

 DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f"
 SRC_URI = "git://github.com/strukturag/libde265.git;branch=master;protocol=https"
 SRCREV = "17bb8d9fcea62db8cdeb0fc7ef8d15dbd19a22e4"

-S = "${WORKDIR}/git"

 inherit cmake pkgconfig

@@ -9,7 +9,6 @@ SRC_URI = "git://code.videolan.org/videolan/libdvbcsa.git;protocol=https;branch=
           file://libdvbcsa.pc \
 "

-S = "${WORKDIR}/git"

 inherit autotools lib_package pkgconfig

@@ -8,7 +8,6 @@ COMPATIBLE_MACHINE:powerpc64le = "null"

 SRC_URI = "git://github.com/strukturag/libheif.git;protocol=https;branch=master"

-S = "${WORKDIR}/git"
 SRCREV = "5e9deb19fe6b3768af0bb8e9e5e8438b15171bf3"

 inherit cmake pkgconfig
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

 SRC_URI = "git://github.com/google/liblc3.git;protocol=https;branch=main"

-S = "${WORKDIR}/git"
 SRCREV = "1a5938ebaca4f13fe79ce074f5dee079783aa29f"

 inherit pkgconfig meson
@@ -16,7 +16,7 @@ SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release
          "
 SRC_URI[sha256sum] = "093713c1c1024f4f10c4779a66ceb2af51fb7c908a9e99feb892d04019220ba1"

-S = "${WORKDIR}/libopenmpt-${PV}+release.autotools"
+S = "${UNPACKDIR}/libopenmpt-${PV}+release.autotools"

 inherit autotools pkgconfig ptest

@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master
           file://0001-Add-support-for-variable-libdir.patch \
          "

-S = "${WORKDIR}/git"

 EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix} LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
                ${@bb.utils.contains('TUNE_FEATURES', 'altivec', 'USE_ALTIVEC=1', '', d)}"
@@ -9,6 +9,5 @@ DEPENDS = "libusb jpeg"
 SRC_URI = "git://github.com/libuvc/libuvc.git;branch=master;protocol=https"
 SRCREV = "68d07a00e11d1944e27b7295ee69673239c00b4b"

-S = "${WORKDIR}/git"

 inherit cmake pkgconfig
@@ -27,6 +27,5 @@ SRC_URI = "git://github.com/MycroftAI/mimic1.git;branch=master;protocol=https \

 inherit autotools pkgconfig

-S = "${WORKDIR}/git"

 CPPFLAGS:append = " -Wno-error"
@@ -15,7 +15,6 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
           file://0001-Add-compatibility-with-FFMPEG-7.0.patch \
           "

-S = "${WORKDIR}/git"

 # This remove "--exclude=autopoint" option from autoreconf argument to avoid
 # configure.ac:30: error: required file './ABOUT-NLS' not found
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol
           file://0001-http-fetch-Pass-a-non-null-buffer-to-ne_set_request_.patch \
           "

-S = "${WORKDIR}/git"

 inherit cmake pkgconfig

@@ -9,7 +9,6 @@ SRC_URI = " \
    git://github.com/MusicPlayerDaemon/libmpdclient;branch=master;protocol=https \
 "
 SRCREV = "7124a0ad4841a44db084bb785a6e7120bc8f0139"
-S = "${WORKDIR}/git"

 PACKAGECONFIG ??= "tcp"
 PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false"
@@ -10,4 +10,3 @@ DEPENDS += "libmpdclient"
 SRC_URI = "git://github.com/MusicPlayerDaemon/mpc;branch=master;protocol=https"
 SRCREV = "31c900b79b3a1cd7f2944e92f24223d12589fdaa"

-S = "${WORKDIR}/git"
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \
           "
 SRCREV = "063abb31a68f7ee92a246256eec4234ab8b7ed8b"

-S = "${WORKDIR}/git"

 EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \
    -Dadplug=disabled \
@@ -34,4 +34,3 @@ PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false"

 SRC_URI = "git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https"
 SRCREV = "f81f875fc5785383d24f54fb9bd3cf06efd915a4"
-S = "${WORKDIR}/git"
@@ -20,7 +20,6 @@ SRC_URI = "git://github.com/MycroftAI/mycroft-core.git;branch=master;protocol=ht
           file://mycroft.service \
          "

-S = "${WORKDIR}/git"

 inherit systemd features_check

@@ -8,7 +8,6 @@ SRC_URI = " \
    file://0001-Makefile-add-clean-target.patch \
 "
 SRCREV = "1889e62e2d35ff7aa9baca2bceb14f053785e6f1"
-S = "${WORKDIR}/git"

 EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${baselib}"

@@ -10,7 +10,6 @@ DEPENDS = "zlib libsndfile1"
 SRCREV = "dc7d7054a5b4f3bec1dc23a42fd616a0847af948"
 SRC_URI = "git://github.com/kcat/openal-soft.git;protocol=https;branch=master"

-S = "${WORKDIR}/git"

 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pipewire pulseaudio', d)}"
 PACKAGECONFIG[alsa] = "-DALSOFT_BACKEND_ALSA=ON,-DALSOFT_BACKEND_ALSA=OFF,alsa-lib"
@@ -11,7 +11,6 @@ DEPENDS = " nasm-native"

 inherit meson pkgconfig

-S = "${WORKDIR}/git"
 SRCREV = "19120fcb8f89b16126e9cfee096b2f0751554fdc"
 BRANCH = "openh264v${PV}"
 SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \
@@ -8,7 +8,7 @@ SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz"
 SRC_URI[md5sum] = "ff2d0536e960cabbfb8ca7c8c1759b6c"
 SRC_URI[sha256sum] = "b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86"

-S = "${WORKDIR}/opus-tools-${PV}"
+S = "${UNPACKDIR}/opus-tools-${PV}"

 DEPENDS = "libopus libopusenc flac opusfile"

@@ -14,7 +14,6 @@ SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=http
           file://0001-pass-right-types-to-methods.patch \
           "

-S = "${WORKDIR}/git"
 SRCREV = "80dae7e24bec02b2befe09a72fbac6e2b38ccb5c"

 inherit meson pkgconfig
@@ -16,7 +16,6 @@ SRCREV = "83ada1e086f8fa49bf9652df2edd9ccee5efa48b"
 BRANCH = "${@oe.utils.trim_version('${PV}', 2)}"
 SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https"

-S = "${WORKDIR}/git"

 inherit meson pkgconfig systemd gettext useradd

@@ -13,7 +13,6 @@ SRC_URI = " \
    git://git.ffmpeg.org/rtmpdump;branch=master \
 "

-S = "${WORKDIR}/git"

 CVE_STATUS_GROUPS += "CVES_2015"
 CVES_2015 = "CVE-2015-8270 CVE-2015-8271 CVE-2015-8272"
@@ -9,8 +9,7 @@ SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c2

 inherit allarch

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

 do_install() {
    install -d ${D}${datadir}/movies
@@ -9,8 +9,7 @@ SRC_URI[sha256sum] = "40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db0

 inherit allarch

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

 do_install() {
    install -d ${D}${datadir}/movies
@@ -9,8 +9,7 @@ SRC_URI[sha256sum] = "b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06ed

 inherit allarch

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

 do_install() {
    install -d ${D}${datadir}/movies
@@ -8,8 +8,7 @@ SRC_URI[sha256sum] = "bd2b5bc6c16d4085034f47ef7e4b3938afe86b4eec4ac3cf2685367d3b

 inherit allarch

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

 do_install() {
    install -d ${D}${datadir}/movies
@@ -41,7 +41,6 @@ SRC_URI = "git://git.code.sf.net/p/sox/code;protocol=https;branch=master \
 # last release was in 2015, use latest hash from 2024-05-30
 PV .= "+git"
 SRCREV = "f3094754a7c2a7e55c35621d20fa9945736e72df"
-S = "${WORKDIR}/git"

 CVE_PRODUCT:append = " libsox_project:libsox sound_exchange_project:sound_exchange"

@@ -28,7 +28,6 @@ SRC_URI = "\
 # https://lists.openembedded.org/g/openembedded-devel/message/109325
 SRCREV = "df1282eb9af538ab1aadb6d66146e258451d4fe4"

-S = "${WORKDIR}/git"

 inherit autotools

@@ -10,7 +10,6 @@ PV .= "+git"
 SRCREV = "f78ed25aced2dfea743867b8205a787bfb091340"
 SRC_URI = "git://github.com/tinyalsa/tinyalsa;branch=master;protocol=https"

-S = "${WORKDIR}/git"

 inherit meson

@@ -12,7 +12,6 @@ SRC_URI = "git://gitlab.xiph.org/xiph/tremor.git;protocol=https;branch=master \
 "
 SRCREV = "7c30a66346199f3f09017a09567c6c8a3a0eedc8"

-S = "${WORKDIR}/git"

 inherit autotools pkgconfig

@@ -15,7 +15,7 @@ SRC_URI = " \
    file://0001-task_queue-fix-build-with-gcc-15.patch \
 "
 SRC_URI[sha256sum] = "2365e93e778d7b61b5d6e02d21c47d97222e9c7deff9e1d0838ad6ec2e86f1b9"
-S = "${WORKDIR}/webrtc-audio-processing-${PV}"
+S = "${UNPACKDIR}/webrtc-audio-processing-${PV}"

 LDFLAGS:append:libc-musl = " -lexecinfo"

@@ -13,7 +13,7 @@ SRC_URI = " \
    file://e9c78dc4712fa6362b0c839ad57b6b46dce1ba83.patch \
 "
 SRC_URI[sha256sum] = "ae9302824b2038d394f10213cab05312c564a038434269f11dbf68f511f9f9fe"
-S = "${WORKDIR}/webrtc-audio-processing-${PV}"
+S = "${UNPACKDIR}/webrtc-audio-processing-${PV}"

 LDFLAGS:append:libc-musl = " -lexecinfo"
 # | riscv32-yoe-linux-musl-ld.lld: error: undefined reference: __atomic_store_8
@@ -16,7 +16,6 @@ SRC_URI = " \
    file://90-OE-disable-session-dbus-dependent-features.lua \
 "

-S = "${WORKDIR}/git"

 inherit meson pkgconfig gobject-introspection systemd

@@ -13,7 +13,7 @@ SRC_URI = " \
    file://0001-json11.cpp-Include-cstdint.patch \
 "
 SRC_URI[sha256sum] = "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29"
-S = "${WORKDIR}/x265_${PV}/source"
+S = "${UNPACKDIR}/x265_${PV}/source"

 inherit lib_package cmake pkgconfig

@@ -11,7 +11,6 @@ SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681"
 SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master \
           file://0001-include-missing-cstdint.patch"

-S = "${WORKDIR}/git"

 inherit cmake

@@ -10,7 +10,6 @@ PV = "0.3.1+git"

 SRC_URI = "git://github.com/kirushyk/gst-instruments.git;protocol=https;branch=master"

-S = "${WORKDIR}/git"

 inherit vala meson pkgconfig

@@ -13,7 +13,7 @@ inherit gnomebase gobject-introspection vala features_check
 SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz"
 SRC_URI[sha256sum] = "c3bc5025d7db380587f9c8eb800c611f6b5a16d6b4b78fcff93f62876a677f17"

-S = "${WORKDIR}/libmediaart-${PV}"
+S = "${UNPACKDIR}/libmediaart-${PV}"

 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1"
 SRC_URI = "git://github.com/cisco/libsrtp.git;branch=main;protocol=https"
 SRCREV = "a566a9cfcd619e8327784aa7cff4a1276dc1e895"

-S = "${WORKDIR}/git"

 PACKAGECONFIG ?= ""
 PACKAGECONFIG[nss] = "-Dcrypto-library=nss,, nss,,, openssl"
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \
           file://0001-don-t-install-srt-ffplay.patch \
           "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"

 inherit cmake pkgconfig

@@ -19,7 +19,6 @@ REQUIRED_DISTRO_FEATURES = "opengl wayland"
 SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;branch=master \
           file://0001-screencast-Fix-build-with-older-mesa.patch"

-S = "${WORKDIR}/git"
 PV .= "+git"
 SRCREV = "d9ada849aeca6137915de2df69beaef4e272cc1d"