From 3661febbb653d72b59edef54516393531cfa718b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 6 Nov 2024 06:36:13 +0000
Subject: [PATCH] pixman: 0.43.4 -> 0.44.0

Changes: https://lists.x.org/archives/xorg-announce/2024-November/003548.html
---
 pkgs/by-name/pi/pixman/package.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix
index 0678539b79a3be..100b50e08bdd37 100644
--- a/pkgs/by-name/pi/pixman/package.nix
+++ b/pkgs/by-name/pi/pixman/package.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -24,16 +25,26 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pixman";
-  version = "0.43.4";
+  version = "0.44.0";
 
   src = fetchurl {
     urls = with finalAttrs; [
       "mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
       "https://cairographics.org/releases/${pname}-${version}.tar.gz"
     ];
-    hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY=";
+    hash = "sha256-iaTB4eReCyPf/nCCAssur/3g/jcn12krLhc5/seKfaw=";
   };
 
+  patches = [
+    # Fix rvv feature detection on gcc-13:
+    #   https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/128
+    (fetchpatch {
+      name = "gcc-13-rvv-detect.patch";
+      url = "https://gitlab.freedesktop.org/pixman/pixman/-/commit/da6350001fdba00f77ca8b590171c943cb425ec4.patch";
+      hash = "sha256-HKBvVqySFY+c3WA8hc/OUkev04VQ38D9r1yYAKCe+84=";
+    })
+  ];
+
   # Raise test timeout, 120s can be slightly exceeded on slower hardware
   postPatch = ''
     substituteInPlace test/meson.build \
@@ -50,11 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
   # architectures and requires used to disable them:
   #   https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
   mesonAutoFeatures = "auto";
-  mesonFlags = [
-    "-Diwmmxt=disabled"
-  ]
-  # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
-  ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";
 
   preConfigure = ''
     # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62