[meta-freescale] [meta-fsl-arm][PATCH] chromium: Update bbappend to version 48.0.2548.0

[Carlos Rafael Giani]

Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
---
 browser-layer/recipes-browser/chromium/chromium-imx.inc            | 7 ++-----
 ...hromium_40.0.2214.91.bbappend => chromium_48.0.2548.0.bbappend} | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)
 rename browser-layer/recipes-browser/chromium/{chromium_40.0.2214.91.bbappend => chromium_48.0.2548.0.bbappend} (82%)

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_48.0.2548.0.bbappend
similarity index 82%
rename from browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend
rename to browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend
index d9c5d15..8c8f801 100644
--- a/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend
+++ b/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend
@@ -1,7 +1,7 @@
 include chromium-imx.inc
 
-CHROMIUM_IMX_BRANCH = "chromium-40"
-CHROMIUM_IMX_SRCREV = "af13a3dbdfdb4b162a9f9692761216e5d6204e57"
+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"
-- 
2.7.4