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