summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2024-11-04 10:51:40 -0300
committerGitHub <noreply@github.com>2024-11-04 10:51:40 -0300
commitfd892e59554244a6281aa2b365e682aec34a63c4 (patch)
tree16c1a471b4bbcae1df61df1ba496ad69af9728b8
parent82b550e8ccec0045ddbe296f2e1b64f62a4502b7 (diff)
parent481ba8ee3aac9205ee1c0eb725c64c4b67d74405 (diff)
downloadmeta-freescale-fd892e59554244a6281aa2b365e682aec34a63c4.tar.gz
Merge pull request #2012 from kwavnet/drop-chromium-inc
chromium-imx.inc: drop unreferenced file
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc44
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch52
2 files changed, 0 insertions, 96 deletions
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
deleted file mode 100644
index b77fbc83..00000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ /dev/null
@@ -1,44 +0,0 @@
1DEPENDS: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
7CHROMIUM_IMX_BRANCH ?= "master"
8CHROMIUM_IMX_SRCREV ?= "HEAD"
9CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git"
10
11PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches"
12
13CHROMIUM_IMX_COMMON_PATCHES ?= " "
14CHROMIUM_IMX_VPU_PATCHES ?= " "
15CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
16
17SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https"
18
19do_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
24do_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
29PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs"
30
31copy_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
38python 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
44COMPATIBLE_MACHINE = "(mx6-nxp-bsp)"
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
deleted file mode 100644
index 23a8fff9..00000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Upstream-Status: Pending
2diff -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
3--- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500
4+++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:49:53.000000000 -0500
5@@ -36,7 +36,7 @@
6 extern "C" {
7 #endif
8
9-#include <va/va.h>
10+#include <libva/va/va.h>
11
12 /**
13 * \defgroup api_dec_jpeg JPEG decoding API
14diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h
15--- chromium-48.0.2548.0_org/third_party/libva/va/va.h 2016-05-27 11:45:31.248306710 -0500
16+++ chromium-48.0.2548.0/third_party/libva/va/va.h 2016-05-27 11:49:16.000000000 -0500
17@@ -80,7 +80,7 @@
18
19 #include <stddef.h>
20 #include <stdint.h>
21-#include <va/va_version.h>
22+#include <libva/va/va_version.h>
23
24 #ifdef __cplusplus
25 extern "C" {
26@@ -2836,16 +2836,16 @@
27 */
28 #define VA_PICTURE_HEVC_RPS_LT_CURR 0x00000040
29
30-#include <va/va_dec_hevc.h>
31-#include <va/va_dec_jpeg.h>
32-#include <va/va_dec_vp8.h>
33-#include <va/va_dec_vp9.h>
34-#include <va/va_enc_hevc.h>
35-#include <va/va_enc_h264.h>
36-#include <va/va_enc_jpeg.h>
37-#include <va/va_enc_mpeg2.h>
38-#include <va/va_enc_vp8.h>
39-#include <va/va_vpp.h>
40+#include <libva/va/va_dec_hevc.h>
41+#include <libva/va/va_dec_jpeg.h>
42+#include <libva/va/va_dec_vp8.h>
43+#include <libva/va/va_dec_vp9.h>
44+#include <libva/va/va_enc_hevc.h>
45+#include <libva/va/va_enc_h264.h>
46+#include <libva/va/va_enc_jpeg.h>
47+#include <libva/va/va_enc_mpeg2.h>
48+#include <libva/va/va_enc_vp8.h>
49+#include <libva/va/va_vpp.h>
50
51 /**@}*/
52