summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2018-09-10 10:30:14 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-09-12 10:41:40 +0200
commit3afb5c2a51a1a801e01846365a2220c46c51b104 (patch)
tree9e5f0ff30cfd0af778f24d0b7b9fccf9634db509
parentd4f9f848cc4d614255b34ba54b062b742eb42e5a (diff)
downloadptxdist-3afb5c2a51a1a801e01846365a2220c46c51b104.tar.gz
ptxdist-3afb5c2a51a1a801e01846365a2220c46c51b104.tar.xz
mesalib: version bump 18.1.7 -> 18.2.0
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-mesalib.make1
-rw-r--r--rules/mesalib.in15
-rw-r--r--rules/mesalib.make8
3 files changed, 12 insertions, 12 deletions
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 786973b64..872d0fcba 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -29,7 +29,6 @@ HOST_MESALIB_CONF_OPT := \
--disable-shared \
--disable-debug \
--disable-mangling \
- --disable-texture-float \
--disable-asm \
--disable-selinux \
--enable-opengl \
diff --git a/rules/mesalib.in b/rules/mesalib.in
index f8e67701e..d758c8f96 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -23,11 +23,12 @@ menuconfig MESALIB
select LIBDRM_ETNAVIV if MESALIB_DRI_ETNAVIV
select LM_SENSORS if MESALIB_LMSENSORS
select XORGPROTO if MESALIB_GLX
- select XORG_LIB_X11 if MESALIB_GLX
+ select XORG_LIB_X11 if MESALIB_GLX || MESALIB_EGL_X11 && MESALIB_EGL_DRM
select XORG_LIB_XEXT if MESALIB_GLX
select XORG_LIB_XXF86VM if MESALIB_GLX
select XORG_LIB_XDAMAGE if MESALIB_GLX
select XORG_LIB_XFIXES if MESALIB_GLX
+ select XORG_LIB_XRANDR if MESALIB_EGL_X11 && MESALIB_EGL_DRM
select EXPAT
select ZLIB
help
@@ -99,15 +100,15 @@ config MESALIB_DRI_IMX
depends on MESALIB_DRI_ETNAVIV
prompt "imx"
-config MESALIB_DRI_VC4
- bool
- prompt "vc4"
-
-config MESALIB_DRI_VC5
+config MESALIB_DRI_V3D
bool
# needs v3dv3
depends on BROKEN
- prompt "vc5"
+ prompt "v3d"
+
+config MESALIB_DRI_VC4
+ bool
+ prompt "vc4"
comment "API Support"
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 1dc21c930..44c0bfe72 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 18.1.7
-MESALIB_MD5 := 17d8a7e7ecbe146a7dc439e8b6eb02e9
+MESALIB_VERSION := 18.2.0
+MESALIB_MD5 := 88e1a7f31f259cec69bb76b3cb10c956
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -60,8 +60,8 @@ MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_FREEDRENO)+= freedreno
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETNAVIV) += etnaviv
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IMX) += imx
ifdef PTXCONF_ARCH_ARM
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_V3D) += v3d
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC4) += vc4
-MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC5) += vc5
endif
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST) += swrast
@@ -93,7 +93,6 @@ MESALIB_CONF_OPT := \
--disable-debug \
--disable-profile \
--disable-sanitize \
- --disable-texture-float \
--disable-asm \
--disable-selinux \
--disable-llvm-shared-libs \
@@ -126,6 +125,7 @@ MESALIB_CONF_OPT := \
--enable-driglx-direct \
--enable-glx-tls \
--disable-glx-read-only-text \
+ --disable-xlib-lease \
--disable-gallium-llvm \
--disable-llvm \
--disable-valgrind \