118.0-1

4 files changed, 29 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54a7efb8bf8b..8957f0f11b0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-vaapi
 	pkgdesc = Standalone web browser from mozilla.org (with VA-API patches)
-	pkgver = 117.0.1
+	pkgver = 118.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -44,31 +44,31 @@ pkgbase = firefox-vaapi
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=117.0.1
+	provides = firefox=118.0
 	conflicts = firefox
 	options = !debug
 	options = !emptydirs
 	options = !lto
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/117.0.1/source/firefox-117.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/117.0.1/source/firefox-117.0.1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/118.0/source/firefox-118.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/118.0/source/firefox-118.0.source.tar.xz.asc
 	source = firefox.desktop
 	source = identity-icons-brand.svg
 	source = 0001-enable-vaapi.patch
 	source = 0002-remove-nvidia-blocklist.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 7ea4203b5cf9e59f80043597e2c9020291754fcab784a337586b5f5e1370c416
+	sha256sums = d0f996116ae234dc7bd59e0d77ddefe268179d7500d16a9488309c826547c97c
 	sha256sums = SKIP
 	sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	sha256sums = c80c28ea44001aada3aab80d6965ef73388d8b6759121c4ee004c2b90f626af0
-	sha256sums = 9af9855dc287f1c8e47370bbd4bebfb3ee3c7a71c54167b965a454bc09fb3304
-	b2sums = c618942209f60550ef5bd3db4a3a150fbe8993d2a40ba9b1ece3e647e4fcdd82639569f354f87b488b47781d52d21a158a25906c88fbaf86ddb57b5973f8ace6
+	sha256sums = e10b201f3e3968912ca93c83cedcb68a64b9f52682c7f29c283b1da90b805285
+	sha256sums = bb18d5ab7ea5322e2500d9d3f4038a62321c5007d8d21c21730f02129d794fdb
+	b2sums = b31aa245687fe3c33152675ec5c4b8368ae810fbb8830535343029ed87683e2321afa8fdd473a41442475164312847874af09ccb704d9b1404cd033d0a8af0ec
 	b2sums = SKIP
 	b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
-	b2sums = 0540b618bbc01707a4f65c4bca753fffe2eb7c730921981f2308c7b8b79b846be634eaa67234fa1a959c825e1995783c1f997a08780182c958f9f285f2acf86b
-	b2sums = 8a8b01a6ba066811cca274a0b34b80e2d9cae31d76b6cf775d3a7c9a7705c49a5d80db77eb61a285d4b8be0400d710bc9c3cc872929075806511695dd9126292
+	b2sums = 732ca15418226aa00d5308f1cd1bbd3aeb13295ce9c5bee12b65b5e1784a143a2078dd1831d6ab129366012e4cc1e02de657e203694feecbbdf3a77012dbe33c
+	b2sums = 0cff556f03caba678b5bdeb19b776a1b858da3114b7158155a74fc8adeb034174f0883e8b2c00ecb7699422c50e95ab86148065176d5cb0cdad3d4fcf0dc7452
 
 pkgname = firefox-vaapi
diff --git a/0001-enable-vaapi.patch b/0001-enable-vaapi.patch
index f5dfc27bc81c..609534694cd1 100644
--- a/0001-enable-vaapi.patch
+++ b/0001-enable-vaapi.patch
@@ -1,6 +1,6 @@
-diff --color --unified --recursive --text firefox-117.0.orig/widget/gtk/GfxInfo.cpp firefox-117.0.new/widget/gtk/GfxInfo.cpp
---- firefox-117.0.orig/widget/gtk/GfxInfo.cpp	2023-08-28 21:02:12.433315080 +0200
-+++ firefox-117.0.new/widget/gtk/GfxInfo.cpp	2023-08-28 21:13:29.146440067 +0200
+diff --color --unified --recursive --text firefox-118.0.orig/widget/gtk/GfxInfo.cpp firefox-118.0.new/widget/gtk/GfxInfo.cpp
+--- firefox-118.0.orig/widget/gtk/GfxInfo.cpp	2023-09-26 19:58:23.886518746 +0200
++++ firefox-118.0.new/widget/gtk/GfxInfo.cpp	2023-09-26 20:20:46.293989468 +0200
 @@ -1095,14 +1095,6 @@
          nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_LESS_THAN, V(23, 1, 1, 0),
          "FEATURE_HARDWARE_VIDEO_DECODING_AMD_DISABLE", "Mesa 23.1.1.0");
diff --git a/0002-remove-nvidia-blocklist.patch b/0002-remove-nvidia-blocklist.patch
index 5d9b20002a03..17aae3b8e723 100644
--- a/0002-remove-nvidia-blocklist.patch
+++ b/0002-remove-nvidia-blocklist.patch
@@ -1,6 +1,6 @@
-diff --color --unified --recursive --text firefox-117.0.orig/widget/gtk/GfxInfo.cpp firefox-117.0.new/widget/gtk/GfxInfo.cpp
---- firefox-117.0.orig/widget/gtk/GfxInfo.cpp	2023-08-28 22:32:55.981410357 +0200
-+++ firefox-117.0.new/widget/gtk/GfxInfo.cpp	2023-08-28 23:29:41.452292854 +0200
+diff --color --unified --recursive --text firefox-118.0.orig/widget/gtk/GfxInfo.cpp firefox-118.0.new/widget/gtk/GfxInfo.cpp
+--- firefox-118.0.orig/widget/gtk/GfxInfo.cpp	2023-09-26 21:02:27.522139741 +0200
++++ firefox-118.0.new/widget/gtk/GfxInfo.cpp	2023-09-26 21:04:39.745075990 +0200
 @@ -974,37 +974,6 @@
          DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0),
          "FEATURE_FAILURE_WEBRENDER_MESA_VM", "");
@@ -87,11 +87,10 @@ diff --color --unified --recursive --text firefox-117.0.orig/widget/gtk/GfxInfo.
  
      APPEND_TO_DRIVER_BLOCKLIST_EXT(
          OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
-@@ -1128,14 +1070,6 @@
-         nsIGfxInfo::FEATURE_THREADSAFE_GL, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
+@@ -1129,14 +1071,6 @@
          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,
@@ -99,6 +98,7 @@ diff --color --unified --recursive --text firefox-117.0.orig/widget/gtk/GfxInfo.
 -        nsIGfxInfo::FEATURE_THREADSAFE_GL, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
 -        DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), "FEATURE_FAILURE_BUG_1788573",
 -        "");
-   }
-   return *sDriverInfo;
- }
+-
+     // AMD R600 family does not perform well with WebRender.
+     APPEND_TO_DRIVER_BLOCKLIST(
+         OperatingSystem::Linux, DeviceFamily::AmdR600,
diff --git a/PKGBUILD b/PKGBUILD
index e74509f6e8df..47c8a666ace2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-vaapi
 _pkgname=firefox
-pkgver=117.0.1
+pkgver=118.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org (with VA-API patches)"
 url="https://www.mozilla.org/firefox/"
@@ -79,18 +79,18 @@ validpgpkeys=(
   # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/
   14F26682D0916CDD81E37B6D61B7B526D98F0353
 )
-sha256sums=('7ea4203b5cf9e59f80043597e2c9020291754fcab784a337586b5f5e1370c416'
+sha256sums=('d0f996116ae234dc7bd59e0d77ddefe268179d7500d16a9488309c826547c97c'
             'SKIP'
             '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            'c80c28ea44001aada3aab80d6965ef73388d8b6759121c4ee004c2b90f626af0'
-            '9af9855dc287f1c8e47370bbd4bebfb3ee3c7a71c54167b965a454bc09fb3304')
-b2sums=('c618942209f60550ef5bd3db4a3a150fbe8993d2a40ba9b1ece3e647e4fcdd82639569f354f87b488b47781d52d21a158a25906c88fbaf86ddb57b5973f8ace6'
+            'e10b201f3e3968912ca93c83cedcb68a64b9f52682c7f29c283b1da90b805285'
+            'bb18d5ab7ea5322e2500d9d3f4038a62321c5007d8d21c21730f02129d794fdb')
+b2sums=('b31aa245687fe3c33152675ec5c4b8368ae810fbb8830535343029ed87683e2321afa8fdd473a41442475164312847874af09ccb704d9b1404cd033d0a8af0ec'
         'SKIP'
         'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
-        '0540b618bbc01707a4f65c4bca753fffe2eb7c730921981f2308c7b8b79b846be634eaa67234fa1a959c825e1995783c1f997a08780182c958f9f285f2acf86b'
-        '8a8b01a6ba066811cca274a0b34b80e2d9cae31d76b6cf775d3a7c9a7705c49a5d80db77eb61a285d4b8be0400d710bc9c3cc872929075806511695dd9126292')
+        '732ca15418226aa00d5308f1cd1bbd3aeb13295ce9c5bee12b65b5e1784a143a2078dd1831d6ab129366012e4cc1e02de657e203694feecbbdf3a77012dbe33c'
+        '0cff556f03caba678b5bdeb19b776a1b858da3114b7158155a74fc8adeb034174f0883e8b2c00ecb7699422c50e95ab86148065176d5cb0cdad3d4fcf0dc7452')
 
 # 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