diff options
Diffstat (limited to 'recipes-wam')
| -rw-r--r-- | recipes-wam/chromium/chromium.inc | 9 | ||||
| -rw-r--r-- | recipes-wam/chromium/chromium_git.bb | 6 | ||||
| -rw-r--r-- | recipes-wam/wam/wam_git.bb | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/recipes-wam/chromium/chromium.inc b/recipes-wam/chromium/chromium.inc index d2c9e9065..17e46f46a 100644 --- a/recipes-wam/chromium/chromium.inc +++ b/recipes-wam/chromium/chromium.inc @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "\ require gn-utils.inc -inherit gettext qemu pythonnative +inherit gettext qemu pythonnative pkgconfig DEPENDS = "virtual/gettext wayland wayland-native pixman freetype glib-2.0 fontconfig openssl pango cairo icu libxkbcommon libexif dbus pciutils udev libcap alsa-lib virtual/egl elfutils-native libdrm atk at-spi2-atk gperf-native gconf nss nss-native nspr nspr-native bison-native qemu-native curl" @@ -42,8 +42,6 @@ TARGET = "${WEBRUNTIME_BUILD_TARGET} ${BROWSER_APP_BUILD_TARGET}" # Skip do_install:append of webos_system_bus. It is not compatible with this component. WEBOS_SYSTEM_BUS_FILES_LOCATION = "${S}/files/sysbus" -PACKAGECONFIG ?= "use-upstream-wayland" - PACKAGECONFIG[lttng] = "use_lttng=true,use_lttng=false,lttng-ust,lttng-tools lttng-modules babeltrace" # Chromium can use v4l2 device for hardware accelerated video decoding on such boards as Renesas R-car M3, for example. @@ -51,11 +49,6 @@ PACKAGECONFIG[lttng] = "use_lttng=true,use_lttng=false,lttng-ust,lttng-tools ltt # See https://github.com/igel-oss/meta-browser-hwdecode/tree/igalia-chromium71. PACKAGECONFIG[use-linux-v4l2] = "use_v4l2_codec=true use_v4lplugin=true use_linux_v4l2_only=true" -PACKAGECONFIG[use-upstream-wayland] = " \ - ozone_platform_wayland_external=false ozone_platform_wayland=true, \ - ozone_platform_wayland_external=true ozone_platform_wayland=false \ -" - # Options to enable debug build. Add this PACKAGECONFIG to local.conf # to enable debug build. By default debug is completely disabled to # speed up build diff --git a/recipes-wam/chromium/chromium_git.bb b/recipes-wam/chromium/chromium_git.bb index 6e83a5bb8..39a216d41 100644 --- a/recipes-wam/chromium/chromium_git.bb +++ b/recipes-wam/chromium/chromium_git.bb @@ -8,7 +8,7 @@ SRC_URI = "\ # Needed by catapult DEPENDS += "python-six-native python-beautifulsoup4-native python-lxml-native python-html5lib-native python-webencodings-native" -SRCREV_chromium91 = "2c7cb6949542f7e16b2ffc64b4300ccc4212392b" +SRCREV_chromium91 = "d052051b3b8696183322f0d21c911dbbf207a8ab" SRCREV_v8 = "b958ec542dcb086f422a1216a959be38a4cc0339" CHROMIUM_VERSION = "91.0.4472.114" @@ -63,6 +63,10 @@ GN_ARGS += "\ " GN_ARGS:append = " \ + ozone_platform_wayland_external=false \ + ozone_platform_wayland=true \ + use_system_libwayland=true \ + use_system_wayland_scanner=false \ use_system_minigbm=false \ use_wayland_gbm=false \ " diff --git a/recipes-wam/wam/wam_git.bb b/recipes-wam/wam/wam_git.bb index a819d6c7d..0c10fed92 100644 --- a/recipes-wam/wam/wam_git.bb +++ b/recipes-wam/wam/wam_git.bb @@ -3,7 +3,7 @@ AUTHOR = "Jani Hautakangas <jani.hautakangas@lge.com>" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit cmake +inherit cmake pkgconfig DEPENDS = "glib-2.0 jsoncpp boost chromium protobuf protobuf-native libxml2" @@ -30,7 +30,7 @@ SRC_URI = "\ file://WebAppMgr.env \ " S = "${WORKDIR}/git" -SRCREV = "692f706b8794b093035915bc401576c55a6e03fc" +SRCREV = "31840bc2867fe7ad8a07bd0a4cbd2dc135a05fb2" PV = "ose57.agl" |