summaryrefslogtreecommitdiffstats
path: root/chromium-ungoogled
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2021-03-14 11:31:01 +0000
committer Eric Hameleers <alien@slackware.com>2021-03-14 11:31:01 +0000
commit6fd7675642335508889642778edf68f133e0fcad (patch)
treed14b222056b2883f17807c3cebec2765d045b8bf /chromium-ungoogled
parent2065bb78b77455303f98954acdcabb90c719d249 (diff)
downloadasb-6fd7675642335508889642778edf68f133e0fcad.tar.gz
asb-6fd7675642335508889642778edf68f133e0fcad.tar.xz
Initial revision
Diffstat (limited to 'chromium-ungoogled')
-rw-r--r--chromium-ungoogled/build/patches/chromium_glibc233_syscall422.patch43
-rw-r--r--chromium-ungoogled/build/patches/chromium_hevc_non_chromeos.patch21
2 files changed, 64 insertions, 0 deletions
diff --git a/chromium-ungoogled/build/patches/chromium_glibc233_syscall422.patch b/chromium-ungoogled/build/patches/chromium_glibc233_syscall422.patch
new file mode 100644
index 00000000..e2149c35
--- /dev/null
+++ b/chromium-ungoogled/build/patches/chromium_glibc233_syscall422.patch
@@ -0,0 +1,43 @@
+commit 955a586c63c4f99fb734e44221db63f5b2ca25a9
+author Matthew Denton <mpdenton@chromium.org> Fri Mar 12 00:24:39 2021
+committer Matthew Denton <mpdenton@chromium.org> Fri Mar 12 00:24:39 2021
+tree 1a7de74e5c55397bc6d27761a1bb0dd2339e2ba5
+parent ada8253c243be1bf713ce42e2f9eba1360ba528d
+Linux sandbox: support futex_time64 on 32-bit platforms
+
+This updates futex-related syscall sets to include futex_time64, which
+is a version of the futex syscall which uses 64 bit time on 32-bit
+systems, to prepare for the Y2038 problem.
+
+Change-Id: Ie933d9fec221233bf837f00c08eb7daee204081d
+diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+index ab0566b..2403ea3 100644
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -193,7 +193,11 @@
+ }
+ #endif
+
+- if (sysno == __NR_futex)
++ if (sysno == __NR_futex
++#if defined(__NR_futex_time64)
++ || sysno == __NR_futex_time64
++#endif
++ )
+ return RestrictFutex();
+
+ if (sysno == __NR_set_robust_list)
+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+index a76fd30..0330aeab 100644
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -423,6 +423,9 @@
+ case __NR_get_robust_list:
+ case __NR_set_robust_list:
+ case __NR_futex:
++#if defined(__NR_futex_time64)
++ case __NR_futex_time64:
++#endif
+ default:
+ return false;
+ }
diff --git a/chromium-ungoogled/build/patches/chromium_hevc_non_chromeos.patch b/chromium-ungoogled/build/patches/chromium_hevc_non_chromeos.patch
new file mode 100644
index 00000000..eaaac605
--- /dev/null
+++ b/chromium-ungoogled/build/patches/chromium_hevc_non_chromeos.patch
@@ -0,0 +1,21 @@
+# We enable HEVC and this triggers a ChromeOS related error:
+# chrome_key_systems.cc:186:40: error: no member named 'features' in namespace 'chromeos'
+# This patch (from Arch User Repository) prevents the build failure.
+
+diff --git a/chrome/renderer/media/chrome_key_systems.cc.orig b/chrome/renderer/media/chrome_key_systems.cc
+index 2160697..c9de40c 100644
+--- a/chrome/renderer/media/chrome_key_systems.cc.orig
++++ b/chrome/renderer/media/chrome_key_systems.cc
+@@ -182,8 +182,12 @@ static SupportedCodecs GetSupportedCodecs(
+ #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
+ #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+ case media::VideoCodec::kCodecHEVC:
++#if BUILDFLAG(IS_CHROMEOS_ASH)
+ if (is_secure && base::FeatureList::IsEnabled(
+ chromeos::features::kCdmFactoryDaemon)) {
++#else
++ if (is_secure) {
++#endif
+ supported_codecs |= media::EME_CODEC_HEVC_PROFILE_MAIN;
+ supported_codecs |= media::EME_CODEC_HEVC_PROFILE_MAIN10;
+ }