summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorLauren Post <lauren.post@nxp.com>2016-09-26 08:24:35 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2016-10-18 16:25:50 -0200
commit3b878dbe2f626567c496113b3bede2a0dd24e630 (patch)
tree601cbbdf97e52b9d5da46c6e0431b6d4fb7fcb6f /dynamic-layers
parentcc1e0fbed5c64920d5b22c3fb25e59eaec2d74d0 (diff)
downloadmeta-freescale-3b878dbe2f626567c496113b3bede2a0dd24e630.tar.gz
chromium: Enable new version 52 for x11 support wayland on older version
Signed-off-by: Lauren Post <lauren.post@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend29
-rw-r--r--dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch51
-rw-r--r--dynamic-layers/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend9
-rw-r--r--dynamic-layers/browser-layer/recipes-browser/chromium/chromium_52.0.2743.76.bbappend10
4 files changed, 90 insertions, 9 deletions
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend
new file mode 100644
index 00000000..74237536
--- /dev/null
+++ b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend
@@ -0,0 +1,29 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/chromium:"
2
3include chromium-imx.inc
4
5CHROMIUM_IMX_BRANCH = "master"
6CHROMIUM_IMX_SRCREV = "4a2d15ab899b9944bb3adb2ddd250530da5b2e1a"
7CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch"
8CHROMIUM_ENABLE_WAYLAND = "0"
9
10DEPENDS_append_imxvpu = " imx-vpuwrap"
11
12VPU_PATCHES = "file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-GPU-.patch"
13
14CHROMIUM_IMX_VPU_PATCHES_imxvpu += "${VPU_PATCHES}"
15
16CHROMIUM_IMX_WAYLAND_PATCHES += "file://${PATCH_BASE_DIR}/wayland/0001-Modify-eglwayland-versions-for-Vivante-GPUs.patch"
17
18# Don't use X if it's running through Wayland
19CHROMIUM_ENABLE_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '1', \
20 bb.utils.contains('DISTRO_FEATURES', 'x11', '0', \
21 '0', d),d)}"
22
23SRC_URI += "\
24 ${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', 'git://github.com/01org/ozone-wayland.git;destsuffix=${OZONE_WAYLAND_GIT_DESTSUFFIX};branch=${OZONE_WAYLAND_GIT_BRANCH};rev=${OZONE_WAYLAND_GIT_SRCREV}', '', d)} \
25 ${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', ' file://chromium.patch', '', d)} \
26"
27
28# Remove packages as Chromium is changed to statically link against ffmpeg.
29PACKAGES_remove = "${PN}-codecs-ffmpeg ${PN}-plugin-pdf"
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch
new file mode 100644
index 00000000..0329d42e
--- /dev/null
+++ b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch
@@ -0,0 +1,51 @@
1diff -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
13diff -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
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend
deleted file mode 100644
index 54a0a997..00000000
--- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
1include chromium-imx.inc
2
3CHROMIUM_IMX_BRANCH = "master"
4CHROMIUM_IMX_SRCREV = "4a2d15ab899b9944bb3adb2ddd250530da5b2e1a"
5CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch"
6
7CHROMIUM_IMX_VPU_PATCHES_imxvpu += "file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-GPU-.patch"
8
9CHROMIUM_IMX_WAYLAND_PATCHES += "file://${PATCH_BASE_DIR}/wayland/0001-Modify-eglwayland-versions-for-Vivante-GPUs.patch"
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_52.0.2743.76.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_52.0.2743.76.bbappend
new file mode 100644
index 00000000..0fa2e1e5
--- /dev/null
+++ b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_52.0.2743.76.bbappend
@@ -0,0 +1,10 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3include chromium-imx.inc
4
5CHROMIUM_IMX_BRANCH = "master"
6CHROMIUM_IMX_SRCREV = "4a2d15ab899b9944bb3adb2ddd250530da5b2e1a"
7CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch"
8
9# Remove packages as Chromium is changed to statically link against ffmpeg.
10PACKAGES_remove = "${PN}-codecs-ffmpeg ${PN}-plugin-pdf"