include nvidia patches

4 files changed, 121 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2a4457ac3bd..1f8d77de293f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -56,16 +56,19 @@ pkgbase = firefox-vaapi
 	source = firefox.desktop
 	source = identity-icons-brand.svg
 	source = 0001-enable-vaapi.patch
+	source = 0002-remove-nvidia-blocklist.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe
 	sha256sums = SKIP
 	sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	sha256sums = 5c190c05fdb7dc0a7c50cc1f238620d50f3423b94eaea2d7b9d832ccd1fdffe3
+	sha256sums = 1e272a01ed9a1082a0f75b512f24c475e9f0dfe33ecc9934f6d0e874aaf3391f
+	sha256sums = 37447709db23189a2c0aedfc16e086b30ae3d532a7ed35b17e35f89e89bf3502
 	b2sums = 9c624a1093d00ccbfdb1f251489b4aecc597c8202e5e82b35266e32520a2b70d2001accdcc999c214d077dcda0708b50467a63fc3d67ac12d02b8153a67a71e3
 	b2sums = SKIP
 	b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
-	b2sums = 30551e27556470266060ef4169fb9fbd2692852133160c9378b67fb53abd01a58d5aa0a01bac879ade99867a287c8a95c08c9f1ab91d43f05df4ddb5e021ec1f
+	b2sums = b0605792080a7463bddbe9a2541441a77295753f37651ed7af056d1524524ba5b752d0b079cb95250ebc922151770483852e6f501133a3655b9db189c5303612
+	b2sums = 2596a5304979dedb4b8f74e4e2776344530edff5d775318aba6b162440418dcf2aceb0d6dce9957a81da29b92f1e68f3863d27bed9a6df440eaf030cbe5a8d85
 
 pkgname = firefox-vaapi
diff --git a/0001-enable-vaapi.patch b/0001-enable-vaapi.patch
index 97c0d852adc8..c7dfe7137d9a 100644
--- a/0001-enable-vaapi.patch
+++ b/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/0002-remove-nvidia-blocklist.patch b/0002-remove-nvidia-blocklist.patch
new file mode 100644
index 000000000000..15141214b4b0
--- /dev/null
+++ b/0002-remove-nvidia-blocklist.patch
@@ -0,0 +1,105 @@
+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;
+ }
+Alleen in firefox-114.0.2.new/widget/gtk: GfxInfo.cpp.orig
diff --git a/PKGBUILD b/PKGBUILD
index f25631bad2f4..cbb26024ae14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,6 +72,7 @@ source=(
   firefox.desktop
   identity-icons-brand.svg
   0001-enable-vaapi.patch
+  0002-remove-nvidia-blocklist.patch
 )
 validpgpkeys=(
   '14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases <release@mozilla.com>
@@ -80,12 +81,14 @@ sha256sums=('aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe'
             'SKIP'
             '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            '5c190c05fdb7dc0a7c50cc1f238620d50f3423b94eaea2d7b9d832ccd1fdffe3')
+            '1e272a01ed9a1082a0f75b512f24c475e9f0dfe33ecc9934f6d0e874aaf3391f'
+            '37447709db23189a2c0aedfc16e086b30ae3d532a7ed35b17e35f89e89bf3502')
 b2sums=('9c624a1093d00ccbfdb1f251489b4aecc597c8202e5e82b35266e32520a2b70d2001accdcc999c214d077dcda0708b50467a63fc3d67ac12d02b8153a67a71e3'
         'SKIP'
         'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
-        '30551e27556470266060ef4169fb9fbd2692852133160c9378b67fb53abd01a58d5aa0a01bac879ade99867a287c8a95c08c9f1ab91d43f05df4ddb5e021ec1f')
+        'b0605792080a7463bddbe9a2541441a77295753f37651ed7af056d1524524ba5b752d0b079cb95250ebc922151770483852e6f501133a3655b9db189c5303612'
+        '2596a5304979dedb4b8f74e4e2776344530edff5d775318aba6b162440418dcf2aceb0d6dce9957a81da29b92f1e68f3863d27bed9a6df440eaf030cbe5a8d85')
 
 # 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