From a8a054ada996ff35ac52d3d56f55da66479c44fc Mon Sep 17 00:00:00 2001 From: Lilac Date: Thu, 22 Jun 2023 14:22:40 +0000 Subject: [PATCH] firefox-vaapi: auto updated to 114.0.2-2 --- repo/firefox-vaapi/0001-enable-vaapi.patch | 6 +- .../0002-remove-nvidia-blocklist.patch | 104 ++++++++++++++++++ repo/firefox-vaapi/PKGBUILD | 18 ++- 3 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 repo/firefox-vaapi/0002-remove-nvidia-blocklist.patch diff --git a/repo/firefox-vaapi/0001-enable-vaapi.patch b/repo/firefox-vaapi/0001-enable-vaapi.patch index 97c0d85..c7dfe71 100644 --- a/repo/firefox-vaapi/0001-enable-vaapi.patch +++ b/repo/firefox-vaapi/0001-enable-vaapi.patch @@ -1,6 +1,6 @@ -diff --color --unified --recursive --text firefox.orig/widget/gtk/GfxInfo.cpp firefox.new/widget/gtk/GfxInfo.cpp ---- firefox.orig/widget/gtk/GfxInfo.cpp 2023-06-07 15:10:31.232283071 +0200 -+++ firefox.new/widget/gtk/GfxInfo.cpp 2023-06-07 15:21:02.802001776 +0200 +diff --color --unified --recursive --text firefox-114.0.2.orig/widget/gtk/GfxInfo.cpp firefox-114.0.2.new/widget/gtk/GfxInfo.cpp +--- firefox-114.0.2.orig/widget/gtk/GfxInfo.cpp 2023-06-21 19:19:01.466886711 +0200 ++++ firefox-114.0.2.new/widget/gtk/GfxInfo.cpp 2023-06-21 20:11:49.836465037 +0200 @@ -957,14 +957,6 @@ nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_R600", ""); diff --git a/repo/firefox-vaapi/0002-remove-nvidia-blocklist.patch b/repo/firefox-vaapi/0002-remove-nvidia-blocklist.patch new file mode 100644 index 0000000..fbbd84f --- /dev/null +++ b/repo/firefox-vaapi/0002-remove-nvidia-blocklist.patch @@ -0,0 +1,104 @@ +diff --color --unified --recursive --text firefox-114.0.2.orig/widget/gtk/GfxInfo.cpp firefox-114.0.2.new/widget/gtk/GfxInfo.cpp +--- firefox-114.0.2.orig/widget/gtk/GfxInfo.cpp 2023-06-21 20:28:01.694477890 +0200 ++++ firefox-114.0.2.new/widget/gtk/GfxInfo.cpp 2023-06-21 20:29:02.520105848 +0200 +@@ -844,37 +844,6 @@ + V(21, 0, 0, 0), "FEATURE_FAILURE_WEBRENDER_BUG_1635186", + "Mesa 21.0.0.0"); + +- //////////////////////////////////// +- // FEATURE_WEBRENDER_COMPOSITOR +- APPEND_TO_DRIVER_BLOCKLIST( +- OperatingSystem::Linux, DeviceFamily::All, +- nsIGfxInfo::FEATURE_WEBRENDER_COMPOSITOR, +- nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED, +- V(0, 0, 0, 0), "FEATURE_FAILURE_WEBRENDER_COMPOSITOR_DISABLED", ""); +- +- //////////////////////////////////// +- // FEATURE_X11_EGL +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::All, DriverVendor::MesaAll, DeviceFamily::All, +- nsIGfxInfo::FEATURE_X11_EGL, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, +- DRIVER_LESS_THAN, V(17, 0, 0, 0), "FEATURE_X11_EGL_OLD_MESA", +- "Mesa 17.0.0.0"); +- +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::All, DriverVendor::MesaAll, DeviceFamily::NvidiaAll, +- nsIGfxInfo::FEATURE_X11_EGL, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, +- DRIVER_LESS_THAN, V(18, 2, 0, 0), "FEATURE_X11_EGL_OLD_MESA_NOUVEAU", +- "Mesa 18.2.0.0"); +- +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::All, DriverVendor::NonMesaAll, DeviceFamily::NvidiaAll, +- nsIGfxInfo::FEATURE_X11_EGL, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, +- DRIVER_LESS_THAN, V(470, 82, 0, 0), +- "FEATURE_ROLLOUT_X11_EGL_NVIDIA_BINARY", "470.82.0"); +- + // Disable on all AMD devices not using Mesa. + APPEND_TO_DRIVER_BLOCKLIST_EXT( + OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +@@ -884,16 +853,6 @@ + "FEATURE_FAILURE_X11_EGL_NO_LINUX_ATI", ""); + + //////////////////////////////////// +- // FEATURE_DMABUF +- // Disabled due to high volume crash tracked in bug 1788573. +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::All, DriverVendor::NonMesaAll, DeviceFamily::NvidiaAll, +- nsIGfxInfo::FEATURE_DMABUF, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, +- DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), "FEATURE_FAILURE_BUG_1788573", +- ""); +- +- //////////////////////////////////// + // FEATURE_DMABUF_SURFACE_EXPORT + // Disabled due to: + // https://gitlab.freedesktop.org/mesa/mesa/-/issues/6666 +@@ -933,14 +892,6 @@ + V(21, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_MESA", + "Mesa 21.0.0.0"); + +- // Disable on all NVIDIA hardware +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::All, DriverVendor::All, DeviceFamily::NvidiaAll, +- nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, +- nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED, +- V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_LINUX_NVIDIA", ""); +- + // Disable on all AMD devices not using Mesa. + APPEND_TO_DRIVER_BLOCKLIST_EXT( + OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +@@ -975,15 +926,6 @@ + ""); + + //////////////////////////////////// +- // FEATURE_WEBRENDER_PARTIAL_PRESENT +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::X11, DriverVendor::NonMesaAll, DeviceFamily::NvidiaAll, +- nsIGfxInfo::FEATURE_WEBRENDER_PARTIAL_PRESENT, +- nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED, +- V(0, 0, 0, 0), "FEATURE_ROLLOUT_WR_PARTIAL_PRESENT_NVIDIA_BINARY", ""); +- +- //////////////////////////////////// + + APPEND_TO_DRIVER_BLOCKLIST_EXT( + OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +@@ -991,14 +933,6 @@ + nsIGfxInfo::FEATURE_THREADSAFE_GL, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, + DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), + "FEATURE_FAILURE_THREADSAFE_GL_NOUVEAU", ""); +- +- // Disabled due to high volume crash tracked in bug 1788573. +- APPEND_TO_DRIVER_BLOCKLIST_EXT( +- OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +- WindowProtocol::All, DriverVendor::NonMesaAll, DeviceFamily::NvidiaAll, +- nsIGfxInfo::FEATURE_THREADSAFE_GL, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, +- DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), "FEATURE_FAILURE_BUG_1788573", +- ""); + } + return *sDriverInfo; + } diff --git a/repo/firefox-vaapi/PKGBUILD b/repo/firefox-vaapi/PKGBUILD index 8c4b0f4..30f98bf 100644 --- a/repo/firefox-vaapi/PKGBUILD +++ b/repo/firefox-vaapi/PKGBUILD @@ -5,8 +5,8 @@ pkgname=firefox-vaapi _pkgname=firefox -pkgver=114.0.1 -pkgrel=1 +pkgver=114.0.2 +pkgrel=2 pkgdesc="Standalone web browser from mozilla.org (with VA-API patches)" url="https://www.mozilla.org/firefox/" arch=(x86_64) @@ -72,20 +72,23 @@ source=( firefox.desktop identity-icons-brand.svg 0001-enable-vaapi.patch + 0002-remove-nvidia-blocklist.patch ) validpgpkeys=( '14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases ) -sha256sums=('7e4ebc13e8c94af06f703af2119cf1641d4186174a3d59b7812f9d28f61b7d18' +sha256sums=('aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe' 'SKIP' '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' - '5c190c05fdb7dc0a7c50cc1f238620d50f3423b94eaea2d7b9d832ccd1fdffe3') -b2sums=('a34733d3216b98e9de8e1f94a036bfdd0f8924a04e6971fa306ac1230a7cdb6a6a807b5d6fc2848038c4148f2b4658aa216c9c0141cc8a231511294bf59b0ef5' + '1e272a01ed9a1082a0f75b512f24c475e9f0dfe33ecc9934f6d0e874aaf3391f' + 'bae9186230172277cc6b8a61b46f22990edd03c26d25c9ef0a38702f21c7ec0c') +b2sums=('9c624a1093d00ccbfdb1f251489b4aecc597c8202e5e82b35266e32520a2b70d2001accdcc999c214d077dcda0708b50467a63fc3d67ac12d02b8153a67a71e3' 'SKIP' 'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' - '30551e27556470266060ef4169fb9fbd2692852133160c9378b67fb53abd01a58d5aa0a01bac879ade99867a287c8a95c08c9f1ab91d43f05df4ddb5e021ec1f') + 'b0605792080a7463bddbe9a2541441a77295753f37651ed7af056d1524524ba5b752d0b079cb95250ebc922151770483852e6f501133a3655b9db189c5303612' + 'fe9a8583df536126f73fbaf603a410bf7cc38b85c58047fc690c3c7d4df0c0ec5eb3b7f8ce151e6561aa73de2a3c0b1948cc6100b8cc6a2bec7ce2ea86b19b84') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -108,6 +111,9 @@ prepare() { # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/firefox-enable-vaapi.patch patch -Np1 -i ../0001-enable-vaapi.patch + # Disable NVIDIA blocklists, to make it function with libva-nvidia-driver-git AUR package + patch -Np1 -i ../0002-remove-nvidia-blocklist.patch + echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key