From 0861261696cc011dc1e96c9f9a0ff64848c32fc7 Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Wed, 15 Jun 2022 22:30:13 -0500 Subject: [PATCH] firefox [testing]: cleanup --- testing/firefox/README | 7 +--- testing/firefox/build | 5 --- testing/firefox/checksums | 2 +- .../firefox/patches/fix-wayland-only.patch | 40 +++++++------------ 4 files changed, 18 insertions(+), 36 deletions(-) diff --git a/testing/firefox/README b/testing/firefox/README index a971327c..70214c4d 100644 --- a/testing/firefox/README +++ b/testing/firefox/README @@ -68,17 +68,14 @@ should start with no further configuration. --[005] Enable VAAPI Acceleration ---------------------------------------------- -Make sure that the following are set in your about:config page. +As of Firefox 102, only the following modification to about:config should be +required, with no need to disable any sandbox features. +------------------------------------------------------------------------------+ | | | about:config | | | -| gfx.webrender.all=true | -| media.av1.enabled=false | -| media.ffmpeg.dmabuf-textures.disabled=false | | media.ffmpeg.vaapi.enabled=true | -| media.ffvpx.enabled=false | | | +------------------------------------------------------------------------------+ diff --git a/testing/firefox/build b/testing/firefox/build index 6fb0c1fc..b55b3bff 100755 --- a/testing/firefox/build +++ b/testing/firefox/build @@ -31,11 +31,6 @@ for f in zip unzip; do ( export PATH="$PWD/junk/bin:$PATH" -export CC=clang -export CXX=clang++ -export CFLAGS="--target=x86_64-pc-linux-musl $CFLAGS" -export CXXFLAGS="--target=x86_64-pc-linux-musl $CXXFLAGS" - # If using libc++, CXXSTDLIB needs to be set manually. case $("$CC" -print-file-name=libc++.so) in */*) export CXXSTDLIB=c++ diff --git a/testing/firefox/checksums b/testing/firefox/checksums index f7051142..95e0b593 100644 --- a/testing/firefox/checksums +++ b/testing/firefox/checksums @@ -5,6 +5,6 @@ f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 d3ea2503dff0a602bb058153533ebccd8232e8aac1dc82437a55d724b8d22bc2 ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b -77f39b4dbbb6d70a43fe93775dc8f1abfc36cb8d2ddf0c9984a6291437dd1afc +5701481a104e23ae928161c84b7bc0040a8d9176681db6e94e26c3975af49634 509ce8c2e956481850cf3fbbeb2adcfd72a29f0699ccf2d00c24d1f81167a1dc 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 diff --git a/testing/firefox/patches/fix-wayland-only.patch b/testing/firefox/patches/fix-wayland-only.patch index 6253be21..750493f0 100644 --- a/testing/firefox/patches/fix-wayland-only.patch +++ b/testing/firefox/patches/fix-wayland-only.patch @@ -11,7 +11,7 @@ index 2bf6de6..d2fce1f 100644 # endif #endif diff --git a/gfx/gl/GLContextProviderLinux.cpp b/gfx/gl/GLContextProviderLinux.cpp -index f8f6f3d..26ef29d 100644 +index f8f6f3d..7205449 100644 --- a/gfx/gl/GLContextProviderLinux.cpp +++ b/gfx/gl/GLContextProviderLinux.cpp @@ -13,7 +13,9 @@ namespace mozilla::gl { @@ -24,61 +24,51 @@ index f8f6f3d..26ef29d 100644 static class GLContextProviderEGL sGLContextProviderEGL; already_AddRefed GLContextProviderLinux::CreateForCompositorWidget( -@@ -22,10 +24,13 @@ already_AddRefed GLContextProviderLinux::CreateForCompositorWidget( +@@ -22,9 +24,11 @@ already_AddRefed GLContextProviderLinux::CreateForCompositorWidget( if (gfxVars::UseEGL()) { return sGLContextProviderEGL.CreateForCompositorWidget( aCompositorWidget, aHardwareWebRender, aForceAccelerated); -- } else { -+ } +#ifdef MOZ_X11 -+ else { + } else { return sGLContextProviderGLX.CreateForCompositorWidget( aCompositorWidget, aHardwareWebRender, aForceAccelerated); - } +#endif + } } - /*static*/ -@@ -33,27 +38,36 @@ already_AddRefed GLContextProviderLinux::CreateHeadless( +@@ -33,8 +37,10 @@ already_AddRefed GLContextProviderLinux::CreateHeadless( const GLContextCreateDesc& desc, nsACString* const out_failureId) { if (gfxVars::UseEGL()) { return sGLContextProviderEGL.CreateHeadless(desc, out_failureId); -- } else { -+ } +#ifdef MOZ_X11 -+ else { + } else { return sGLContextProviderGLX.CreateHeadless(desc, out_failureId); - } +#endif + } } - /*static*/ +@@ -42,8 +48,10 @@ already_AddRefed GLContextProviderLinux::CreateHeadless( GLContext* GLContextProviderLinux::GetGlobalContext() { if (gfxVars::UseEGL()) { return sGLContextProviderEGL.GetGlobalContext(); -- } else { -+ } +#ifdef MOZ_X11 -+ else { + } else { return sGLContextProviderGLX.GetGlobalContext(); - } +#endif + } } - /*static*/ +@@ -51,8 +59,10 @@ GLContext* GLContextProviderLinux::GetGlobalContext() { void GLContextProviderLinux::Shutdown() { if (gfxVars::UseEGL()) { sGLContextProviderEGL.Shutdown(); -- } else { -+ } +#ifdef MOZ_X11 -+ else { + } else { sGLContextProviderGLX.Shutdown(); - } +#endif + } } - } // namespace mozilla::gl diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index bc492a8..fc0a005 100644 --- a/gfx/gl/moz.build @@ -333,7 +323,7 @@ index 6fcc3e9..8462b6d 100644 class nsWindow; diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp -index e6b54dc..770d644 100644 +index e6b54dc..cafd701 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -268,6 +268,9 @@ static SystemTimeConverter& TimeConverter() { @@ -341,7 +331,7 @@ index e6b54dc..770d644 100644 bool nsWindow::sTransparentMainWindow = false; +// forward declare from mozgtk -+MOZ_EXPORT extern "C" void mozgtk_linker_holder(); ++extern "C" MOZ_EXPORT void mozgtk_linker_holder(); + namespace mozilla {