From 237bc78dc45824cc0980c50b5ee4c536051920de586a35699bc121faa2b7eac8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 19 Mar 2024 13:33:25 +0000
Subject: [PATCH] Accepting request 1159280 from GNOME:Next

GNOME 46

OBS-URL: https://build.opensuse.org/request/show/1159280
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pixman?expand=0&rev=107
---
 pixman-0.42.2.tar.gz |  3 ---
 pixman-0.43.2.tar.gz |  3 +++
 pixman.changes       | 33 +++++++++++++++++++++++++++++++++
 pixman.spec          | 44 +++++++++++++++++++++++++++-----------------
 4 files changed, 63 insertions(+), 20 deletions(-)
 delete mode 100644 pixman-0.42.2.tar.gz
 create mode 100644 pixman-0.43.2.tar.gz

diff --git a/pixman-0.42.2.tar.gz b/pixman-0.42.2.tar.gz
deleted file mode 100644
index 6b655ba..0000000
--- a/pixman-0.42.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
-size 959669
diff --git a/pixman-0.43.2.tar.gz b/pixman-0.43.2.tar.gz
new file mode 100644
index 0000000..1472eb7
--- /dev/null
+++ b/pixman-0.43.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea79297e5418fb528d0466e8b5b91d1be88857fa3706f49777b2925a72ae9924
+size 793826
diff --git a/pixman.changes b/pixman.changes
index 6a0e52f..dd83a07 100644
--- a/pixman.changes
+++ b/pixman.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+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>
 
diff --git a/pixman.spec b/pixman.spec
index 00f61a3..426073f 100644
--- a/pixman.spec
+++ b/pixman.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pixman
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 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.42.2
+Version:        0.43.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:  pkgconfig
+BuildRequires:  meson
 
 %description
 Pixman is a pixel manipulation library for X and cairo.
@@ -49,30 +49,40 @@ Pixman is a pixel manipulation library for X and cairo.
 %setup -q
 
 %build
-#autoreconf -fi
 #
 # For now: disable neon on all ARMv6/7
-%configure \
+#
+%meson \
+%ifnarch %{ix86}
+       -Dmmx="disabled" \
+       -Dsse2="disabled" \
+       -Dssse3="disabled" \
+%endif
+       -Dvmx="disabled" \
+       -Dloongson-mmi="disabled" \
+       -Darm-simd="disabled" \
+       -Dneon="disabled" \
 %ifarch %{arm}
-       --disable-arm-iwmmxt \
-       --disable-arm-neon \
+       -Da64-neon="enabled" \
+%else
+       -Da64-neon="disabled" \
 %endif
-%ifarch ppc64le
-        --disable-vmx \
-%endif
-       --disable-static
-make V=1 %{?_smp_mflags}
+       -Diwmmxt="disabled" \
+       -Dmips-dspr2="disabled" \
+       -Ddemos=disabled \
+       -Dlibpng=disabled
+%meson_build
 
 %install
-%make_install
-rm %{buildroot}%{_libdir}/libpixman-1.la
+%meson_install
 
-%post -n libpixman-1-0 -p /sbin/ldconfig
-%postun -n libpixman-1-0 -p /sbin/ldconfig
+%check
+%meson_test
+
+%ldconfig_scriptlets -n libpixman-1-0
 
 %files -n libpixman-1-0
 %license COPYING
-
 %{_libdir}/libpixman-1.so.*
 
 %files -n libpixman-1-0-devel