diff options
author | Roger Zanoni <rzanoni@igalia.com> | 2021-02-23 14:05:08 +0100 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-03-24 12:26:56 +0000 |
commit | bc27ab6af9319a4754eb54a3acb42f89d99aeeef (patch) | |
tree | 70c25b3fbfe4d534c17020434c04f891262688f1 /recipes-wam/chromium/chromium.inc | |
parent | adafca5975daa27fd45008052297000077e5b070 (diff) |
web-runtime: Update from chromium79 to chromium84
This patch contains all the squashed changes needed to bump
WAM and chromium, including the ported changes from cr79.
Bug-AGL: SPEC-3806
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: If2b18e2978e8b1050e4b167b9627c1a526867cfb
Diffstat (limited to 'recipes-wam/chromium/chromium.inc')
-rw-r--r-- | recipes-wam/chromium/chromium.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/recipes-wam/chromium/chromium.inc b/recipes-wam/chromium/chromium.inc index 823016039..3144993f0 100644 --- a/recipes-wam/chromium/chromium.inc +++ b/recipes-wam/chromium/chromium.inc @@ -14,7 +14,7 @@ require gn-utils.inc inherit gettext qemu pythonnative -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 gperf-native gconf nss nss-native nspr nspr-native bison-native qemu-native" +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" PROVIDES = "${BROWSER_APPLICATION}" @@ -34,8 +34,8 @@ B = "${OUT_DIR}/${BUILD_TYPE}" WEBRUNTIME_BUILD_TARGET = "webos:weboswebruntime" BROWSER_APP_BUILD_TARGET = "chrome" -BROWSER_APPLICATION = "chromium68-browser" -BROWSER_APPLICATION_DIR = "/opt/chromium68" +BROWSER_APPLICATION = "chromium84-browser" +BROWSER_APPLICATION_DIR = "/opt/chromium84" TARGET = "${WEBRUNTIME_BUILD_TARGET}" @@ -60,9 +60,8 @@ PACKAGECONFIG[lttng] = "use_lttng=true,use_lttng=false,lttng-ust,lttng-tools ltt 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 \ - use_system_minigbm=true, \ - ozone_platform_wayland_external=true ozone_platform_wayland=false \ + ozone_platform_wayland_external=false ozone_platform_wayland=true, \ + ozone_platform_wayland_external=true ozone_platform_wayland=false \ " GN_ARGS = "\ @@ -277,12 +276,16 @@ install_webruntime() { # gzip -c ${OUT_DIR}/${BUILD_TYPE}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${bindir_cross}/${HOST_SYS}-mksnapshot.gz install -d ${D}${libdir} + install -d ${D}${libdir}/swiftshader install -d ${D}${includedir}/${BPN} install -d ${D}${CBE_DATA_PATH} install -d ${D}${CBE_DATA_LOCALES_PATH} # Install webos webview files ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR}/${BUILD_TYPE} webos/install/weboswebruntime + + install -v -m 0644 ${OUT_DIR}/${BUILD_TYPE}/swiftshader/*.so ${D}${libdir}/swiftshader + chown root:root -R ${D}${libdir} chown root:root -R ${D}${includedir} @@ -326,6 +329,7 @@ INSANE_SKIP_${BROWSER_APPLICATION} += "libdir ldflags textrel" FILES_${PN} = " \ ${libdir}/*.so \ + ${libdir}/swiftshader/*.so \ ${CBE_DATA_PATH}/* \ ${libdir}/${BPN}/*.so \ ${WEBOS_SYSTEM_BUS_DIRS} \ |