From 75d56c51c4b7b907b828c589f1d1f857e97274b4 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Sun, 22 May 2016 11:33:07 +0200 Subject: chromium: Update bbappend to version 48.0.2548.0 Signed-off-by: Carlos Rafael Giani Signed-off-by: Otavio Salvador --- browser-layer/recipes-browser/chromium/chromium-imx.inc | 7 ++----- .../recipes-browser/chromium/chromium_40.0.2214.91.bbappend | 12 ------------ .../recipes-browser/chromium/chromium_48.0.2548.0.bbappend | 12 ++++++++++++ 3 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend create mode 100644 browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend diff --git a/browser-layer/recipes-browser/chromium/chromium-imx.inc b/browser-layer/recipes-browser/chromium/chromium-imx.inc index db9580a..6b63165 100644 --- a/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/browser-layer/recipes-browser/chromium/chromium-imx.inc @@ -27,7 +27,8 @@ do_patch[prefuncs] =+ "add_chromium_imx_patches" # * Lost context problems are not known to happen with Vivante GPUs, # so it is safe to use ignore-lost-context # * EGL is on by default due to the GPU on the i.MX6 -PACKAGECONFIG_append = " use-egl ignore-lost-context" +# * Proprietary codecs need to be enabled for h.264 and MP4 support +PACKAGECONFIG_append = " use-egl ignore-lost-context proprietary-codecs" copy_chromium_imx_files() { # sources in src/ are already organized in a manner @@ -42,8 +43,4 @@ python add_chromium_imx_patches() { d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1)) } -# Necessary flags to enable support for h.264 and MP4 in Chromium -# (Parsing is done by ffmpeg) -EXTRA_OEGYP += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - COMPATIBLE_MACHINE = "(mx6)" diff --git a/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend b/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend deleted file mode 100644 index d9c5d15..0000000 --- a/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -include chromium-imx.inc - -CHROMIUM_IMX_BRANCH = "chromium-40" -CHROMIUM_IMX_SRCREV = "af13a3dbdfdb4b162a9f9692761216e5d6204e57" -CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch" - -VPU_PATCHES = "file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-GPU-.patch" - -CHROMIUM_IMX_VPU_PATCHES_mx6q += "${VPU_PATCHES}" -CHROMIUM_IMX_VPU_PATCHES_mx6dl += "${VPU_PATCHES}" - -CHROMIUM_IMX_WAYLAND_PATCHES += "file://${PATCH_BASE_DIR}/wayland/0001-Modify-eglwayland-versions-for-Vivante-GPUs.patch" diff --git a/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend b/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend new file mode 100644 index 0000000..8c8f801 --- /dev/null +++ b/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend @@ -0,0 +1,12 @@ +include chromium-imx.inc + +CHROMIUM_IMX_BRANCH = "master" +CHROMIUM_IMX_SRCREV = "4a2d15ab899b9944bb3adb2ddd250530da5b2e1a" +CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch" + +VPU_PATCHES = "file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-GPU-.patch" + +CHROMIUM_IMX_VPU_PATCHES_mx6q += "${VPU_PATCHES}" +CHROMIUM_IMX_VPU_PATCHES_mx6dl += "${VPU_PATCHES}" + +CHROMIUM_IMX_WAYLAND_PATCHES += "file://${PATCH_BASE_DIR}/wayland/0001-Modify-eglwayland-versions-for-Vivante-GPUs.patch" -- cgit v1.2.3-54-g00ecf