.gitignore

@@ -1 +1 @@
-SOURCES/pixman-0.38.4.tar.bz2
+SOURCES/pixman-0.40.0.tar.xz

.pixman.metadata

@@ -1 +1 @@
-87e1abc91ac4e5dfcc275f744f1d0ec3277ee7cd SOURCES/pixman-0.38.4.tar.bz2
+c625853be8a5369cece57ab7dba558ff739a6332 SOURCES/pixman-0.40.0.tar.xz

SOURCES/0001-Initialize-temporary-buffers-in-general_composite_re.patch

@@ -1,34 +0,0 @@
-From 6fe0131394fb029d2fccaee6b8edcb108840ad8a Mon Sep 17 00:00:00 2001
-From: Federico Mena Quintero <federico@gnome.org>
-Date: Wed, 18 Mar 2020 18:49:30 -0600
-Subject: [PATCH] Initialize temporary buffers in general_composite_rect()
-
-Otherwise, Valgrind shows things like "conditional jump or move
-depends on uninitialised values" errors much later in calling code.
-For example, see https://gitlab.gnome.org/GNOME/librsvg/issues/572
-
-Fixes https://gitlab.freedesktop.org/pixman/pixman/issues/9
----
- pixman/pixman-general.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index 7d74f98..7e5a0d0 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -165,6 +165,12 @@ general_composite_rect  (pixman_implementation_t *imp,
- 
- 	if (!scanline_buffer)
- 	    return;
-+
-+	memset (scanline_buffer, 0, width * Bpp * 3 + 15 * 3);
-+    }
-+    else
-+    {
-+	memset (stack_scanline_buffer, 0, sizeof (stack_scanline_buffer));
-     }
- 
-     src_buffer = ALIGN (scanline_buffer);
--- 
-2.34.1
-

SPECS/pixman.spec

@@ -2,32 +2,29 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.38.4
+Version:        0.40.0
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        Pixel manipulation library
 
-Group:          System Environment/Libraries
 License:        MIT
 URL:            https://gitlab.freedesktop.org/pixman/pixman
 #VCS:           git:git://git.freedesktop.org/git/pixman
 # To make git snapshots:
 # ./make-pixman-snapshot.sh %{\?gitrev}
 # if no revision specified, makes a new one from HEAD.
-Source0:        https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+Source0:        https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
 Source1:        make-pixman-snapshot.sh
 
-Patch0: 0001-Initialize-temporary-buffers-in-general_composite_re.patch
+Patch0: 0001-Avoid-integer-overflow-leading-to-out-of-bounds-writ.patch
-Patch1: 0001-Avoid-integer-overflow-leading-to-out-of-bounds-writ.patch
 
-BuildRequires:  automake autoconf libtool
 BuildRequires:  gcc
+BuildRequires:  meson
 
 %description
 Pixman is a pixel manipulation library for X and Cairo.
 
 %package devel
 Summary: Pixel manipulation library development package
-Group: Development/Libraries
 Requires: %{name}%{?isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -36,23 +33,23 @@ Development library for pixman.
 
 %prep
 %autosetup -p1
+# bump up the test suite timeout because arm
+sed -i 's/120/600/' test/meson.build
 
 %build
-%configure \
+%meson --auto-features=auto \
 %ifarch %{arm}
-  --disable-arm-iwmmxt --disable-arm-iwmmxt2 \
+  -Diwmmxt=disabled -Diwmmxt2=false \
 %endif
-  --disable-static
+  %nil
 
-make %{?_smp_mflags} V=1
+%meson_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
-
-find %{buildroot} -type f -name "*.la" -delete
 
 %check
-make check %{?_smp_mflags} V=1
+%meson_test
 
 %ldconfig_post
 %ldconfig_postun
@@ -69,14 +66,40 @@ make check %{?_smp_mflags} V=1
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
-* Mon Oct 09 2023 José Expósito <jexposit@redhat.com> - 0.38.4-3
+* Mon Oct 09 2023 José Expósito <jexposit@redhat.com> - 0.40.0-6
 - Backport fix for CVE-2022-44638
 
-* Tue Feb 22 2022 Adam Jackson <ajax@redhat.com> - 0.38.4-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.40.0-5
-- Backport the pixman part of cairo CVE-2020-35492
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.40.0-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 20 2020 Kalev Lember <klember@redhat.com> - 0.40.0-1
+- Update to 0.40.0
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.38.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 0.38.4-1
+- Update to 0.38.4
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.38.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Feb 12 2019 Kalev Lember <klember@redhat.com> - 0.38.0-1
+- Update to 0.38.0
+- Switch to the meson build system
 
-* Tue Nov 19 2019 Adam Jackson <ajax@redhat.com> - 0.38.4-1
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.36.0-2
-- pixman 0.38.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
 * Thu Nov 29 2018 Adam Jackson <ajax@redhat.com> - 0.36.0-1
 - pixman 0.36.0