Thanks, applied as d33358382bd459d1da003f6f794a176c4a5e114f. Michael
[sent from post-receive hook] On Wed, 10 Jan 2024 17:57:44 +0100, Philipp Zabel <p.za...@pengutronix.de> wrote: > https://lists.x.org/archives/xorg-announce/2024-January/003439.html > > Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> > Message-Id: <20240105101105.1050592-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/host-pixman.in b/rules/host-pixman.in > index f4f368e5e13b..d4fcbb595ceb 100644 > --- a/rules/host-pixman.in > +++ b/rules/host-pixman.in > @@ -3,3 +3,4 @@ > config HOST_PIXMAN > tristate > default y if ALLYES > + select HOST_MESON > diff --git a/rules/host-pixman.make b/rules/host-pixman.make > index cdd14accd44c..8017e88fe104 100644 > --- a/rules/host-pixman.make > +++ b/rules/host-pixman.make > @@ -18,16 +18,28 @@ HOST_PACKAGES-$(PTXCONF_HOST_PIXMAN) += host-pixman > # > # autoconf > # > -HOST_PIXMAN_CONF_TOOL := autoconf > +HOST_PIXMAN_CONF_TOOL := meson > HOST_PIXMAN_CONF_OPT := \ > - $(HOST_AUTOCONF) \ > - --disable-static \ > - --disable-openmp \ > - --disable-loongson-mmi \ > - --enable-gcc-inline-asm \ > - --disable-static-testprogs \ > - --disable-timers \ > - --disable-gtk \ > - --disable-libpng > + $(HOST_MESON_OPT) \ > + -Da64-neon=disabled \ > + -Darm-simd=disabled \ > + -Dcpu-features-path= \ > + -Ddemos=disabled \ > + -Dgnu-inline-asm=disabled \ > + -Dgnuplot=false \ > + -Dgtk=disabled \ > + -Diwmmxt=disabled \ > + -Diwmmxt2=false \ > + -Dlibpng=disabled \ > + -Dloongson-mmi=disabled \ > + -Dmips-dspr2=disabled \ > + -Dmmx=disabled \ > + -Dneon=disabled \ > + -Dopenmp=disabled \ > + -Dsse2=enabled \ > + -Dssse3=disabled \ > + -Dtests=disabled \ > + -Dtimers=false \ > + -Dvmx=disabled > > # vim: syntax=make > diff --git a/rules/pixman.make b/rules/pixman.make > index 3174895c5e73..f9084d3abaa0 100644 > --- a/rules/pixman.make > +++ b/rules/pixman.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman > # > # Paths and names > # > -PIXMAN_VERSION := 0.42.2 > -PIXMAN_MD5 := dec5dd93a3e95c80162515b7209ef0d5 > +PIXMAN_VERSION := 0.43.0 > +PIXMAN_MD5 := 312210ec53ad070abd0b43a836807f14 > PIXMAN := pixman-$(PIXMAN_VERSION) > PIXMAN_SUFFIX := tar.xz > PIXMAN_URL := $(call ptx/mirror, XORG, > individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)) > @@ -33,7 +33,10 @@ PIXMAN_LICENSE := MIT > PIXMAN_CONF_TOOL := meson > PIXMAN_CONF_OPT := \ > $(CROSS_MESON_USR) \ > + -Da64-neon=$(call ptx/endis, PTXCONF_ARCH_ARM64)d \ > -Darm-simd=$(call ptx/endis, PTXCONF_ARCH_ARM_V6)d \ > + -Dcpu-features-path= \ > + -Ddemos=disabled \ > -Dgnu-inline-asm=disabled \ > -Dgnuplot=false \ > -Dgtk=disabled \ > @@ -47,9 +50,9 @@ PIXMAN_CONF_OPT := \ > -Dopenmp=disabled \ > -Dsse2=$(call ptx/endis, PTXCONF_ARCH_X86)d \ > -Dssse3=$(call ptx/endis, PTXCONF_ARCH_X86)d \ > + -Dtests=disabled \ > -Dtimers=false \ > - -Dvmx=disabled \ > - -Dtests=disabled > + -Dvmx=disabled > > # > ---------------------------------------------------------------------------- > # Target-Install
