Sync from SUSE:SLFO:1.1 pixman revision 17fe2a759a60ad6fc1f7f028ede5293b

pixman.changes

@@ -1,69 +1,10 @@
--------------------------------------------------------------------
-Wed Dec  4 23:01:50 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Increase test timeout on s390x. Several tests can be slow and
-  sometimes times out in our builds.
-- Use autosetup macro.
-
--------------------------------------------------------------------
-Fri May  3 02:29:07 UTC 2024 - Federico Mena Quintero <federico@suse.com>
-
-- Update to version 0.43.4
-  + Fix incorrect compositing on big-endian architectures.
-  + Allow building on clang/arm32.
-
--------------------------------------------------------------------
-Tue Apr  9 07:42:07 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- a64-neon is an aarch64 feature, not armv6/7
-
--------------------------------------------------------------------
-Mon Feb 26 09:28:18 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Rework previous change
-  + Disable the demos: pass -Ddemos=disabled to meson. This allows
-    us not to BuildRequire gtk3. Having it would result in a build
-    cycle.
-  + Pass -Dlibpng=disabled to meson: only needed for the tests.
-- Drop pkgconfig(gtk+-3.0) BuildRequires: with the demos disabled,
-  we don't need this anymore.
-- Drop cmake BuildRequires: the build system uses meson. cmake is
-  used as a fallback to find libraries when they can't be found
-  with pkgconfig.
-- Enable test suite (meson_test), without the png tests (for
-  minimal build deps).
-- Switch post/post to ldconfig_scriptlets: there is no other code
-  in the scripts.
-
--------------------------------------------------------------------
-Sat Feb 24 09:54:53 UTC 2024 - Simon Lees <sflees@suse.de>
-
-- Update to version 0.43.2
-  + Highlights include:
-    * mmx: use xmmintrin.h if building with SSE2
-    * implement r8g8b8 sRGB (without alpha)
-    * Build system swapped to Meson
-  + Various other fixes
-- Add meson BuildRequires and replace configure/make/make_install
-  macros with respective meson/meson_build/meson_install, following
-  upstreams switch to meson.
-- Add cmake and pkgconfig(gtk+-3.0) BuildRequires: new
-  depdendencies.
-
 -------------------------------------------------------------------
 Fri Nov  4 17:12:49 UTC 2022 - Michael Gorse <mgorse@suse.com>
 
 - Update to version 0.42.2 (boo#1205033 CVE-2022-44638):
   + This version contains a fix for a heap overflow.
-  + Drop upstream merged pixman-CVE-2022-44638.patch
 - Update URL, and tweak source URI.
 
--------------------------------------------------------------------
-Fri Nov  4 16:18:12 UTC 2022 - Michael Gorse <mgorse@suse.com>
-
-- Add pixman-CVE-2022-44638.patch: avoid an integer overflow
-  (boo#1205033 CVE-2022-44638).
-
 -------------------------------------------------------------------
 Mon Apr 20 07:11:07 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 

pixman.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pixman
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           pixman
-Version:        0.43.4
+Version:        0.42.2
 Release:        0
 Summary:        Pixel manipulation library
 License:        MIT
@@ -25,7 +25,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://gitlab.freedesktop.org/pixman/pixman
 Source:         https://www.cairographics.org/releases/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
-BuildRequires:  meson
+BuildRequires:  pkgconfig
 
 %description
 Pixman is a pixel manipulation library for X and cairo.
@@ -46,47 +46,33 @@ Requires:       libpixman-1-0 = %{version}
 Pixman is a pixel manipulation library for X and cairo.
 
 %prep
-%autosetup -p1
+%setup -q
 
 %build
+#autoreconf -fi
 #
 # For now: disable neon on all ARMv6/7
-#
-%meson \
-%ifnarch %{ix86}
-       -Dmmx="disabled" \
-       -Dsse2="disabled" \
-       -Dssse3="disabled" \
+%configure \
+%ifarch %{arm}
+       --disable-arm-iwmmxt \
+       --disable-arm-neon \
 %endif
-       -Dvmx="disabled" \
-       -Dloongson-mmi="disabled" \
-       -Darm-simd="disabled" \
-       -Dneon="disabled" \
-%ifarch aarch64
-       -Da64-neon="enabled" \
-%else
-       -Da64-neon="disabled" \
-%endif
-       -Diwmmxt="disabled" \
-       -Dmips-dspr2="disabled" \
-       -Ddemos=disabled \
-       -Dlibpng=disabled
-%meson_build
-
-%check
-%ifarch s390x
-%meson_test -t 5
-%else
-%meson_test
+%ifarch ppc64le
+        --disable-vmx \
 %endif
+       --disable-static
+make V=1 %{?_smp_mflags}
 
 %install
-%meson_install
+%make_install
+rm %{buildroot}%{_libdir}/libpixman-1.la
 
-%ldconfig_scriptlets -n libpixman-1-0
+%post -n libpixman-1-0 -p /sbin/ldconfig
+%postun -n libpixman-1-0 -p /sbin/ldconfig
 
 %files -n libpixman-1-0
 %license COPYING
+
 %{_libdir}/libpixman-1.so.*
 
 %files -n libpixman-1-0-devel