From 02eb3ffd5ac527f5e8f360b26dba1cd6faee4dff Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Fri, 26 Mar 2021 08:35:30 +0100 Subject: conf/layer.conf: Rename browser-layer as chromium-browser-layer This commit updates the directory name of the browser-layer dynamic-layer because the changes introduced in https://github.com/OSSystems/meta-browser/pull/470. This browser-layer doesn't exist anymore in the meta-browser layer being replaced by a new chromium-browser-layer. For backwards compatibility this changes keeps the entries associated to the former browser-layer pointing to the new chromium-browser-layer. Signed-off-by: Pablo Saavedra --- conf/layer.conf | 7 ++- .../recipes-browser/chromium/chromium-imx.inc | 44 ------------------- .../chromium/chromium/chromium.patch | 51 ---------------------- .../recipes-browser/chromium/chromium-imx.inc | 44 +++++++++++++++++++ .../chromium/chromium/chromium.patch | 51 ++++++++++++++++++++++ 5 files changed, 100 insertions(+), 97 deletions(-) delete mode 100644 dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc delete mode 100644 dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch diff --git a/conf/layer.conf b/conf/layer.conf index e8d1e887..78872fa9 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -28,8 +28,11 @@ BBFILES_DYNAMIC += " \ aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bb \ aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bbappend \ \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*/*.bb \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*/*.bbappend \ + browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \ + browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \ + \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \ \ filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bb \ filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bbappend \ diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc deleted file mode 100644 index cdd0f08f..00000000 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ /dev/null @@ -1,44 +0,0 @@ -DEPENDS_append_imxvpu = " imx-vpuwrap" - -# 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 -# * Proprietary codecs need to be enabled for h.264 and MP4 support -PACKAGECONFIG_append = " ignore-lost-context proprietary-codecs" - -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)) -} - -COMPATIBLE_MACHINE = "(mx6)" diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch deleted file mode 100644 index 0329d42e..00000000 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h ---- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500 -+++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:49:53.000000000 -0500 -@@ -36,7 +36,7 @@ - extern "C" { - #endif - --#include -+#include - - /** - * \defgroup api_dec_jpeg JPEG decoding API -diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h ---- chromium-48.0.2548.0_org/third_party/libva/va/va.h 2016-05-27 11:45:31.248306710 -0500 -+++ chromium-48.0.2548.0/third_party/libva/va/va.h 2016-05-27 11:49:16.000000000 -0500 -@@ -80,7 +80,7 @@ - - #include - #include --#include -+#include - - #ifdef __cplusplus - extern "C" { -@@ -2836,16 +2836,16 @@ - */ - #define VA_PICTURE_HEVC_RPS_LT_CURR 0x00000040 - --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - /**@}*/ - diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc new file mode 100644 index 00000000..cdd0f08f --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc @@ -0,0 +1,44 @@ +DEPENDS_append_imxvpu = " imx-vpuwrap" + +# 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 +# * Proprietary codecs need to be enabled for h.264 and MP4 support +PACKAGECONFIG_append = " ignore-lost-context proprietary-codecs" + +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)) +} + +COMPATIBLE_MACHINE = "(mx6)" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch new file mode 100644 index 00000000..0329d42e --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch @@ -0,0 +1,51 @@ +diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h +--- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500 ++++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:49:53.000000000 -0500 +@@ -36,7 +36,7 @@ + extern "C" { + #endif + +-#include ++#include + + /** + * \defgroup api_dec_jpeg JPEG decoding API +diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h +--- chromium-48.0.2548.0_org/third_party/libva/va/va.h 2016-05-27 11:45:31.248306710 -0500 ++++ chromium-48.0.2548.0/third_party/libva/va/va.h 2016-05-27 11:49:16.000000000 -0500 +@@ -80,7 +80,7 @@ + + #include + #include +-#include ++#include + + #ifdef __cplusplus + extern "C" { +@@ -2836,16 +2836,16 @@ + */ + #define VA_PICTURE_HEVC_RPS_LT_CURR 0x00000040 + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + /**@}*/ + -- cgit v1.2.3-54-g00ecf