diff --git a/.gitignore b/.gitignore index 56c0732..4cd7380 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /pixman-0.*.tar.bz2 -/pixman-0.*.tar.xz diff --git a/pixman-0.34.0-vmx.patch b/pixman-0.34.0-vmx.patch deleted file mode 100644 index 0ea2d6b..0000000 --- a/pixman-0.34.0-vmx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pixman-0.34.0/pixman/pixman-vmx.c.orig pixman-0.34.0/pixman/pixman-vmx.c ---- pixman-0.34.0/pixman/pixman-vmx.c.orig 2018-04-27 12:10:14.411696502 +0200 -+++ pixman-0.34.0/pixman/pixman-vmx.c 2018-04-27 12:27:41.174290224 +0200 -@@ -227,7 +227,7 @@ do \ - #define COMPUTE_SHIFT_MASKC(dest, source, mask) - - # define LOAD_VECTOR(source) \ -- v ## source = *((typeof(v ## source)*)source); -+ v ## source = (typeof(v ## source))vec_xl(0, source); - - # define LOAD_VECTORS(dest, source) \ - LOAD_VECTOR(source); \ diff --git a/pixman.spec b/pixman.spec index 503b50d..86aed76 100644 --- a/pixman.spec +++ b/pixman.spec @@ -2,51 +2,57 @@ %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d Name: pixman -Version: 0.46.2 -Release: 2%{?dist} +Version: 0.34.0 +Release: 5%{?dist} Summary: Pixel manipulation library -# SPDX +Group: System Environment/Libraries License: MIT -URL: https://gitlab.freedesktop.org/pixman/pixman +URL: http://cgit.freedesktop.org/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.xz +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source1: make-pixman-snapshot.sh -BuildRequires: gcc -BuildRequires: meson +BuildRequires: automake autoconf libtool %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 %description devel -Pixel manipulation library for X and Cairo development package. +Development library for pixman. %prep -%autosetup -p1 +%setup -q %build -%meson --auto-features=auto \ - %nil +%configure \ +%ifarch %{arm} + --disable-arm-iwmmxt --disable-arm-iwmmxt2 \ +%endif + --disable-ssse3 \ + --disable-static -%meson_build +make %{?_smp_mflags} V=1 %install -%meson_install +make install DESTDIR=$RPM_BUILD_ROOT + +find %{buildroot} -type f -name "*.la" -delete %check -%meson_test +make check %{?_smp_mflags} V=1 ||: -%ldconfig_post -%ldconfig_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %doc COPYING @@ -60,105 +66,6 @@ Pixel manipulation library for X and Cairo development package. %{_libdir}/pkgconfig/pixman-1.pc %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 0.46.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 10 2025 Peter Robinson - 0.46.2-1 -- Update to 0.46.2 - -* Sun Jun 08 2025 Peter Robinson - 0.46.0-1 -- Update to 0.46.0 - -* Mon Jan 20 2025 Fedora Release Engineering - 0.44.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Dec 05 2024 José Expósito - 0.44.2-1 -- Update to 0.44.2 - -* Thu Nov 07 2024 José Expósito - 0.44.0-1 -- Update to 0.44.0 - -* Fri Jul 19 2024 Fedora Release Engineering - 0.43.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Mar 01 2024 José Expósito - 0.43.4-1 -- Update to 0.43.4 - -* Thu Jan 25 2024 Fedora Release Engineering - 0.43.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.43.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Jan 09 2024 José Expósito - 0.43.0-1 -- Update to 0.43.0 - -* Thu Sep 07 2023 José Expósito -- SPDX migration: license is already SPDX compatible - -* Fri Jul 21 2023 Fedora Release Engineering - 0.42.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Feb 21 2023 Petter Abrahamsson - 0.42.2-1 -- Update to 0.42.2 - -* Fri Jan 20 2023 Fedora Release Engineering - 0.40.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.40.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 0.40.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.40.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.40.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.40.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Apr 20 2020 Kalev Lember - 0.40.0-1 -- Update to 0.40.0 - -* Thu Jan 30 2020 Fedora Release Engineering - 0.38.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Sep 09 2019 Kalev Lember - 0.38.4-1 -- Update to 0.38.4 - -* Fri Jul 26 2019 Fedora Release Engineering - 0.38.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Feb 12 2019 Kalev Lember - 0.38.0-1 -- Update to 0.38.0 -- Switch to the meson build system - -* Sat Feb 02 2019 Fedora Release Engineering - 0.36.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 29 2018 Adam Jackson - 0.36.0-1 -- pixman 0.36.0 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.34.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Adam Jackson - 0.34.0-9 -- Use ldconfig scriptlet macros - -* Fri May 04 2018 Dan Horák - 0.34.0-8 -- fix vector loads in VMX (ppc64le) (#1572540) - -* Thu Apr 26 2018 Adam Jackson - 0.34.0-7 -- Enable %%check -- --disable-vmx to fix %%check failures with gcc8 -- Remove stray --disable-ssse3 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.34.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Thu Aug 03 2017 Fedora Release Engineering - 0.34.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 36c5345..66ab912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pixman-0.46.2.tar.xz) = 9419e5a23f4b709e075c5dd33c46bb375d2407b6e90623fe3410a03171f4c5e0a511e8b4414557a39b68d46a4c1ac64f2ef0c9c6eab0b42a2be75d5d52a367fd +002a4fcb644ddfcb4b0e4191576a0d59 pixman-0.34.0.tar.bz2