From 109858eae5716300d965a3b3ff8ff8b0bba44864 Mon Sep 17 00:00:00 2001 From: "Claude (noether)" Date: Fri, 15 May 2026 08:00:27 +0000 Subject: [PATCH] firefox-fourier: flatten patches to top-level (makepkg has no subdir support) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up to #10. The subdir layout I assumed worked turned out to not work — per 'man PKGBUILD': The filename in the array must NOT include any path components like ./ makepkg's source-staging only honors basenames; the patches/ subdir references staged the files but the basename-lookup at apply time failed with the same 'not found in build directory' error that #9 hit. I copied the chromium-fourier convention thinking it was proven, but chromium-fourier has no CI either and likely has the same latent breakage (separate issue, not in this PR's scope). The actually-working pattern is the mpv-fourier one: patches at the top level next to the PKGBUILD. mpv-fourier iter2 just built green on CI (#92) with that layout. This commit: - Moves all 8 patches (5 fourier + 3 arch upstream) from patches/ to arch/firefox-fourier/ via git mv (preserves blame). - Removes the now-empty patches/ subdir. - Strips 'patches/' prefix from source array entries. - Strips '/patches' from prepare() patch -i paths. No semantic change to the patch content or apply order. pkgrel 3 -> 4. --- .../0001-gfxinfo-v4l2-stateless-fourccs.patch | 0 .../0002-libwrapper-hwdevice-ctx-create.patch | 0 .../0003-ffmpegvideo-v4l2-request-route.patch | 0 .../0004-prefs-v4l2-request.patch | 0 .../0005-rdd-sandbox-v4l2-media-ctl.patch | 0 arch/firefox-fourier/PKGBUILD | 34 +++++++++---------- ...-enable-rust-simd-work-with-Rust-1.9.patch | 0 ...l-optimizer-to-build-with-glibc-2.43.patch | 0 ...wasm32-wasip1-target-for-clang-22.1-.patch | 0 9 files changed, 17 insertions(+), 17 deletions(-) rename arch/firefox-fourier/{patches => }/0001-gfxinfo-v4l2-stateless-fourccs.patch (100%) rename arch/firefox-fourier/{patches => }/0002-libwrapper-hwdevice-ctx-create.patch (100%) rename arch/firefox-fourier/{patches => }/0003-ffmpegvideo-v4l2-request-route.patch (100%) rename arch/firefox-fourier/{patches => }/0004-prefs-v4l2-request.patch (100%) rename arch/firefox-fourier/{patches => }/0005-rdd-sandbox-v4l2-media-ctl.patch (100%) rename arch/firefox-fourier/{patches => }/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch (100%) rename arch/firefox-fourier/{patches => }/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch (100%) rename arch/firefox-fourier/{patches => }/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch (100%) diff --git a/arch/firefox-fourier/patches/0001-gfxinfo-v4l2-stateless-fourccs.patch b/arch/firefox-fourier/0001-gfxinfo-v4l2-stateless-fourccs.patch similarity index 100% rename from arch/firefox-fourier/patches/0001-gfxinfo-v4l2-stateless-fourccs.patch rename to arch/firefox-fourier/0001-gfxinfo-v4l2-stateless-fourccs.patch diff --git a/arch/firefox-fourier/patches/0002-libwrapper-hwdevice-ctx-create.patch b/arch/firefox-fourier/0002-libwrapper-hwdevice-ctx-create.patch similarity index 100% rename from arch/firefox-fourier/patches/0002-libwrapper-hwdevice-ctx-create.patch rename to arch/firefox-fourier/0002-libwrapper-hwdevice-ctx-create.patch diff --git a/arch/firefox-fourier/patches/0003-ffmpegvideo-v4l2-request-route.patch b/arch/firefox-fourier/0003-ffmpegvideo-v4l2-request-route.patch similarity index 100% rename from arch/firefox-fourier/patches/0003-ffmpegvideo-v4l2-request-route.patch rename to arch/firefox-fourier/0003-ffmpegvideo-v4l2-request-route.patch diff --git a/arch/firefox-fourier/patches/0004-prefs-v4l2-request.patch b/arch/firefox-fourier/0004-prefs-v4l2-request.patch similarity index 100% rename from arch/firefox-fourier/patches/0004-prefs-v4l2-request.patch rename to arch/firefox-fourier/0004-prefs-v4l2-request.patch diff --git a/arch/firefox-fourier/patches/0005-rdd-sandbox-v4l2-media-ctl.patch b/arch/firefox-fourier/0005-rdd-sandbox-v4l2-media-ctl.patch similarity index 100% rename from arch/firefox-fourier/patches/0005-rdd-sandbox-v4l2-media-ctl.patch rename to arch/firefox-fourier/0005-rdd-sandbox-v4l2-media-ctl.patch diff --git a/arch/firefox-fourier/PKGBUILD b/arch/firefox-fourier/PKGBUILD index 3fdaecab1..f6a40514b 100644 --- a/arch/firefox-fourier/PKGBUILD +++ b/arch/firefox-fourier/PKGBUILD @@ -13,7 +13,7 @@ pkgname=firefox-fourier pkgver=150.0.1 -pkgrel=3 +pkgrel=4 pkgdesc='Firefox with V4L2 stateless HW video decode unlocked for mainline Linux Rockchip' arch=('aarch64' 'x86_64') url='https://www.mozilla.org/firefox' @@ -79,15 +79,15 @@ 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 - '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' + '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' # firefox-fourier patches — V4L2 stateless decode unlock. - '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' + '0001-gfxinfo-v4l2-stateless-fourccs.patch' + '0002-libwrapper-hwdevice-ctx-create.patch' + '0003-ffmpegvideo-v4l2-request-route.patch' + '0004-prefs-v4l2-request.patch' + '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' @@ -98,16 +98,16 @@ prepare() { cd "${srcdir}/firefox-${pkgver}" # Toolchain glue (Arch upstream) — apply BEFORE the fourier patches. - 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" + 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" # Fourier patches — order matters; see ../PLAN.md for rationale. - 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" + 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}/0005-rdd-sandbox-v4l2-media-ctl.patch" cp "${srcdir}/mozconfig" .mozconfig } diff --git a/arch/firefox-fourier/patches/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch b/arch/firefox-fourier/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch similarity index 100% rename from arch/firefox-fourier/patches/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch rename to arch/firefox-fourier/arch-0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch diff --git a/arch/firefox-fourier/patches/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch b/arch/firefox-fourier/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch similarity index 100% rename from arch/firefox-fourier/patches/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch rename to arch/firefox-fourier/arch-0003-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch diff --git a/arch/firefox-fourier/patches/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch b/arch/firefox-fourier/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch similarity index 100% rename from arch/firefox-fourier/patches/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch rename to arch/firefox-fourier/arch-0004-Bug-2023597-Use-wasm32-wasip1-target-for-clang-22.1-.patch