summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/host-libepoxy.in1
-rw-r--r--rules/host-libepoxy.make19
-rw-r--r--rules/libepoxy.in2
-rw-r--r--rules/libepoxy.make22
4 files changed, 18 insertions, 26 deletions
diff --git a/rules/host-libepoxy.in b/rules/host-libepoxy.in
index c79143017..b3627b968 100644
--- a/rules/host-libepoxy.in
+++ b/rules/host-libepoxy.in
@@ -2,4 +2,5 @@
config HOST_LIBEPOXY
tristate
+ select HOST_MESON
default y if ALLYES
diff --git a/rules/host-libepoxy.make b/rules/host-libepoxy.make
index 2cb030cd4..21f735d2c 100644
--- a/rules/host-libepoxy.make
+++ b/rules/host-libepoxy.make
@@ -15,21 +15,16 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBEPOXY) += host-libepoxy
# Prepare
# ----------------------------------------------------------------------------
-HOST_LIBEPOXY_CONF_ENV := \
- $(HOST_ENV) \
- ac_cv_prog_PYTHON=$(SYSTEMPYTHON3)
-
#
# autoconf
#
-HOST_LIBEPOXY_CONF_TOOL := autoconf
+HOST_LIBEPOXY_CONF_TOOL := meson
HOST_LIBEPOXY_CONF_OPT := \
- $(HOST_AUTOCONF) \
- --disable-selective-werror \
- --disable-strict-compilation \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --disable-x11 \
- --disable-glx \
- --disable-egl
+ $(HOST_MESON_OPT) \
+ -Ddocs=false \
+ -Degl=no \
+ -Dglx=no \
+ -Dtests=false \
+ -Dx11=false
# vim: syntax=make
diff --git a/rules/libepoxy.in b/rules/libepoxy.in
index e476f35d2..d9ce96a68 100644
--- a/rules/libepoxy.in
+++ b/rules/libepoxy.in
@@ -2,8 +2,8 @@
config LIBEPOXY
tristate
+ select HOST_MESON
select MESALIB
- select XORG_LIB_X11 if LIBEPOXY_GLX
prompt "libepoxy"
help
FIXME
diff --git a/rules/libepoxy.make b/rules/libepoxy.make
index f97b64a26..b5776ce22 100644
--- a/rules/libepoxy.make
+++ b/rules/libepoxy.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBEPOXY) += libepoxy
#
# Paths and names
#
-LIBEPOXY_VERSION := 1.5.2
-LIBEPOXY_MD5 := 4a6b9e581da229dee74c2263c84b1eca
+LIBEPOXY_VERSION := 1.5.3
+LIBEPOXY_MD5 := e2845de8d2782b2d31c01ae8d7cd4cbb
LIBEPOXY := libepoxy-$(LIBEPOXY_VERSION)
LIBEPOXY_SUFFIX := tar.xz
LIBEPOXY_URL := https://github.com/anholt/libepoxy/releases/download/$(LIBEPOXY_VERSION)/$(LIBEPOXY).$(LIBEPOXY_SUFFIX)
@@ -27,21 +27,17 @@ LIBEPOXY_LICENSE := MIT
# Prepare
# ----------------------------------------------------------------------------
-LIBEPOXY_CONF_ENV = \
- $(CROSS_ENV) \
- ac_cv_prog_PYTHON=$(SYSTEMPYTHON3)
#
# autoconf
#
-LIBEPOXY_CONF_TOOL := autoconf
+LIBEPOXY_CONF_TOOL := meson
LIBEPOXY_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-selective-werror \
- --disable-strict-compilation \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --$(call ptx/endis, PTXCONF_LIBEPOXY_GLX)-x11 \
- --$(call ptx/endis, PTXCONF_LIBEPOXY_GLX)-glx \
- --$(call ptx/endis, PTXCONF_LIBEPOXY_EGL)-egl
+ $(CROSS_MESON_USR) \
+ -Ddocs=false \
+ -Degl=$(call ptx/yesno,PTXCONF_LIBEPOXY_EGL) \
+ -Dglx=$(call ptx/yesno,PTXCONF_LIBEPOXY_GLX) \
+ -Dtests=false \
+ -Dx11=$(call ptx/truefalse,PTXCONF_LIBEPOXY_GLX)
# ----------------------------------------------------------------------------
# Target-Install