[ptxdist] [PATCH] libdrm: version bump 2.4.89 -> 2.4.90

[ptxdist] [PATCH] libdrm: version bump 2.4.89 -> 2.4.90

[Philipp Zabel]

Switch to Meson build system.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/libdrm.in   |  1 +
 rules/libdrm.make | 40 +++++++++++++++++-----------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/rules/libdrm.in b/rules/libdrm.in
index cdd79f4aa..deea0d21b 100644
--- a/rules/libdrm.in
+++ b/rules/libdrm.in
@@ -3,6 +3,7 @@
 menuconfig LIBDRM
 	tristate
 	prompt "libdrm                        "
+	select HOST_MESON
 	select LIBC_RT
 	select UDEV
 	select UDEV_LIBUDEV
diff --git a/rules/libdrm.make b/rules/libdrm.make
index a651e2102..b6fbc974c 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
 #
 # Paths and names
 #
-LIBDRM_VERSION	:= 2.4.89
-LIBDRM_MD5	:= 4379fa4e3868feb5d5319c854a8280f8
+LIBDRM_VERSION	:= 2.4.90
+LIBDRM_MD5	:= f417488bc6450849b9d571bc2938d194
 LIBDRM		:= libdrm-$(LIBDRM_VERSION)
 LIBDRM_SUFFIX	:= tar.gz
 LIBDRM_URL	:= http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX)
@@ -43,37 +43,31 @@ LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_NOUVEAU) += nouveau
 LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno
 LIBDRM_BACKENDS- += freedreno-kgsl
 LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_VMWGFX) += vmwgfx
-LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_OMAP) += omap-experimental-api
-LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_OMAP) += omap
-LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_EXYNOS) += exynos-experimental-api
-LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_EXYNOS) += exynos
-LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_TEGRA) += tegra-experimental-api
-LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_TEGRA) += tegra
+LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_OMAP) += omap
+LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_EXYNOS) += exynos
+LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_TEGRA) += tegra
 LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_VC4) += vc4
 # vc4 is a headers only backend
-LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv-experimental-api
-LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv
+LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv
 
 LIBDRM_BACKENDSC-y += $(LIBDRM_BACKENDS-y)
 LIBDRM_BACKENDSC- += $(LIBDRM_BACKENDS-)
 LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y)
 
 #
-# autoconf
+# meson
 #
-LIBDRM_CONF_TOOL := autoconf
+LIBDRM_CONF_TOOL := meson
 LIBDRM_CONF_OPT := \
-	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--enable-udev \
-	--$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \
-	$(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \
-	$(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \
-	--$(call ptx/endis, PTXCONF_LIBDRM_TESTS)-install-test-programs \
-	--disable-cairo-tests \
-	--disable-manpages \
-	--disable-valgrind \
-	--without-xsltproc
+	$(CROSS_MESON_USR) \
+	-Dlibkms=$(call ptx/truefalse, PTXCONF_LIBDRM_LIBKMS) \
+	$(patsubst %,-D%=true,$(LIBDRM_BACKENDSC-y)) \
+	$(patsubst %,-D%=false,$(LIBDRM_BACKENDSC-)) \
+	-Dcairo-tests=false \
+	-Dmanpages=false \
+	-Dvalgrind=false \
+	-Dinstall-test-programs=$(call ptx/truefalse, PTXCONF_LIBDRM_TESTS) \
+	-Dudev=true
 
 
 # ----------------------------------------------------------------------------
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de