diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-06-27 12:46:02 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-07-01 08:58:18 +0000 |
| commit | 63e0ea358f1902b1dd9968b21b5eea649d04329e (patch) | |
| tree | 4231493c300f4d9ea2c84b6e290919486bf7e0b6 /recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch | |
| parent | 9eda76e3a9c869030ff4bcf66704207753666a6c (diff) | |
Move html5 demo into sublayer
The HTML5 demo needs additional fixes. Move it into a sublayer and activate with agl-demo-html5.
Bug-AGL: SPEC-5188
Change-Id: I2f1a07dcfbcaf7e09d4d0d3aec1aa8f096336287
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30042
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
Reviewed-by: Scott Murray <scott.murray@konsulko.com>
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch')
| -rw-r--r-- | recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch b/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch deleted file mode 100644 index 3c2b3a775..000000000 --- a/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ae234968078366877a1f8027423644ae7bbfb89 Mon Sep 17 00:00:00 2001 -From: Roger Zanoni <rzanoni@igalia.com> -Date: Mon, 13 Nov 2023 11:07:15 -0300 -Subject: [PATCH 32/33] [M118-fix] zlib: Fix arm build - -Prevent inclusion of cpuid on arm builds. - -error: - -third_party/zlib/cpu_features.c:15: -cpuid.h:14:2: error: this header is for x86 only - -Upstream-Status: Inappropriate -Signed-off-by: Roger Zanoni <rzanoni@igalia.com> ---- - third_party/zlib/adler32_simd.c | 2 +- - third_party/zlib/cpu_features.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/third_party/zlib/adler32_simd.c b/third_party/zlib/adler32_simd.c -index 58966eecf0b80..25867ace82bd2 100644 ---- a/third_party/zlib/adler32_simd.c -+++ b/third_party/zlib/adler32_simd.c -@@ -49,7 +49,7 @@ - /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ - #define NMAX 5552 - --#if defined(ADLER32_SIMD_SSSE3) -+#if (__x86_64__ || __i386__) && defined(ADLER32_SIMD_SSSE3) - - #include <tmmintrin.h> - -diff --git a/third_party/zlib/cpu_features.c b/third_party/zlib/cpu_features.c -index 64e0428cd2fc2..c26c619970c10 100644 ---- a/third_party/zlib/cpu_features.c -+++ b/third_party/zlib/cpu_features.c -@@ -11,7 +11,7 @@ - #include <stdint.h> - #if defined(_MSC_VER) - #include <intrin.h> --#elif defined(ADLER32_SIMD_SSSE3) -+#elif (__x86_64__ || __i386__) && defined(ADLER32_SIMD_SSSE3) - #include <cpuid.h> - #endif - --- -2.42.1 - |