From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jQVY6-00039z-AW for ptxdist@pengutronix.de; Mon, 20 Apr 2020 14:29:18 +0200 From: Lucas Stach Date: Mon, 20 Apr 2020 14:29:18 +0200 Message-Id: <20200420122918.23438-1-l.stach@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH] pixman: version bump 0.38.0 -> 0.40.0 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de - version bump - switch to meson build Signed-off-by: Lucas Stach --- rules/pixman.in | 1 + rules/pixman.make | 46 ++++++++++++++++++++++------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/rules/pixman.in b/rules/pixman.in index ad3e4681c24c..afdd8888aa79 100644 --- a/rules/pixman.in +++ b/rules/pixman.in @@ -5,6 +5,7 @@ config PIXMAN prompt "pixman" select LIBC_M select GCCLIBS_GCC_S + select HOST_MESON help Pixman contains lowlevel pixel manipulation routines and is used by both xorg and cairo. diff --git a/rules/pixman.make b/rules/pixman.make index 64bf38c75e0f..d250544b8f40 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 -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de