From 0ed09c31b365275931a7319ffe1588e1108f638c Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Mon, 20 Apr 2020 14:29:18 +0200
Subject: pixman: version bump 0.38.0 -> 0.40.0

- version bump
- switch to meson build

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Message-Id: <20200420122918.23438-1-l.stach@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 rules/pixman.make | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'rules/pixman.make')

diff --git a/rules/pixman.make b/rules/pixman.make
index 64bf38c75..d250544b8 100644
--- a/rules/pixman.make
+++ b/rules/pixman.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman
 #
 # Paths and names
 #
-PIXMAN_VERSION	:= 0.38.0
-PIXMAN_MD5	:= 04ecad28edcc14e7eb5f7ed6df29c7a0
+PIXMAN_VERSION	:= 0.40.0
+PIXMAN_MD5	:= ee642c14f4f18934246c57a440da9ca2
 PIXMAN		:= pixman-$(PIXMAN_VERSION)
-PIXMAN_SUFFIX	:= tar.bz2
+PIXMAN_SUFFIX	:= tar.xz
 PIXMAN_URL	:= $(call ptx/mirror, XORG, individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX))
 PIXMAN_SOURCE	:= $(SRCDIR)/$(PIXMAN).$(PIXMAN_SUFFIX)
 PIXMAN_DIR	:= $(BUILDDIR)/$(PIXMAN)
@@ -28,29 +28,27 @@ PIXMAN_LICENSE	:= MIT
 # ----------------------------------------------------------------------------
 
 #
-# autoconf
+# meson
 #
-PIXMAN_CONF_TOOL	:= autoconf
+PIXMAN_CONF_TOOL	:= meson
 PIXMAN_CONF_OPT		:= \
-	$(CROSS_AUTOCONF_USR) \
-	--disable-static \
-	--disable-openmp \
-	--disable-loongson-mmi \
-	--$(call ptx/endis, PTXCONF_ARCH_X86)-mmx \
-	--$(call ptx/endis, PTXCONF_ARCH_X86)-sse2 \
-	--$(call ptx/endis, PTXCONF_ARCH_X86)-ssse3 \
-	--disable-vmx \
-	--$(call ptx/endis, PTXCONF_ARCH_ARM_V6)-arm-simd \
-	--$(call ptx/endis, PTXCONF_ARCH_ARM_NEON)-arm-neon \
-	--disable-arm-iwmmxt \
-	--disable-arm-iwmmxt2 \
-	--disable-mips-dspr2 \
-	--enable-gcc-inline-asm \
-	--disable-static-testprogs \
-	--disable-timers \
-	--disable-gnuplot \
-	--disable-gtk \
-	--disable-libpng
+	$(CROSS_MESON_USR) \
+	-Darm-simd=$(call ptx/endis, PTXCONF_ARCH_ARM_V6)d \
+	-Dgnu-inline-asm=disabled \
+	-Dgnuplot=false \
+	-Dgtk=disabled \
+	-Diwmmxt=disabled \
+	-Diwmmxt2=false \
+	-Dlibpng=disabled \
+	-Dloongson-mmi=disabled \
+	-Dmips-dspr2=disabled \
+	-Dmmx=$(call ptx/endis, PTXCONF_ARCH_X86)d \
+	-Dneon=$(call ptx/endis, PTXCONF_ARCH_ARM_NEON)d \
+	-Dopenmp=disabled \
+	-Dsse2=$(call ptx/endis, PTXCONF_ARCH_X86)d \
+	-Dssse3=$(call ptx/endis, PTXCONF_ARCH_X86)d \
+	-Dtimers=false \
+	-Dvmx=disabled
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
cgit v1.2.3