* [ptxdist] [PATCH] pixman: version bump 0.38.0 -> 0.40.0
@ 2020-04-20 12:29 Lucas Stach
2020-04-22 5:52 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2020-04-20 12:29 UTC (permalink / raw)
To: ptxdist
- version bump
- switch to meson build
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] pixman: version bump 0.38.0 -> 0.40.0
2020-04-20 12:29 [ptxdist] [PATCH] pixman: version bump 0.38.0 -> 0.40.0 Lucas Stach
@ 2020-04-22 5:52 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2020-04-22 5:52 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as 0ed09c31b365275931a7319ffe1588e1108f638c.
Michael
[sent from post-receive hook]
On Wed, 22 Apr 2020 07:52:17 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> - 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>
>
> 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-22 5:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-20 12:29 [ptxdist] [PATCH] pixman: version bump 0.38.0 -> 0.40.0 Lucas Stach
2020-04-22 5:52 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox