diff options
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | 0001-enable-vaapi.patch (renamed from 0003-enable-vaapi.patch) | 14 | ||||
-rw-r--r-- | 0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch | 24 | ||||
-rw-r--r-- | PKGBUILD | 26 |
4 files changed, 22 insertions, 63 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-vaapi pkgdesc = Standalone web browser from mozilla.org (with VA-API patches) - pkgver = 111.0.1 + pkgver = 112.0 pkgrel = 1 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -43,31 +43,28 @@ pkgbase = firefox-vaapi optdepends = pulseaudio: Audio support optdepends = speech-dispatcher: Text-to-Speech optdepends = xdg-desktop-portal: Screensharing with Wayland - provides = firefox=111.0.1 + provides = firefox=112.0 conflicts = firefox options = !debug options = !emptydirs options = !lto options = !makeflags options = !strip - source = https://archive.mozilla.org/pub/firefox/releases/111.0.1/source/firefox-111.0.1.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/111.0.1/source/firefox-111.0.1.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/112.0/source/firefox-112.0.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/112.0/source/firefox-112.0.source.tar.xz.asc source = firefox.desktop source = identity-icons-brand.svg - source = 0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch - source = 0003-enable-vaapi.patch + source = 0001-enable-vaapi.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = 84a4f3aba62df6e0451cdd28f8f1e59840d77c4062311947b0e59325c2ebdce8 + sha256sums = eb19185f7bfa5c3b0c73edaa57160b44bf3bb2139db83539809607486b8075d9 sha256sums = SKIP sha256sums = 298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9 - sha256sums = be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806 - sha256sums = f2b19e14d8add13930e2ce89fa5e1b252ac979c8177a78a6fa3eb4ae2ad56633 - b2sums = ccc545a72677f168c0adaf2fe0dd3243fbb8243e4332f703b0de575163a6fe98709c6393752e3a35e3be21ad5a4b9da974b6dbbe36d203ae7c5d95eadd2e98f1 + sha256sums = b1298c8e9dbaa3a9af04538a80f4c592394fe702c9a4380f8ff71b1795194667 + b2sums = 6233ee202d000ddd5b0a2eafff09226abf2cf097ea3e1184442ad34e92f6fd408f1891a2063e459d419ba074218596f48c95c860246d4c46d2a4fca3df27a78a b2sums = SKIP b2sums = e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7 b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34 - b2sums = be47c370c1b765921a6ffbb0eeaceaabc26483629b2ebd73c38f36b3ac418d1746fa021b5d444264641ff7c0c13e688a752758bd75c84e0297aceeaec0062ff2 - b2sums = 35a18c4fefac69bdbcabb5c0005a2cc3afb640a09ab92a9025c3d627a5be8857da7d182f203be55d1e64a07dd1d88d56247d8131bd45c7fa6e18526b30624a71 + b2sums = 8a22ba0ff1263dd68d3506c300d81da9d32660a575bd5af1e315f7303e21bcfce42b4e60d09f5f9e1d4104d99e53c2ad097ef3a4a37c552b85cd717114413b4f pkgname = firefox-vaapi diff --git a/0003-enable-vaapi.patch b/0001-enable-vaapi.patch index ddf30d15c0e1..dbe92bc2e21a 100644 --- a/0003-enable-vaapi.patch +++ b/0001-enable-vaapi.patch @@ -1,8 +1,7 @@ -diff -up firefox-104.0/gfx/thebes/gfxPlatformGtk.cpp.firefox-enable-vaapi firefox-104.0/gfx/thebes/gfxPlatformGtk.cpp -diff -up firefox-104.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi firefox-104.0/widget/gtk/GfxInfo.cpp ---- firefox-104.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi 2022-08-16 15:14:53.014042400 +0200 -+++ firefox-104.0/widget/gtk/GfxInfo.cpp 2022-08-16 15:15:30.482301677 +0200 -@@ -873,15 +873,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo:: +diff -up firefox-112.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi firefox-112.0/widget/gtk/GfxInfo.cpp +--- firefox-112.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi 2023-04-05 11:10:14.156695694 +0200 ++++ firefox-112.0/widget/gtk/GfxInfo.cpp 2023-04-05 11:11:40.697665718 +0200 +@@ -810,14 +810,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo:: nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_LINUX_AMD", ""); @@ -14,7 +13,6 @@ diff -up firefox-104.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi firefox-104.0 - DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), - "FEATURE_HARDWARE_VIDEO_DECODING_DISABLE", ""); -#endif -- //////////////////////////////////// - // FEATURE_WEBRENDER_PARTIAL_PRESENT - APPEND_TO_DRIVER_BLOCKLIST_EXT( + // FEATURE_HW_DECODED_VIDEO_ZERO_COPY - ALLOWLIST + APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Linux, DeviceFamily::All, diff --git a/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch b/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch deleted file mode 100644 index b0381041d9ae..000000000000 --- a/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: stransky <stransky@redhat.com> -Date: Thu, 9 Mar 2023 13:16:19 +0000 -Subject: [PATCH] Bug 1820416 Use correct FFVPX headers from ffmpeg 6.0 - r=padenot - -Differential Revision: https://phabricator.services.mozilla.com/D172116 ---- - dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build -index 188b866fc9de..cda0960787a5 100644 ---- a/dom/media/platforms/ffmpeg/ffvpx/moz.build -+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build -@@ -20,7 +20,7 @@ SOURCES += [ - ] - LOCAL_INCLUDES += [ - "..", -- "../ffmpeg59/include", -+ "../ffmpeg60/include", - "/media/mozva", - ] - @@ -5,7 +5,7 @@ pkgname=firefox-vaapi _pkgname=firefox -pkgver=111.0.1 +pkgver=112.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org (with VA-API patches)" url="https://www.mozilla.org/firefox/" @@ -70,24 +70,21 @@ source=( https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} $_pkgname.desktop identity-icons-brand.svg - 0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch - 0003-enable-vaapi.patch + 0001-enable-vaapi.patch ) validpgpkeys=( '14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases <release@mozilla.com> ) -sha256sums=('84a4f3aba62df6e0451cdd28f8f1e59840d77c4062311947b0e59325c2ebdce8' +sha256sums=('eb19185f7bfa5c3b0c73edaa57160b44bf3bb2139db83539809607486b8075d9' 'SKIP' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' - 'be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806' - 'f2b19e14d8add13930e2ce89fa5e1b252ac979c8177a78a6fa3eb4ae2ad56633') -b2sums=('ccc545a72677f168c0adaf2fe0dd3243fbb8243e4332f703b0de575163a6fe98709c6393752e3a35e3be21ad5a4b9da974b6dbbe36d203ae7c5d95eadd2e98f1' + 'b1298c8e9dbaa3a9af04538a80f4c592394fe702c9a4380f8ff71b1795194667') +b2sums=('6233ee202d000ddd5b0a2eafff09226abf2cf097ea3e1184442ad34e92f6fd408f1891a2063e459d419ba074218596f48c95c860246d4c46d2a4fca3df27a78a' 'SKIP' 'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' - 'be47c370c1b765921a6ffbb0eeaceaabc26483629b2ebd73c38f36b3ac418d1746fa021b5d444264641ff7c0c13e688a752758bd75c84e0297aceeaec0062ff2' - '35a18c4fefac69bdbcabb5c0005a2cc3afb640a09ab92a9025c3d627a5be8857da7d182f203be55d1e64a07dd1d88d56247d8131bd45c7fa6e18526b30624a71') + '8a22ba0ff1263dd68d3506c300d81da9d32660a575bd5af1e315f7303e21bcfce42b4e60d09f5f9e1d4104d99e53c2ad097ef3a4a37c552b85cd717114413b4f') # 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 @@ -105,19 +102,10 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # workaround "maximum blob size (488.28KiB) exceeded" on git push towards AUR - wget -O 0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch https://raw.githubusercontent.com/archlinux/svntogit-packages/f72ed84a7907d387296811794d75da515525500e/trunk/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374 - patch -Np1 -i 0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch - - # https://bugs.archlinux.org/task/77796 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1820416 - patch -Np1 -i ../0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1809068 # https://bbs.archlinux.org/viewtopic.php?id=281398 # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/firefox-enable-vaapi.patch - patch -Np1 -i ../0003-enable-vaapi.patch + patch -Np1 -i ../0001-enable-vaapi.patch echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key |