From 481ba8ee3aac9205ee1c0eb725c64c4b67d74405 Mon Sep 17 00:00:00 2001 From: Konrad Weihmann Date: Mon, 4 Nov 2024 12:23:05 +0000 Subject: [PATCH] chromium-imx.inc: drop unreferenced file and the corresponding patch as well Closes #2011 Signed-off-by: Konrad Weihmann --- .../recipes-browser/chromium/chromium-imx.inc | 44 ---------------- .../chromium/chromium/chromium.patch | 52 ------------------- 2 files changed, 96 deletions(-) delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch 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 b77fbc838..000000000 --- a/dynamic-layers/chromium-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};protocol=https" - -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-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 23a8fff9c..000000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream-Status: Pending -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 - - /**@}*/ -