From 8de83256ad3a9421fc6fb3c56323f83af3faf535 Mon Sep 17 00:00:00 2001 From: berkley4 Date: Thu, 29 Feb 2024 12:43:02 +0000 Subject: [PATCH] Disable media remoting by default Chromecast is crippled in upstream UC, so media remoting can be safely disabled. We can remove enable_media_remoting_rpc=false from debian/rules, as this will automatically become false when enable_media_remoting is set to false. There is an unmerged pull request which enables chromecast [1], which I will implement in a subsequent commit. However I will keep the media remoting configuration option so that it can be disabled independently of chromecast. [1] https://github.com/ungoogled-software/ungoogled-chromium/pull/2116 --- configure-variables.txt | 2 +- debian/configure.sh | 10 +++++----- .../{ => media-remoting}/media-remoting.patch | 0 .../media-remoting/registry-pref.patch} | 0 debian/patches/series.debian | 20 +++++++++---------- ...008-disable-media-router-by-default.patch} | 0 ...edia-DRM-preprovisioning-by-default.patch} | 0 ... 0010-enable-split-cache-by-default.patch} | 0 ...partitioning-connections-by-default.patch} | 0 ...-component-updater-pings-by-default.patch} | 0 ...-strict-origin-isolation-by-default.patch} | 0 ...olated-sandboxed-iframes-by-default.patch} | 0 ...le-partitioning-third-party-storage.patch} | 0 debian/rules.in | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) rename debian/patches/optional/disable/{ => media-remoting}/media-remoting.patch (100%) rename debian/patches/{vanadinite/0008-disable-media-router-media-remoting-by-default.patch => optional/disable/media-remoting/registry-pref.patch} (100%) rename debian/patches/vanadinite/{0009-disable-media-router-by-default.patch => 0008-disable-media-router-by-default.patch} (100%) rename debian/patches/vanadinite/{0010-disable-media-DRM-preprovisioning-by-default.patch => 0009-disable-media-DRM-preprovisioning-by-default.patch} (100%) rename debian/patches/vanadinite/{0011-enable-split-cache-by-default.patch => 0010-enable-split-cache-by-default.patch} (100%) rename debian/patches/vanadinite/{0012-enable-partitioning-connections-by-default.patch => 0011-enable-partitioning-connections-by-default.patch} (100%) rename debian/patches/vanadinite/{0013-disable-component-updater-pings-by-default.patch => 0012-disable-component-updater-pings-by-default.patch} (100%) rename debian/patches/vanadinite/{0014-Enable-strict-origin-isolation-by-default.patch => 0013-Enable-strict-origin-isolation-by-default.patch} (100%) rename debian/patches/vanadinite/{0015-enable-process-isolated-sandboxed-iframes-by-default.patch => 0014-enable-process-isolated-sandboxed-iframes-by-default.patch} (100%) rename debian/patches/vanadinite/{0016-enable-partitioning-third-party-storage.patch => 0015-enable-partitioning-third-party-storage.patch} (100%) diff --git a/configure-variables.txt b/configure-variables.txt index 377f1f822..21088199a 100644 --- a/configure-variables.txt +++ b/configure-variables.txt @@ -78,7 +78,7 @@ DRIVER 1 Chromedriver package CLICK_TO_CALL 1 Feature for using chromium to make a call via an android phone EXT_TOOLS_MENU 1 Move the extensions menu to the 'More tools' menu FEED 1 WebFeed (News feed) support -MEDIA_REMOTING 1 Render and play back media on remote devices when a tab is casted +MEDIA_REMOTING 0 Render and play back media on remote devices when a tab is casted MUTEX_PI 1 Mutex priority inheritance NOTIFICATIONS 1 System notifications OPENTYPE_SVG 1 Opentype SVG support diff --git a/debian/configure.sh b/debian/configure.sh index f4e6c29d9..7582b00fc 100755 --- a/debian/configure.sh +++ b/debian/configure.sh @@ -74,7 +74,7 @@ sanitise_op () { [ -n "$DRIVER" ] || DRIVER=1 [ -n "$EXT_TOOLS_MENU" ] || EXT_TOOLS_MENU=1 [ -n "$FEED" ] || FEED=1 -[ -n "$MEDIA_REMOTING" ] || MEDIA_REMOTING=1 +[ -n "$MEDIA_REMOTING" ] || MEDIA_REMOTING=0 [ -n "$MUTEX_PI" ] || MUTEX_PI=1 [ -n "$NOTIFICATIONS" ] || NOTIFICATIONS=1 [ -n "$OAUTH2" ] || OAUTH2=0 @@ -610,11 +610,11 @@ if [ $FEED -eq 0 ]; then fi -if [ $MEDIA_REMOTING -eq 0 ]; then - op_enable="$op_enable disable/media-remoting" +if [ $MEDIA_REMOTING -eq 1 ]; then + op_disable="$op_disable disable/media-remoting/" - #GN_FLAGS += enable_media_remoting=false enable_media_remoting_rpc=false - gn_enable="$gn_enable enable_media_remoting" + #GN_FLAGS += enable_media_remoting=false + gn_disable="$gn_disable enable_media_remoting" fi diff --git a/debian/patches/optional/disable/media-remoting.patch b/debian/patches/optional/disable/media-remoting/media-remoting.patch similarity index 100% rename from debian/patches/optional/disable/media-remoting.patch rename to debian/patches/optional/disable/media-remoting/media-remoting.patch diff --git a/debian/patches/vanadinite/0008-disable-media-router-media-remoting-by-default.patch b/debian/patches/optional/disable/media-remoting/registry-pref.patch similarity index 100% rename from debian/patches/vanadinite/0008-disable-media-router-media-remoting-by-default.patch rename to debian/patches/optional/disable/media-remoting/registry-pref.patch diff --git a/debian/patches/series.debian b/debian/patches/series.debian index a3861bec0..33a1e5078 100644 --- a/debian/patches/series.debian +++ b/debian/patches/series.debian @@ -52,15 +52,14 @@ vanadinite/0004-disable-article-suggestions-feature-by-default.patch vanadinite/0005-disable-content-feed-suggestions-by-default.patch vanadinite/0006-disable-sensors-access-by-default.patch vanadinite/0007-disable-background-sync-by-default.patch -vanadinite/0008-disable-media-router-media-remoting-by-default.patch -vanadinite/0009-disable-media-router-by-default.patch -vanadinite/0010-disable-media-DRM-preprovisioning-by-default.patch -vanadinite/0011-enable-split-cache-by-default.patch -vanadinite/0012-enable-partitioning-connections-by-default.patch -vanadinite/0013-disable-component-updater-pings-by-default.patch -vanadinite/0014-Enable-strict-origin-isolation-by-default.patch -vanadinite/0015-enable-process-isolated-sandboxed-iframes-by-default.patch -vanadinite/0016-enable-partitioning-third-party-storage.patch +vanadinite/0008-disable-media-router-by-default.patch +vanadinite/0009-disable-media-DRM-preprovisioning-by-default.patch +vanadinite/0010-enable-split-cache-by-default.patch +vanadinite/0011-enable-partitioning-connections-by-default.patch +vanadinite/0012-disable-component-updater-pings-by-default.patch +vanadinite/0013-Enable-strict-origin-isolation-by-default.patch +vanadinite/0014-enable-process-isolated-sandboxed-iframes-by-default.patch +vanadinite/0015-enable-partitioning-third-party-storage.patch various/compiler-flags/Do-not-link-with-libatomic.patch various/compiler-flags/function-import-limits.patch @@ -124,8 +123,9 @@ optional/cpu/avx.patch #optional/disable/catapult.patch #optional/disable/click-to-call.patch optional/disable/dns_config_service.patch -#optional/disable/media-remoting.patch optional/disable/supervised-users.patch +optional/disable/media-remoting/media-remoting.patch +optional/disable/media-remoting/registry-pref.patch #optional/fixes/convertutf-bundled.patch #optional/fixes/dav1d-bundled-header.patch optional/fixes/extensions-in-tools-menu.patch diff --git a/debian/patches/vanadinite/0009-disable-media-router-by-default.patch b/debian/patches/vanadinite/0008-disable-media-router-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0009-disable-media-router-by-default.patch rename to debian/patches/vanadinite/0008-disable-media-router-by-default.patch diff --git a/debian/patches/vanadinite/0010-disable-media-DRM-preprovisioning-by-default.patch b/debian/patches/vanadinite/0009-disable-media-DRM-preprovisioning-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0010-disable-media-DRM-preprovisioning-by-default.patch rename to debian/patches/vanadinite/0009-disable-media-DRM-preprovisioning-by-default.patch diff --git a/debian/patches/vanadinite/0011-enable-split-cache-by-default.patch b/debian/patches/vanadinite/0010-enable-split-cache-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0011-enable-split-cache-by-default.patch rename to debian/patches/vanadinite/0010-enable-split-cache-by-default.patch diff --git a/debian/patches/vanadinite/0012-enable-partitioning-connections-by-default.patch b/debian/patches/vanadinite/0011-enable-partitioning-connections-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0012-enable-partitioning-connections-by-default.patch rename to debian/patches/vanadinite/0011-enable-partitioning-connections-by-default.patch diff --git a/debian/patches/vanadinite/0013-disable-component-updater-pings-by-default.patch b/debian/patches/vanadinite/0012-disable-component-updater-pings-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0013-disable-component-updater-pings-by-default.patch rename to debian/patches/vanadinite/0012-disable-component-updater-pings-by-default.patch diff --git a/debian/patches/vanadinite/0014-Enable-strict-origin-isolation-by-default.patch b/debian/patches/vanadinite/0013-Enable-strict-origin-isolation-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0014-Enable-strict-origin-isolation-by-default.patch rename to debian/patches/vanadinite/0013-Enable-strict-origin-isolation-by-default.patch diff --git a/debian/patches/vanadinite/0015-enable-process-isolated-sandboxed-iframes-by-default.patch b/debian/patches/vanadinite/0014-enable-process-isolated-sandboxed-iframes-by-default.patch similarity index 100% rename from debian/patches/vanadinite/0015-enable-process-isolated-sandboxed-iframes-by-default.patch rename to debian/patches/vanadinite/0014-enable-process-isolated-sandboxed-iframes-by-default.patch diff --git a/debian/patches/vanadinite/0016-enable-partitioning-third-party-storage.patch b/debian/patches/vanadinite/0015-enable-partitioning-third-party-storage.patch similarity index 100% rename from debian/patches/vanadinite/0016-enable-partitioning-third-party-storage.patch rename to debian/patches/vanadinite/0015-enable-partitioning-third-party-storage.patch diff --git a/debian/rules.in b/debian/rules.in index b22aa64af..901dd403a 100755 --- a/debian/rules.in +++ b/debian/rules.in @@ -110,7 +110,7 @@ GN_FLAGS += \ #GN_FLAGS += enable_feed_v2=false # Disable media remoting -#GN_FLAGS += enable_media_remoting=false enable_media_remoting_rpc=false +GN_FLAGS += enable_media_remoting=false # Enable mutex priority inheritance GN_FLAGS += enable_mutex_priority_inheritance=true