Signed-off-by: Philipp Zabel <[email protected]>
---
rules/xorgproto.in | 1 +
rules/xorgproto.make | 16 +++++-----------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/rules/xorgproto.in b/rules/xorgproto.in
index 31b3eade451c..a97d5e9dc02a 100644
--- a/rules/xorgproto.in
+++ b/rules/xorgproto.in
@@ -2,4 +2,5 @@
config XORGPROTO
tristate
+ select HOST_MESON
default y if ALLYES
diff --git a/rules/xorgproto.make b/rules/xorgproto.make
index c25c05674ec9..e26cd19816fd 100644
--- a/rules/xorgproto.make
+++ b/rules/xorgproto.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XORGPROTO) += xorgproto
#
# Paths and names
#
-XORGPROTO_VERSION := 2019.1
-XORGPROTO_MD5 := 802ccb9e977ba3cf94ba798ddb2898a4
+XORGPROTO_VERSION := 2021.5
+XORGPROTO_MD5 := bff0c9a6a060ecde954e255a2d1d9a22
XORGPROTO := xorgproto-$(XORGPROTO_VERSION)
XORGPROTO_SUFFIX := tar.bz2
XORGPROTO_URL := $(call ptx/mirror, XORG,
individual/proto/$(XORGPROTO).$(XORGPROTO_SUFFIX))
@@ -30,15 +30,9 @@ XORGPROTO_LICENSE := X11 AND MIT AND BSD-2-Clause
#
# autoconf
#
-XORGPROTO_CONF_TOOL := autoconf
+XORGPROTO_CONF_TOOL := meson
XORGPROTO_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-selective-werror \
- --disable-strict-compilation \
- --enable-specs \
- --enable-legacy \
- --without-xmlto \
- --without-fop \
- --without-xsltproc
+ $(CROSS_MESON_USR) \
+ -Dlegacy=true
# vim: syntax=make
--
2.30.2
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
