diff options
author | Pablo Saavedra <psaavedra@igalia.com> | 2021-03-26 08:35:30 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-26 08:37:10 -0300 |
commit | 02eb3ffd5ac527f5e8f360b26dba1cd6faee4dff (patch) | |
tree | 7f03c185ccb0af43c31de894becc1bea9ca14fe5 /dynamic-layers/browser-layer | |
parent | 776932e187f38ca53ed57fc662461ba0da005520 (diff) | |
download | meta-freescale-02eb3ffd5ac527f5e8f360b26dba1cd6faee4dff.tar.gz |
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 <psaavedra@igalia.com>
Diffstat (limited to 'dynamic-layers/browser-layer')
-rw-r--r-- | dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc | 44 | ||||
-rw-r--r-- | dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch | 51 |
2 files changed, 0 insertions, 95 deletions
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 @@ | |||
1 | DEPENDS_append_imxvpu = " imx-vpuwrap" | ||
2 | |||
3 | # Additional imx code and patches are included in the chromium-imx git repository. | ||
4 | # The code below fetches this repository, copies the extra source over to the main | ||
5 | # chromium source directory, and applies the patches. | ||
6 | |||
7 | CHROMIUM_IMX_BRANCH ?= "master" | ||
8 | CHROMIUM_IMX_SRCREV ?= "HEAD" | ||
9 | CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git" | ||
10 | |||
11 | PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches" | ||
12 | |||
13 | CHROMIUM_IMX_COMMON_PATCHES ?= " " | ||
14 | CHROMIUM_IMX_VPU_PATCHES ?= " " | ||
15 | CHROMIUM_IMX_WAYLAND_PATCHES ?= " " | ||
16 | |||
17 | SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV}" | ||
18 | |||
19 | do_unpack[postfuncs] += "copy_chromium_imx_files" | ||
20 | # using =+ instead of += to make sure add_chromium_imx_patches is | ||
21 | # executed before add_ozone_wayland_patches in the main recipe; | ||
22 | # this is necessary because add_chromium_imx_patches appends | ||
23 | # patches to the OZONE_WAYLAND_EXTRA_PATCHES variable | ||
24 | do_patch[prefuncs] =+ "add_chromium_imx_patches" | ||
25 | |||
26 | # * Lost context problems are not known to happen with Vivante GPUs, | ||
27 | # so it is safe to use ignore-lost-context | ||
28 | # * Proprietary codecs need to be enabled for h.264 and MP4 support | ||
29 | PACKAGECONFIG_append = " ignore-lost-context proprietary-codecs" | ||
30 | |||
31 | copy_chromium_imx_files() { | ||
32 | # sources in src/ are already organized in a manner | ||
33 | # that matches the subdirectories in the chromium | ||
34 | # source directory; just copy over the files in src/ | ||
35 | cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/ | ||
36 | } | ||
37 | |||
38 | python add_chromium_imx_patches() { | ||
39 | d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1)) | ||
40 | d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1)) | ||
41 | d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1)) | ||
42 | } | ||
43 | |||
44 | 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 @@ | |||
1 | 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 | ||
2 | --- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500 | ||
3 | +++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:49:53.000000000 -0500 | ||
4 | @@ -36,7 +36,7 @@ | ||
5 | extern "C" { | ||
6 | #endif | ||
7 | |||
8 | -#include <va/va.h> | ||
9 | +#include <libva/va/va.h> | ||
10 | |||
11 | /** | ||
12 | * \defgroup api_dec_jpeg JPEG decoding API | ||
13 | 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 | ||
14 | --- chromium-48.0.2548.0_org/third_party/libva/va/va.h 2016-05-27 11:45:31.248306710 -0500 | ||
15 | +++ chromium-48.0.2548.0/third_party/libva/va/va.h 2016-05-27 11:49:16.000000000 -0500 | ||
16 | @@ -80,7 +80,7 @@ | ||
17 | |||
18 | #include <stddef.h> | ||
19 | #include <stdint.h> | ||
20 | -#include <va/va_version.h> | ||
21 | +#include <libva/va/va_version.h> | ||
22 | |||
23 | #ifdef __cplusplus | ||
24 | extern "C" { | ||
25 | @@ -2836,16 +2836,16 @@ | ||
26 | */ | ||
27 | #define VA_PICTURE_HEVC_RPS_LT_CURR 0x00000040 | ||
28 | |||
29 | -#include <va/va_dec_hevc.h> | ||
30 | -#include <va/va_dec_jpeg.h> | ||
31 | -#include <va/va_dec_vp8.h> | ||
32 | -#include <va/va_dec_vp9.h> | ||
33 | -#include <va/va_enc_hevc.h> | ||
34 | -#include <va/va_enc_h264.h> | ||
35 | -#include <va/va_enc_jpeg.h> | ||
36 | -#include <va/va_enc_mpeg2.h> | ||
37 | -#include <va/va_enc_vp8.h> | ||
38 | -#include <va/va_vpp.h> | ||
39 | +#include <libva/va/va_dec_hevc.h> | ||
40 | +#include <libva/va/va_dec_jpeg.h> | ||
41 | +#include <libva/va/va_dec_vp8.h> | ||
42 | +#include <libva/va/va_dec_vp9.h> | ||
43 | +#include <libva/va/va_enc_hevc.h> | ||
44 | +#include <libva/va/va_enc_h264.h> | ||
45 | +#include <libva/va/va_enc_jpeg.h> | ||
46 | +#include <libva/va/va_enc_mpeg2.h> | ||
47 | +#include <libva/va/va_enc_vp8.h> | ||
48 | +#include <libva/va/va_vpp.h> | ||
49 | |||
50 | /**@}*/ | ||
51 | |||