firefox-fourier: fix patches layout + ship missing arch upstream patches (#10)

arch/firefox-fourier/PKGBUILD

@@ -13,7 +13,7 @@
 
 pkgname=firefox-fourier
 pkgver=150.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Firefox with V4L2 stateless HW video decode unlocked for mainline Linux Rockchip'
 arch=('aarch64' 'x86_64')
 url='https://www.mozilla.org/firefox'
@@ -79,33 +79,35 @@ source=(
   # walls. arch-0001 (install-under-remoting) skipped — our launcher
   # ships under /usr/bin/firefox-fourier with our own wrapper.
   # https://gitlab.archlinux.org/archlinux/packaging/packages/firefox
-  'arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch'
-  'arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch'
-  'arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch'
+  'patches/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch'
+  'patches/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch'
+  'patches/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch'
   # firefox-fourier patches — V4L2 stateless decode unlock.
-  '0001-gfxinfo-v4l2-stateless-fourccs.patch'
-  '0002-libwrapper-hwdevice-ctx-create.patch'
-  '0003-ffmpegvideo-v4l2-request-route.patch'
-  '0004-prefs-v4l2-request.patch'
+  'patches/0001-gfxinfo-v4l2-stateless-fourccs.patch'
+  'patches/0002-libwrapper-hwdevice-ctx-create.patch'
+  'patches/0003-ffmpegvideo-v4l2-request-route.patch'
+  'patches/0004-prefs-v4l2-request.patch'
+  'patches/0005-rdd-sandbox-v4l2-media-ctl.patch'
   # Vendor-default prefs that gate the patched VAAPI path on RK3399 —
   # widget.dmabuf.force-enabled etc. See marfrit-packages#8 for evidence.
   'rockchip-fourier-defaults.js'
 )
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 prepare() {
   cd "${srcdir}/firefox-${pkgver}"
 
   # Toolchain glue (Arch upstream) — apply BEFORE the fourier patches.
-  patch -Np1 -i "${srcdir}/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch"
-  patch -Np1 -i "${srcdir}/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch"
-  patch -Np1 -i "${srcdir}/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch"
+  patch -Np1 -i "${srcdir}/patches/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch"
+  patch -Np1 -i "${srcdir}/patches/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch"
+  patch -Np1 -i "${srcdir}/patches/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch"
 
   # Fourier patches — order matters; see ../PLAN.md for rationale.
-  patch -Np1 -i "${srcdir}/0001-gfxinfo-v4l2-stateless-fourccs.patch"
-  patch -Np1 -i "${srcdir}/0002-libwrapper-hwdevice-ctx-create.patch"
-  patch -Np1 -i "${srcdir}/0003-ffmpegvideo-v4l2-request-route.patch"
-  patch -Np1 -i "${srcdir}/0004-prefs-v4l2-request.patch"
+  patch -Np1 -i "${srcdir}/patches/0001-gfxinfo-v4l2-stateless-fourccs.patch"
+  patch -Np1 -i "${srcdir}/patches/0002-libwrapper-hwdevice-ctx-create.patch"
+  patch -Np1 -i "${srcdir}/patches/0003-ffmpegvideo-v4l2-request-route.patch"
+  patch -Np1 -i "${srcdir}/patches/0004-prefs-v4l2-request.patch"
+  patch -Np1 -i "${srcdir}/patches/0005-rdd-sandbox-v4l2-media-ctl.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
 }

arch/firefox-fourier/patches/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alex Hochheiden <ahochheiden@mozilla.com>
+Date: Wed, 1 Apr 2026 18:11:37 +0000
+Subject: [PATCH] Bug 2023597 - Use `wasm32-wasip1` target for clang >= 22.1
+ r=firefox-build-system-reviewers,sergesanspaille
+
+https://github.com/llvm/llvm-project/pull/165345
+https://releases.llvm.org/22.1.0/tools/clang/docs/ReleaseNotes.html
+
+Differential Revision: https://phabricator.services.mozilla.com/D291023
+---
+ build/moz.configure/toolchain.configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+index a37ed610cc43..c7d0c8bdf75c 100644
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -695,6 +695,9 @@ def check_compiler(configure_cache, compiler, language, target, android_version)
+         # This makes clang define __ANDROID_API__ and use versioned library
+         # directories from the NDK.
+         toolchain = "%s%d" % (target.toolchain, android_version)
++    elif target.kernel == "WASI" and info.type == "clang" and info.version >= Version("22.1"):
++        # The wasm32-wasi target was renamed to wasm32-wasip1 in LLVM 22.1.
++        toolchain = "wasm32-wasip1"
+     else:
+         toolchain = target.toolchain
+