From 773cc706b18525cf7f43c140457a479d44736a6c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 13:59:15 -0700 Subject: [PATCH] layers: Convert to new override syntax Signed-off-by: Khem Raj --- .gitlab-ci/template/include/local-common.conf | 4 +- .gitlab-ci/template/include/local-wpe-qt.conf | 6 +-- .gitlab-ci/template/local.conf.sample | 2 +- classes/ruby.bbclass | 8 +-- conf/include/devupstream.inc | 2 +- conf/include/webkit-bleeding.inc | 10 ++-- .../qt-wpe-simple-browser_0.1.bb | 2 +- .../browserperfrunner_git.bb | 4 +- .../libarchive-zip-perl_1.60.bb | 2 +- recipes-browser/cog/cog.inc | 8 +-- recipes-browser/cog/cog_0.10.1.bb | 8 +-- recipes-browser/cog/cog_0.6.0.bb | 2 +- recipes-browser/cog/cog_0.8.1.bb | 2 +- recipes-browser/libwpe/libwpe.inc | 4 +- recipes-browser/libwpe/libwpe_1.12.0.bb | 4 +- .../packagegroup-wpewebkit-depends.bb | 30 +++++------ recipes-browser/webkitgtk/webkitgtk_2.34.1.bb | 54 +++++++++---------- .../wpebackend-fdo/wpebackend-fdo.inc | 8 +-- .../wpebackend-mesa/wpebackend-mesa_git.bb | 4 +- .../wpebackend-rdk/wpebackend-rdk.inc | 4 +- .../wpebackend-rdk_1.20200213.bb | 8 +-- recipes-browser/wpebackend/wpebackend.inc | 4 +- recipes-browser/wpewebkit/wpewebkit.inc | 54 +++++++++---------- recipes-browser/wpewebkit/wpewebkit_2.32.4.bb | 4 +- recipes-browser/wpewebkit/wpewebkit_2.34.1.bb | 10 ++-- recipes-cdm/sparkle-cdm/sparkle-cdm_git.bb | 14 ++--- recipes-devtools/dicts/test-dicts_git.bb | 2 +- .../fonts/webkit-test-fonts_git.bb | 2 +- .../bubblewrap/bubblewrap_0.4.1.bb | 4 +- .../xdg-dbus-proxy/xdg-dbus-proxy_0.1.2.bb | 4 +- recipes-graphics/harfbuzz/harfbuzz_%.bbappend | 2 +- recipes-graphics/mesa/mesa_21.0.3.bbappend | 2 +- recipes-graphics/mesa/mesa_21.2.1.bbappend | 2 +- recipes-multimedia/webm/libvpx_1.10.0.bb | 6 +-- 34 files changed, 143 insertions(+), 143 deletions(-) diff --git a/.gitlab-ci/template/include/local-common.conf b/.gitlab-ci/template/include/local-common.conf index 46db75b1..e03bd8f3 100644 --- a/.gitlab-ci/template/include/local-common.conf +++ b/.gitlab-ci/template/include/local-common.conf @@ -22,8 +22,8 @@ BB_DISKMON_DIRS ??= "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +PACKAGECONFIG:append:pn-qemu-native = " sdl" +PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" CONF_VERSION = "1" DL_DIR ?= "${BSPDIR}/downloads/" diff --git a/.gitlab-ci/template/include/local-wpe-qt.conf b/.gitlab-ci/template/include/local-wpe-qt.conf index 50b817cb..d567010d 100644 --- a/.gitlab-ci/template/include/local-wpe-qt.conf +++ b/.gitlab-ci/template/include/local-wpe-qt.conf @@ -1,8 +1,8 @@ -PACKAGECONFIG_append_pn-wpewebkit = " qtwpe" +PACKAGECONFIG:append:pn-wpewebkit = " qtwpe" -IMAGE_INSTALL_append = " wpewebkit-qtwpe-qml-plugin qt-wpe-simple-browser" +IMAGE_INSTALL:append = " wpewebkit-qtwpe-qml-plugin qt-wpe-simple-browser" -IMAGE_INSTALL_append = " qtbase-dev qtbase-mkspecs qtbase-plugins qtbase-staticdev qttranslations-qtbase \ +IMAGE_INSTALL:append = " qtbase-dev qtbase-mkspecs qtbase-plugins qtbase-staticdev qttranslations-qtbase \ qtdeclarative-dev qtdeclarative-mkspecs qtdeclarative-qmlplugins qtdeclarative-tools qtdeclarative-staticdev \ qtimageformats-dev qtimageformats-plugins \ qtscript-dev qtscript-mkspecs \ diff --git a/.gitlab-ci/template/local.conf.sample b/.gitlab-ci/template/local.conf.sample index 17ba9273..3dc4e771 100644 --- a/.gitlab-ci/template/local.conf.sample +++ b/.gitlab-ci/template/local.conf.sample @@ -1,7 +1,7 @@ DISTRO ?= '##DISTRO##' MACHINE ?= '##MACHINE##' -IMAGE_INSTALL_append = " wpewebkit cog" +IMAGE_INSTALL:append = " wpewebkit cog" include presets/##PRESETS##.conf include include/local-common.conf diff --git a/classes/ruby.bbclass b/classes/ruby.bbclass index e7671251..176a0b92 100644 --- a/classes/ruby.bbclass +++ b/classes/ruby.bbclass @@ -1,7 +1,7 @@ DEPENDS += " \ ruby-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ " @@ -146,7 +146,7 @@ EXPORT_FUNCTIONS do_compile do_install PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/.debug \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/.debug \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/.debug \ @@ -154,7 +154,7 @@ FILES_${PN}-dbg += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/*/*/*/.debug \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/cache \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin \ @@ -164,6 +164,6 @@ FILES_${PN} += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/plugins \ " -FILES_${PN}-doc += " \ +FILES:${PN}-doc += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/doc \ " diff --git a/conf/include/devupstream.inc b/conf/include/devupstream.inc index d63b10a9..b1fdbcde 100644 --- a/conf/include/devupstream.inc +++ b/conf/include/devupstream.inc @@ -24,7 +24,7 @@ BBCLASSEXTEND += "devupstream:target" -python devupstream_virtclass_handler_prepend () { +python devupstream_virtclass_handler:prepend () { uri = bb.fetch2.URI(d.getVar("SRC_URI").split()[0]) if uri.scheme == "git": d.setVar("S", "${WORKDIR}/git") diff --git a/conf/include/webkit-bleeding.inc b/conf/include/webkit-bleeding.inc index 9663491f..d7257b5a 100644 --- a/conf/include/webkit-bleeding.inc +++ b/conf/include/webkit-bleeding.inc @@ -9,8 +9,8 @@ PREFERRED_VERSION_wpebackend-fdo = "1.8.1+gitAUTOINC+%" PREFERRED_VERSION_wpebackend-rdk = "1.20180925+gitAUTOINC+%" PREFERRED_VERSION_wpewebkit = "2.30.5+gitAUTOINC+%" -SRCREV_class-devupstream_pn-cog = "${AUTOREV}" -SRCREV_class-devupstream_pn-libwpe = "${AUTOREV}" -SRCREV_class-devupstream_pn-wpebackend-fdo = "${AUTOREV}" -SRCREV_class-devupstream_pn-wpebackend-rdk = "${AUTOREV}" -SRCREV_class-devupstream_pn-wpewebkit = "${AUTOREV}" +SRCREV:class-devupstream:pn-cog = "${AUTOREV}" +SRCREV:class-devupstream:pn-libwpe = "${AUTOREV}" +SRCREV:class-devupstream:pn-wpebackend-fdo = "${AUTOREV}" +SRCREV:class-devupstream:pn-wpebackend-rdk = "${AUTOREV}" +SRCREV:class-devupstream:pn-wpewebkit = "${AUTOREV}" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-wpe-simple-browser/qt-wpe-simple-browser_0.1.bb b/dynamic-layers/qt5-layer/recipes-qt/qt-wpe-simple-browser/qt-wpe-simple-browser_0.1.bb index 6fdda6c2..7c2c0829 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt-wpe-simple-browser/qt-wpe-simple-browser_0.1.bb +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-wpe-simple-browser/qt-wpe-simple-browser_0.1.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68" DEPENDS = "qtbase qtdeclarative" -RDEPENDS_${PN} = "wpewebkit wpewebkit-qtwpe-qml-plugin" +RDEPENDS:${PN} = "wpewebkit wpewebkit-qtwpe-qml-plugin" SRC_URI = "file://CMakeLists.txt \ file://main.cpp \ diff --git a/recipes-benchmark/browserperfrunner/browserperfrunner_git.bb b/recipes-benchmark/browserperfrunner/browserperfrunner_git.bb index 6fceeb41..04266187 100644 --- a/recipes-benchmark/browserperfrunner/browserperfrunner_git.bb +++ b/recipes-benchmark/browserperfrunner/browserperfrunner_git.bb @@ -14,7 +14,7 @@ PACKAGES = "${PN}" # Note: this recipe depends on meta-openembedded/meta-python for python-psutil # And the dromaeo test needs the crc32 binary that is provided by libarchive-zip-perl -RDEPENDS_${PN} = " curl make patch perl procps psmisc python python-misc \ +RDEPENDS:${PN} = " curl make patch perl procps psmisc python python-misc \ python-modules python-psutil python-setuptools \ gobject-introspection python-pygobject gtk+3 ruby \ subversion libarchive-zip-perl" @@ -37,4 +37,4 @@ do_install() { cp -dr --preserve=mode,timestamp ${S}/webkitpy ${D}${PYTHON_SITEPACKAGES_DIR}/ } -FILES_${PN} = "${bindir}/* ${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN} = "${bindir}/* ${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/recipes-benchmark/browserperfrunner/libarchive-zip-perl_1.60.bb b/recipes-benchmark/browserperfrunner/libarchive-zip-perl_1.60.bb index 1c8800c2..491c19e0 100644 --- a/recipes-benchmark/browserperfrunner/libarchive-zip-perl_1.60.bb +++ b/recipes-benchmark/browserperfrunner/libarchive-zip-perl_1.60.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/Archive-Zip-${PV}" # crc32 at least depends on perl-module-lib, perl-module-cwd, perl-module-zip* ... # so let's just depend on the perl-modules meta-package for simplicity. -RDEPENDS_${PN} += "perl-modules" +RDEPENDS:${PN} += "perl-modules" inherit cpan diff --git a/recipes-browser/cog/cog.inc b/recipes-browser/cog/cog.inc index 00eabb99..a2905431 100644 --- a/recipes-browser/cog/cog.inc +++ b/recipes-browser/cog/cog.inc @@ -18,12 +18,12 @@ DEPENDS = " \ libsoup-2.4 glib-2.0 wayland-native wayland-protocols \ " -DEPENDS_append_class-target = " \ +DEPENDS:append:class-target = " \ ${@bb.utils.contains('PACKAGECONFIG', 'fdo', 'wayland-native', '', d)} \ " # At run-time cog package should depend on virtual/wpebackend unless webkitgtk+ is enabled. -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${@bb.utils.contains('PACKAGECONFIG', 'webkitgtk', '', 'virtual/wpebackend', d)} \ xkeyboard-config \ " @@ -42,12 +42,12 @@ FILES_SOLIBSDEV = "${libdir}/libcogcore*.so" # cog < 0.10.0 installed D-Bus policy configuration into sysconfdir # cog >= 0.10.0 installs it into datadir, see https://github.com/Igalia/cog/pull/296 -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libcogplatform*.so \ ${sysconfdir}/dbus-1/system.d/com.igalia.Cog.conf \ ${datadir}/dbus-1/system.d/com.igalia.Cog.conf \ " -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" # Local user name starting cog with DBus system session enabled. This should be # set only if the dbus PACKAGECONFIG is enabled. diff --git a/recipes-browser/cog/cog_0.10.1.bb b/recipes-browser/cog/cog_0.10.1.bb index b3bf42f2..75f62749 100644 --- a/recipes-browser/cog/cog_0.10.1.bb +++ b/recipes-browser/cog/cog_0.10.1.bb @@ -9,9 +9,9 @@ PACKAGECONFIG[headless] = "-DCOG_PLATFORM_HEADLESS=ON,-DCOG_PLATFORM_HEADLESS=OF # Available from 0.12.X (future) or for devupstream (HEAD:master. Ref: https://github.com/Igalia/cog/commit/b595d12945148205af9da765cf05d092cbc234c4) PACKAGECONFIG[wl] = "-DCOG_PLATFORM_WL=ON,-DCOG_PLATFORM_WL=OFF,wpebackend-fdo" -PACKAGECONFIG_class-devupstream ?= " ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/wpebackend', 'wpebackend-fdo', 'fdo wl drm', '', d)} " +PACKAGECONFIG:class-devupstream ?= " ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/wpebackend', 'wpebackend-fdo', 'fdo wl drm', '', d)} " -SRC_URI_class-devupstream = "git://github.com/Igalia/cog.git;protocol=https;branch=cog-0.10" -SRCREV_class-devupstream = "cfbbde0331e11b5b9ab5b4cc0749d55cf74b3d05" +SRC_URI:class-devupstream = "git://github.com/Igalia/cog.git;protocol=https;branch=cog-0.10" +SRCREV:class-devupstream = "cfbbde0331e11b5b9ab5b4cc0749d55cf74b3d05" -RDEPENDS_${PN} += "wpewebkit (>= 2.32)" +RDEPENDS:${PN} += "wpewebkit (>= 2.32)" diff --git a/recipes-browser/cog/cog_0.6.0.bb b/recipes-browser/cog/cog_0.6.0.bb index 8c4c74fb..9b9bfdae 100644 --- a/recipes-browser/cog/cog_0.6.0.bb +++ b/recipes-browser/cog/cog_0.6.0.bb @@ -4,4 +4,4 @@ SRC_URI = "https://github.com/Igalia/cog/releases/download/v${PV}/cog-${PV}.tar. SRC_URI[sha256sum] = "208f58e0533b269400875237a95e994c93da7234a29fd1c904e756b88963e35d" -RDEPENDS_${PN} += "wpewebkit (>= 2.28)" +RDEPENDS:${PN} += "wpewebkit (>= 2.28)" diff --git a/recipes-browser/cog/cog_0.8.1.bb b/recipes-browser/cog/cog_0.8.1.bb index fbf427d8..286319f3 100644 --- a/recipes-browser/cog/cog_0.8.1.bb +++ b/recipes-browser/cog/cog_0.8.1.bb @@ -2,4 +2,4 @@ require cog.inc SRC_URI[sha256sum] = "b82e917eb764943b9859c631974f8f0e748b79ae87bb7a944f46c818740e0208" -RDEPENDS_${PN} += "wpewebkit (>= 2.28)" +RDEPENDS:${PN} += "wpewebkit (>= 2.28)" diff --git a/recipes-browser/libwpe/libwpe.inc b/recipes-browser/libwpe/libwpe.inc index 6aba5f5d..c16cea48 100644 --- a/recipes-browser/libwpe/libwpe.inc +++ b/recipes-browser/libwpe/libwpe.inc @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" DEPENDS = "virtual/egl libxkbcommon" PROVIDES += "virtual/libwpe" -RPROVIDES_${PN} += "virtual/libwpe" +RPROVIDES:${PN} += "virtual/libwpe" # Workaround build issue with RPi userland EGL libraries. -CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" +CFLAGS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" inherit cmake diff --git a/recipes-browser/libwpe/libwpe_1.12.0.bb b/recipes-browser/libwpe/libwpe_1.12.0.bb index da155e05..c3cb66ef 100644 --- a/recipes-browser/libwpe/libwpe_1.12.0.bb +++ b/recipes-browser/libwpe/libwpe_1.12.0.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" SRC_URI[sha256sum] = "e8eeca228a6b4c36294cfb63f7d3ba9ada47a430904a5a973b3c99c96a44c18c" -SRC_URI_class-devupstream = "git://github.com/WebPlatformForEmbedded/libwpe.git;protocol=https;branch=master" -SRCREV_class-devupstream = "e2a90a50857f4095de7e763cc6adc8540275ff49" +SRC_URI:class-devupstream = "git://github.com/WebPlatformForEmbedded/libwpe.git;protocol=https;branch=master" +SRCREV:class-devupstream = "e2a90a50857f4095de7e763cc6adc8540275ff49" diff --git a/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb b/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb index 507d8b7d..b34b9b5f 100644 --- a/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb +++ b/recipes-browser/packagegroups/packagegroup-wpewebkit-depends.bb @@ -17,7 +17,7 @@ PACKAGES = " \ packagegroup-wpewebkit-depends-tests \ " -RDEPENDS_packagegroup-wpewebkit-depends = "\ +RDEPENDS:packagegroup-wpewebkit-depends = "\ packagegroup-wpewebkit-depends-sys-extended \ packagegroup-wpewebkit-depends-perl \ packagegroup-wpewebkit-depends-python \ @@ -31,7 +31,7 @@ RDEPENDS_packagegroup-wpewebkit-depends = "\ packagegroup-wpewebkit-depends-tests \ " -RDEPENDS_packagegroup-wpewebkit-depends-sys-extended = "\ +RDEPENDS:packagegroup-wpewebkit-depends-sys-extended = "\ curl \ ${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'dunfell', 'dhcp-client', 'dhcpcd', d)} \ hdparm \ @@ -46,7 +46,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-sys-extended = "\ zip \ " -RDEPENDS_packagegroup-wpewebkit-depends-perl = "\ +RDEPENDS:packagegroup-wpewebkit-depends-perl = "\ gdbm \ perl \ perl-modules \ @@ -56,7 +56,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-perl = "\ zlib \ " -RDEPENDS_packagegroup-wpewebkit-depends-python = "\ +RDEPENDS:packagegroup-wpewebkit-depends-python = "\ expat \ gdbm \ gmp \ @@ -67,7 +67,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-python = "\ zip \ " -RDEPENDS_packagegroup-wpewebkit-depends-misc = "\ +RDEPENDS:packagegroup-wpewebkit-depends-misc = "\ gettext \ gettext-runtime \ groff \ @@ -78,9 +78,9 @@ RDEPENDS_packagegroup-wpewebkit-depends-misc = "\ rpm \ " STRACE = "strace" -STRACE_riscv32 = "" +STRACE:riscv32 = "" -RDEPENDS_packagegroup-wpewebkit-depends-core = "\ +RDEPENDS:packagegroup-wpewebkit-depends-core = "\ at \ bash \ bc \ @@ -144,12 +144,12 @@ RDEPENDS_packagegroup-wpewebkit-depends-core = "\ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', 'libseccomp', '', d)} \ libicudata \ " -RDEPENDS_packagegroup-wpewebkit-depends-core_append_libc-glibc = "\ +RDEPENDS:packagegroup-wpewebkit-depends-core:append:libc-glibc = "\ glibc \ glibc-utils \ localedef \ " -RDEPENDS_packagegroup-wpewebkit-depends-desktop = "\ +RDEPENDS:packagegroup-wpewebkit-depends-desktop = "\ libxt \ libxxf86vm \ libdrm \ @@ -169,7 +169,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-desktop = "\ alsa-lib \ " -RDEPENDS_packagegroup-wpewebkit-depends-runtime-add = "\ +RDEPENDS:packagegroup-wpewebkit-depends-runtime-add = "\ ldd \ e2fsprogs-mke2fs \ mkfontdir \ @@ -178,7 +178,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-runtime-add = "\ libxml-perl \ libxml-sax-perl \ " -RDEPENDS_packagegroup-wpewebkit-depends-runtime-add_append_libc-glibc = "\ +RDEPENDS:packagegroup-wpewebkit-depends-runtime-add:append:libc-glibc = "\ glibc-localedatas \ glibc-gconvs \ glibc-charmaps \ @@ -188,7 +188,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-runtime-add_append_libc-glibc = "\ glibc-pcprofile \ " -RDEPENDS_packagegroup-wpewebkit-depends-alternative = " \ +RDEPENDS:packagegroup-wpewebkit-depends-alternative = " \ geoclue \ libtasn1 \ woff2 \ @@ -201,7 +201,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-alternative = " \ openh264 \ " -RDEPENDS_packagegroup-wpewebkit-depends-video = " \ +RDEPENDS:packagegroup-wpewebkit-depends-video = " \ gstreamer1.0 \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ @@ -231,7 +231,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-video = " \ gstreamer1.0-plugins-bad-videoparsersbad \ " -RDEPENDS_packagegroup-wpewebkit-depends-extra = " \ +RDEPENDS:packagegroup-wpewebkit-depends-extra = " \ ca-certificates \ shared-mime-info \ ttf-dejavu-sans \ @@ -242,7 +242,7 @@ RDEPENDS_packagegroup-wpewebkit-depends-extra = " \ gstreamer1.0-plugins-bad-meta \ " -RDEPENDS_packagegroup-wpewebkit-depends-tests = " \ +RDEPENDS:packagegroup-wpewebkit-depends-tests = " \ pkgconfig \ p7zip \ git \ diff --git a/recipes-browser/webkitgtk/webkitgtk_2.34.1.bb b/recipes-browser/webkitgtk/webkitgtk_2.34.1.bb index 48217bb0..2da3c868 100644 --- a/recipes-browser/webkitgtk/webkitgtk_2.34.1.bb +++ b/recipes-browser/webkitgtk/webkitgtk_2.34.1.bb @@ -5,21 +5,21 @@ LICENSE = "BSD & LGPLv2+" LIC_FILES_CHKSUM = "file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 " # you need harfbuzz with icu enabled, you can add this to your config: -# PACKAGECONFIG_append_pn-harfbuzz = " icu" +# PACKAGECONFIG:append:pn-harfbuzz = " icu" DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libidn \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native icu \ gperf-native perl-native ruby-native ccache-native ninja-native \ libwebp harfbuzz glib-2.0 gettext-native glib-2.0-native \ sqlite3 libgcrypt" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI = " \ https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz;name=tarball \ file://0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch \ " SRC_URI[tarball.sha256sum] = "443c1316705de024741748e85fe32324d299d9ee68e6feb340b89e4a04073dee" -RRECOMMENDS_${PN} = "${PN}-bin \ +RRECOMMENDS:${PN} = "${PN}-bin \ ca-certificates \ shared-mime-info \ ttf-dejavu-sans \ @@ -27,7 +27,7 @@ RRECOMMENDS_${PN} = "${PN}-bin \ ttf-dejavu-serif \ ${@bb.utils.contains('PACKAGECONFIG', 'video', 'gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta gstreamer1.0-plugins-bad-meta', '', d)} \ " -RRECOMMENDS_${PN}-bin = "adwaita-icon-theme librsvg-gtk" +RRECOMMENDS:${PN}-bin = "adwaita-icon-theme librsvg-gtk" inherit cmake lib_package pkgconfig perlnative python3native @@ -81,44 +81,44 @@ EXTRA_OECMAKE = " \ " # Javascript JIT is not supported on ppc/arm < v6/RISCV/mips64 and disable gold on mips/riscv -PACKAGECONFIG_remove_powerpc = "jit" -PACKAGECONFIG_remove_powerpc64 = "jit" -PACKAGECONFIG_remove_powerpc64le = "jit" -PACKAGECONFIG_remove_armv4 = "jit" -PACKAGECONFIG_remove_armv5 = "jit" -PACKAGECONFIG_remove_armv6 = "jit" -PACKAGECONFIG_remove_riscv32 = "jit gold" -PACKAGECONFIG_remove_riscv64 = "jit gold" -PACKAGECONFIG_remove_mipsarchn64 = "jit gold" -PACKAGECONFIG_remove_mipsarchn32 = "jit gold" -PACKAGECONFIG_remove_mipsarcho32 = "gold" +PACKAGECONFIG:remove:powerpc = "jit" +PACKAGECONFIG:remove:powerpc64 = "jit" +PACKAGECONFIG:remove:powerpc64le = "jit" +PACKAGECONFIG:remove:armv4 = "jit" +PACKAGECONFIG:remove:armv5 = "jit" +PACKAGECONFIG:remove:armv6 = "jit" +PACKAGECONFIG:remove:riscv32 = "jit gold" +PACKAGECONFIG:remove:riscv64 = "jit gold" +PACKAGECONFIG:remove:mipsarchn64 = "jit gold" +PACKAGECONFIG:remove:mipsarchn32 = "jit gold" +PACKAGECONFIG:remove:mipsarcho32 = "gold" # binutils 2.25.1 has a bug on aarch64: # https://sourceware.org/bugzilla/show_bug.cgi?id=18430 -PACKAGECONFIG_remove_aarch64 = "gold" +PACKAGECONFIG:remove:aarch64 = "gold" # http://errors.yoctoproject.org/Errors/Details/20370/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 # https://bugs.webkit.org/show_bug.cgi?id=159880 # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). -ARM_INSTRUCTION_SET_armv7a = "thumb" -ARM_INSTRUCTION_SET_armv7r = "thumb" -ARM_INSTRUCTION_SET_armv7m = "thumb" -ARM_INSTRUCTION_SET_armv7ve = "thumb" +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7m = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" # Install MiniBrowser in PATH -do_install_append() { +do_install:append() { if test -f ${D}${libexecdir}/webkit2gtk-4.0/MiniBrowser; then mkdir -p ${D}${bindir} mv ${D}${libexecdir}/webkit2gtk-4.0/MiniBrowser ${D}${bindir} fi } -FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" -FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so" -FILES_${PN}-dbg += "${libdir}/webkitgtk/webkit2gtk-4.0/.debug/*" +FILES:${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" +FILES:${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so" +FILES:${PN}-dbg += "${libdir}/webkitgtk/webkit2gtk-4.0/.debug/*" diff --git a/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc b/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc index f6aa09db..48440cb1 100644 --- a/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc +++ b/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc @@ -7,13 +7,13 @@ SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" DEPENDS = "glib-2.0 libxkbcommon wayland libepoxy libwpe" -DEPENDS_append_class-target = " wayland-native" +DEPENDS:append:class-target = " wayland-native" PROVIDES += "virtual/wpebackend" -RPROVIDES_${PN} += "virtual/wpebackend" +RPROVIDES:${PN} += "virtual/wpebackend" FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/libWPEBackend-fdo-*.so" -INSANE_SKIP_${PN} ="dev-so" +FILES:${PN} += "${libdir}/libWPEBackend-fdo-*.so" +INSANE_SKIP:${PN} ="dev-so" # wpebackend-fdo uses meson since (not branched yet) # https://github.com/Igalia/WPEBackend-fdo/commit/9c13d73bcc3726e2290c182d76d67b384f4c1318 diff --git a/recipes-browser/wpebackend-mesa/wpebackend-mesa_git.bb b/recipes-browser/wpebackend-mesa/wpebackend-mesa_git.bb index 4502c90d..74be8df0 100644 --- a/recipes-browser/wpebackend-mesa/wpebackend-mesa_git.bb +++ b/recipes-browser/wpebackend-mesa/wpebackend-mesa_git.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ae4db0d4b812334e1539cd5aa6e2f46" DEPENDS = "wpebackend glib-2.0 libxkbcommon wayland virtual/libgl" PROVIDES += "virtual/wpebackend" -RPROVIDES_${PN} += "virtual/wpebackend" +RPROVIDES:${PN} += "virtual/wpebackend" SRCREV = "3f9f87d5f42c27a22273d67db072bd7f2cba6135" SRC_URI = "git://github.com/WebPlatformForEmbedded/WPEBackend-mesa.git;protocol=http;branch=master" @@ -25,5 +25,5 @@ do_install() { } FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/libWPEBackend-default.so ${libdir}/libWPEBackend-mesa.so" +FILES:${PN} += "${libdir}/libWPEBackend-default.so ${libdir}/libWPEBackend-mesa.so" INSANE_SKIP ="dev-so" diff --git a/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc b/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc index 0a796073..16d03a9e 100644 --- a/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc +++ b/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://src/wayland/display.h;;beginline=5;endline=24;md5=b1c SRC_URI = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=git;branch=master" PROVIDES += "virtual/wpebackend" -RPROVIDES_${PN} += "virtual/wpebackend" +RPROVIDES:${PN} += "virtual/wpebackend" DEPENDS = "libwpe glib-2.0 libinput" @@ -37,5 +37,5 @@ do_install() { } FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/libWPEBackend-default.so ${libdir}/libWPEBackend-rdk.so" +FILES:${PN} += "${libdir}/libWPEBackend-default.so ${libdir}/libWPEBackend-rdk.so" INSANE_SKIP ="dev-so" diff --git a/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20200213.bb b/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20200213.bb index d21e975e..d7e132cd 100644 --- a/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20200213.bb +++ b/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20200213.bb @@ -11,9 +11,9 @@ S = "${WORKDIR}/git" BBCLASSEXTEND += "devupstream:target" -PROVIDES_append_class-devupstream = " virtual/wpebackend" +PROVIDES:append:class-devupstream = " virtual/wpebackend" -SRC_URI_class-devupstream = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=https;branch=master" -SRCREV_class-devupstream = "3ec8dfd1a1f1cede256fd5de0a63a8c6b6a31ffa" +SRC_URI:class-devupstream = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=https;branch=master" +SRCREV:class-devupstream = "3ec8dfd1a1f1cede256fd5de0a63a8c6b6a31ffa" -RPROVIDES_${PN}_append_class-devupstream += "virtual/wpebackend" +RPROVIDES:${PN}:append:class-devupstream += "virtual/wpebackend" diff --git a/recipes-browser/wpebackend/wpebackend.inc b/recipes-browser/wpebackend/wpebackend.inc index 24e0199a..6d80a92a 100644 --- a/recipes-browser/wpebackend/wpebackend.inc +++ b/recipes-browser/wpebackend/wpebackend.inc @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ae4db0d4b812334e1539cd5aa6e2f46" DEPENDS = "virtual/egl libxkbcommon" PROVIDES += "virtual/libwpe" -RPROVIDES_${PN} += "virtual/libwpe" +RPROVIDES:${PN} += "virtual/libwpe" # Workaround build issue with RPi userland EGL libraries. -CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" +CFLAGS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" inherit cmake diff --git a/recipes-browser/wpewebkit/wpewebkit.inc b/recipes-browser/wpewebkit/wpewebkit.inc index 4a2ecde2..d4dec3bd 100644 --- a/recipes-browser/wpewebkit/wpewebkit.inc +++ b/recipes-browser/wpewebkit/wpewebkit.inc @@ -80,7 +80,7 @@ PACKAGECONFIG[webaudio] = "-DENABLE_WEB_AUDIO=ON,-DENABLE_WEB_AUDIO=OFF,gstreame PACKAGECONFIG[webcrypto] = "-DENABLE_WEB_CRYPTO=ON,-DENABLE_WEB_CRYPTO=OFF,libgcrypt libtasn1" PACKAGECONFIG[webgl2] = "-DENABLE_WEBGL2=ON,-DENABLE_WEBGL2=OFF," PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" -# 2dcanvas requires cairo with opengl support. Try by setting in local.conf: PACKAGECONFIG_append_pn-cairo = " glesv2" +# 2dcanvas requires cairo with opengl support. Try by setting in local.conf: PACKAGECONFIG:append:pn-cairo = " glesv2" PACKAGECONFIG[2dcanvas] = "-DENABLE_ACCELERATED_2D_CANVAS=ON,-DENABLE_ACCELERATED_2D_CANVAS=OFF," PACKAGECONFIG[remote-inspector] = "-DENABLE_REMOTE_INSPECTOR=ON,-DENABLE_REMOTE_INSPECTOR=OFF," PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF,libvpx libevent libopus openh264" @@ -98,45 +98,45 @@ EXTRA_OECMAKE = " -DPORT=WPE -G Ninja" # If SSE code compiles, assume it runs successfully (it can't actually run # because of cross compiling) -EXTRA_OECMAKE_append_x86 = " -DHAVE_SSE2_EXTENSIONS_EXITCODE=0" +EXTRA_OECMAKE:append:x86 = " -DHAVE_SSE2_EXTENSIONS_EXITCODE=0" # Javascript JIT is not supported on ppc/arm < v6/RISCV/mips64 and disable gold on mips/riscv -PACKAGECONFIG_remove_powerpc = "jit" -PACKAGECONFIG_remove_powerpc64 = "jit" -PACKAGECONFIG_remove_powerpc64le = "jit" -PACKAGECONFIG_remove_armv4 = "jit" -PACKAGECONFIG_remove_armv5 = "jit" -PACKAGECONFIG_remove_armv6 = "jit" -PACKAGECONFIG_remove_riscv32 = "jit gold" -PACKAGECONFIG_remove_riscv64 = "jit gold" -PACKAGECONFIG_remove_mipsarchn64 = "jit" -PACKAGECONFIG_remove_mipsarchn32 = "jit" +PACKAGECONFIG:remove:powerpc = "jit" +PACKAGECONFIG:remove:powerpc64 = "jit" +PACKAGECONFIG:remove:powerpc64le = "jit" +PACKAGECONFIG:remove:armv4 = "jit" +PACKAGECONFIG:remove:armv5 = "jit" +PACKAGECONFIG:remove:armv6 = "jit" +PACKAGECONFIG:remove:riscv32 = "jit gold" +PACKAGECONFIG:remove:riscv64 = "jit gold" +PACKAGECONFIG:remove:mipsarchn64 = "jit" +PACKAGECONFIG:remove:mipsarchn32 = "jit" # mips/gold does not yet implement # error: .gnu.hash is incompatible with the MIPS ABI -PACKAGECONFIG_remove_mipsarcho32 = "gold" +PACKAGECONFIG:remove:mipsarcho32 = "gold" -PACKAGECONFIG_remove_mipsarcho32_toolchain-clang = "jit" +PACKAGECONFIG:remove:mipsarcho32:toolchain-clang = "jit" -LDFLAGS_append_riscv64 = " -pthread" +LDFLAGS:append:riscv64 = " -pthread" -FULL_OPTIMIZATION_remove = "-g" +FULL_OPTIMIZATION:remove = "-g" LEAD_SONAME = "libWPEWebKit.so" PACKAGES =+ "${PN}-web-inspector-plugin ${PN}-qtwpe-qml-plugin" -FILES_${PN} += "${libdir}/wpe-webkit*/injected-bundle/libWPEInjectedBundle.so" -FILES_${PN}-web-inspector-plugin += "${libdir}/libWPEWebInspectorResources.so ${libdir}/wpe-webkit-*/libWPEWebInspectorResources.so" -INSANE_SKIP_${PN}-web-inspector-plugin = "dev-so" +FILES:${PN} += "${libdir}/wpe-webkit*/injected-bundle/libWPEInjectedBundle.so" +FILES:${PN}-web-inspector-plugin += "${libdir}/libWPEWebInspectorResources.so ${libdir}/wpe-webkit-*/libWPEWebInspectorResources.so" +INSANE_SKIP:${PN}-web-inspector-plugin = "dev-so" -FILES_${PN}-qtwpe-qml-plugin += "${libdir}/qt5/qml/org/wpewebkit/qtwpe/*" -INSANE_SKIP_${PN}-qtwpe-qml-plugin = "dev-so" +FILES:${PN}-qtwpe-qml-plugin += "${libdir}/qt5/qml/org/wpewebkit/qtwpe/*" +INSANE_SKIP:${PN}-qtwpe-qml-plugin = "dev-so" # JSC JIT on ARMv7 is better supported with Thumb2 instruction set. -ARM_INSTRUCTION_SET_armv7a = "thumb" -ARM_INSTRUCTION_SET_armv7r = "thumb" -ARM_INSTRUCTION_SET_armv7m = "thumb" -ARM_INSTRUCTION_SET_armv7ve = "thumb" +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7m = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" # Extra runtime depends -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libgles2 \ virtual/wpebackend \ ${@bb.utils.contains('PACKAGECONFIG', 'remote-inspector', '${PN}-web-inspector-plugin', '', d)} \ @@ -166,7 +166,7 @@ RDEPENDS_${PN}-web-inspector-plugin += " \ " # Extra runtime recommends -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ ca-certificates \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ diff --git a/recipes-browser/wpewebkit/wpewebkit_2.32.4.bb b/recipes-browser/wpewebkit/wpewebkit_2.32.4.bb index a854d821..bd588051 100644 --- a/recipes-browser/wpewebkit/wpewebkit_2.32.4.bb +++ b/recipes-browser/wpewebkit/wpewebkit_2.32.4.bb @@ -1,6 +1,6 @@ require wpewebkit.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI = "\ https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz;name=tarball \ @@ -9,5 +9,5 @@ SRC_URI = "\ SRC_URI[tarball.sha256sum] = "381f1422cbc319db1aa42dda48de39590ed90ac3bec6b81ec83f3f2cae5c3eeb" DEPENDS += " libwpe" -RCONFLICTS_${PN} = "libwpe (< 1.6) wpebackend-fdo (< 1.8)" +RCONFLICTS:${PN} = "libwpe (< 1.6) wpebackend-fdo (< 1.8)" diff --git a/recipes-browser/wpewebkit/wpewebkit_2.34.1.bb b/recipes-browser/wpewebkit/wpewebkit_2.34.1.bb index 07844914..d2035b83 100644 --- a/recipes-browser/wpewebkit/wpewebkit_2.34.1.bb +++ b/recipes-browser/wpewebkit/wpewebkit_2.34.1.bb @@ -1,7 +1,7 @@ require wpewebkit.inc require conf/include/devupstream.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI = "\ https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz;name=tarball \ @@ -11,18 +11,18 @@ SRC_URI = "\ SRC_URI[tarball.sha256sum] = "cb336986341be9c3a9b1ca2c18de0d29d90ae4e77b9967a6f6879597e7a969f7" DEPENDS += " libwpe" -RCONFLICTS_${PN} = "libwpe (< 1.8) wpebackend-fdo (< 1.10)" +RCONFLICTS:${PN} = "libwpe (< 1.8) wpebackend-fdo (< 1.10)" -SRC_URI_class-devupstream = "git://git.webkit.org/WebKit.git;branch=master" +SRC_URI:class-devupstream = "git://git.webkit.org/WebKit.git;branch=master" # WPE 2.34.X branch was forked from the main branch in this commit -SRCREV_class-devupstream = "30c41fe654d9556a5681663166c1461132326ff7" +SRCREV:class-devupstream = "30c41fe654d9556a5681663166c1461132326ff7" # Needed for since >2.34. PACKAGECONFIG[dfg-jit] = "-DENABLE_DFG_JIT=ON,-DENABLE_DFG_JIT=OFF," PACKAGECONFIG[jit] = "-DENABLE_JIT=ON,-DENABLE_JIT=OFF," PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF," -PACKAGECONFIG_append = " dfg-jit" +PACKAGECONFIG:append = " dfg-jit" # libsoup-3 will be available not before Poky kirkstone. # http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-support/libsoup/libsoup_3.0.1.bb?id=de296e2b2be876ca5cf2af309b710111e2b2581e diff --git a/recipes-cdm/sparkle-cdm/sparkle-cdm_git.bb b/recipes-cdm/sparkle-cdm/sparkle-cdm_git.bb index 8870bd46..eddb9db1 100644 --- a/recipes-cdm/sparkle-cdm/sparkle-cdm_git.bb +++ b/recipes-cdm/sparkle-cdm/sparkle-cdm_git.bb @@ -20,19 +20,19 @@ PACKAGECONFIG[sample-player] = "-Dsample-player=enabled,-Dsample-player=disabled BBCLASSEXTEND = "devupstream:target" LIC_FILES_CHKSUM-devupstream = "file://COPYING;md5=5d34cbc44b66f4a9ddc9afa73e13eda5" -SRC_URI_class-devupstream = "git://github.com/Sparkle-CDM/sparkle-cdm.git;protocol=https;branch=main" -SRCREV_class-devupstream = "31e063770f43acc343df1bfd920a5baa76722af0" -PV_class-devupstream = "2021.0+git${SRCPV}" -S_class-devupstream = "${WORKDIR}/git" +SRC_URI:class-devupstream = "git://github.com/Sparkle-CDM/sparkle-cdm.git;protocol=https;branch=main" +SRCREV:class-devupstream = "31e063770f43acc343df1bfd920a5baa76722af0" +PV:class-devupstream = "2021.0+git${SRCPV}" +S:class-devupstream = "${WORKDIR}/git" PROVIDES += "virtual/open-cdm" -RPROVIDES_${PN} += "virtual/open-cdm" +RPROVIDES:${PN} += "virtual/open-cdm" PACKAGES =+ "${PN}-sample-player" -FILES_${PN} += "${libdir}/libocdm.so \ +FILES:${PN} += "${libdir}/libocdm.so \ ${libdir}/gstreamer-1.0/libgstsprkl.so \ " -FILES_${PN}-sample-player += "${bindir}/sample-player" +FILES:${PN}-sample-player += "${bindir}/sample-player" FILES_SOLIBSDEV = "" diff --git a/recipes-devtools/dicts/test-dicts_git.bb b/recipes-devtools/dicts/test-dicts_git.bb index 33cb44d2..fe4cad85 100644 --- a/recipes-devtools/dicts/test-dicts_git.bb +++ b/recipes-devtools/dicts/test-dicts_git.bb @@ -26,6 +26,6 @@ do_install() { make install } -FILES_${PN} = " \ +FILES:${PN} = " \ /webkitgtk-test-dicts/* \ " diff --git a/recipes-devtools/fonts/webkit-test-fonts_git.bb b/recipes-devtools/fonts/webkit-test-fonts_git.bb index 73c5f4bf..1fa44ad4 100644 --- a/recipes-devtools/fonts/webkit-test-fonts_git.bb +++ b/recipes-devtools/fonts/webkit-test-fonts_git.bb @@ -26,6 +26,6 @@ do_install() { make install } -FILES_${PN} = " \ +FILES:${PN} = " \ /webkitgtk-test-fonts/* \ " diff --git a/recipes-flatpak/bubblewrap/bubblewrap_0.4.1.bb b/recipes-flatpak/bubblewrap/bubblewrap_0.4.1.bb index e1bd71b6..7130196e 100644 --- a/recipes-flatpak/bubblewrap/bubblewrap_0.4.1.bb +++ b/recipes-flatpak/bubblewrap/bubblewrap_0.4.1.bb @@ -14,7 +14,7 @@ AUTO_LIBNAME_PKGS = "" # possible package configurations PACKAGECONFIG ??= "" -EXTRA_OECONF_class-target += "--disable-man --without-bash-completion-dir" -EXTRA_OECONF_class-native += "--disable-man --without-bash-completion-dir" +EXTRA_OECONF:class-target += "--disable-man --without-bash-completion-dir" +EXTRA_OECONF:class-native += "--disable-man --without-bash-completion-dir" BBCLASSEXTEND = "native" diff --git a/recipes-flatpak/xdg-dbus-proxy/xdg-dbus-proxy_0.1.2.bb b/recipes-flatpak/xdg-dbus-proxy/xdg-dbus-proxy_0.1.2.bb index d39b7e5d..47dbee4a 100644 --- a/recipes-flatpak/xdg-dbus-proxy/xdg-dbus-proxy_0.1.2.bb +++ b/recipes-flatpak/xdg-dbus-proxy/xdg-dbus-proxy_0.1.2.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c100 inherit autotools pkgconfig gobject-introspection -EXTRA_OECONF_remove = "--enable-introspection" -EXTRA_OECONF_remove = "--disable-introspection" +EXTRA_OECONF:remove = "--enable-introspection" +EXTRA_OECONF:remove = "--disable-introspection" BBCLASSEXTEND = "native" diff --git a/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend index 7ac439a2..d43a6a5b 100644 --- a/recipes-graphics/harfbuzz/harfbuzz_%.bbappend +++ b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " icu" +PACKAGECONFIG:append = " icu" diff --git a/recipes-graphics/mesa/mesa_21.0.3.bbappend b/recipes-graphics/mesa/mesa_21.0.3.bbappend index 82e42f92..20d6bc11 100644 --- a/recipes-graphics/mesa/mesa_21.0.3.bbappend +++ b/recipes-graphics/mesa/mesa_21.0.3.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-gallium-dri-Make-YUV-formats-we-re-going-to-emulate-.patch" diff --git a/recipes-graphics/mesa/mesa_21.2.1.bbappend b/recipes-graphics/mesa/mesa_21.2.1.bbappend index 82e42f92..20d6bc11 100644 --- a/recipes-graphics/mesa/mesa_21.2.1.bbappend +++ b/recipes-graphics/mesa/mesa_21.2.1.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-gallium-dri-Make-YUV-formats-we-re-going-to-emulate-.patch" diff --git a/recipes-multimedia/webm/libvpx_1.10.0.bb b/recipes-multimedia/webm/libvpx_1.10.0.bb index 865363c9..6870de49 100644 --- a/recipes-multimedia/webm/libvpx_1.10.0.bb +++ b/recipes-multimedia/webm/libvpx_1.10.0.bb @@ -23,9 +23,9 @@ CFLAGS += "-fPIC" export CC export LD = "${CC}" -VPXTARGET_armv5te = "armv5te-linux-gcc" -VPXTARGET_armv6 = "armv6-linux-gcc" -VPXTARGET_armv7a = "armv7-linux-gcc" +VPXTARGET:armv5te = "armv5te-linux-gcc" +VPXTARGET:armv6 = "armv6-linux-gcc" +VPXTARGET:armv7a = "armv7-linux-gcc" VPXTARGET ?= "generic-gnu" CONFIGUREOPTS = " \