diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-17 06:01:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-17 06:01:12 +0000 |
commit | 9f82fefa4d6ebdeb0d91da1624b4657a9c398c73 (patch) | |
tree | 7506e6869fa852a80d44ad4b11e0c84057cdc2c4 /pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch | |
parent | 212fb8cd176fcb3d0154074f15b33a01aaa25103 (diff) | |
parent | ff8aa8b9ec0300ce770c7eb0e62a8f95a0d47f13 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch index d4f16d26b769e..4ab2c9a8179ba 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch @@ -12,15 +12,16 @@ index 525693b6c10ab..245491e137d39 100644 "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm", ] diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni -index 58f073ca562ca..4b242c2618dfb 100644 +index 8b97b7a57419e..69fe548ec2845 100644 --- a/third_party/widevine/cdm/widevine.gni +++ b/third_party/widevine/cdm/widevine.gni -@@ -41,8 +41,7 @@ enable_library_widevine_cdm = - # Widevine CDM can be deployed as a component. Currently only supported on - # desktop platforms. The CDM can be bundled regardless whether - # it's a component. See below. +@@ -42,9 +42,7 @@ enable_library_widevine_cdm = + # desktop platforms. Not enabled for lacros (as it is changing to use the + # ash updated version). The CDM can be bundled regardless whether it's a + # component. See below. -enable_widevine_cdm_component = -- enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos) +- enable_library_widevine_cdm && +- (is_win || is_mac || is_linux || is_chromeos_ash) +enable_widevine_cdm_component = false # Enable (Windows) Media Foundation Widevine CDM component. |