From f8517afc7a5ada4538b3b7d397fa32586d57ffe5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 15 Jul 2015 17:14:27 -0300 Subject: Move meta-fsl-arm content to layer root The meta-fsl-arm is going to be used as the base for this layer. It contains a clean history and allowing a more granullar set of changes. This commit is just a rename of all contents of meta-fsl-arm subdirectory to this layer's root, subsequent changes are based on top of that. Signed-off-by: Otavio Salvador --- .../recipes-browser/chromium/chromium-imx.inc | 49 ---------------------- .../chromium/chromium_40.0.2214.91.bbappend | 12 ------ 2 files changed, 61 deletions(-) delete mode 100644 meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc delete mode 100644 meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend (limited to 'meta-fsl-arm/browser-layer/recipes-browser/chromium') diff --git a/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc b/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc deleted file mode 100644 index f63807d57..000000000 --- a/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ /dev/null @@ -1,49 +0,0 @@ -DEPENDS_append_mx6q = " libfslvpuwrap" -DEPENDS_append_mx6dl = " libfslvpuwrap" - -# Additional imx code and patches are included in the chromium-imx git repository. -# The code below fetches this repository, copies the extra source over to the main -# chromium source directory, and applies the patches. - -CHROMIUM_IMX_BRANCH ?= "master" -CHROMIUM_IMX_SRCREV ?= "HEAD" -CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git" - -PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches" - -CHROMIUM_IMX_COMMON_PATCHES ?= " " -CHROMIUM_IMX_VPU_PATCHES ?= " " -CHROMIUM_IMX_WAYLAND_PATCHES ?= " " - -SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV}" - -do_unpack[postfuncs] += "copy_chromium_imx_files" -# using =+ instead of += to make sure add_chromium_imx_patches is -# executed before add_ozone_wayland_patches in the main recipe; -# this is necessary because add_chromium_imx_patches appends -# patches to the OZONE_WAYLAND_EXTRA_PATCHES variable -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" - -copy_chromium_imx_files() { - # sources in src/ are already organized in a manner - # that matches the subdirectories in the chromium - # source directory; just copy over the files in src/ - cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/ -} - -python add_chromium_imx_patches() { - d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1)) - d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1)) - 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/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend b/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend deleted file mode 100644 index d9c5d1542..000000000 --- a/meta-fsl-arm/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" -- cgit v1.2.3-54-g00ecf