summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2016-07-19 16:41:07 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-07-20 08:59:36 +0200
commitcb5d1bf1c5debd95b02fca1f79d7c5e7755235db (patch)
treed2fe2d73d12bc4ba40301f917b9dc7935228dc02
parent352a5746606edb79b1d04a8006b55eac005ece9b (diff)
downloadptxdist-cb5d1bf1c5debd95b02fca1f79d7c5e7755235db.tar.gz
mesalib: version bump 11.2.2 -> 12.0.1
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-mesalib.in1
-rw-r--r--rules/host-mesalib.make6
-rw-r--r--rules/mesalib.make10
3 files changed, 9 insertions, 8 deletions
diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
index 1e78ad4..1bf56ae 100644
--- a/rules/host-mesalib.in
+++ b/rules/host-mesalib.in
@@ -6,3 +6,4 @@ config HOST_MESALIB
select HOST_MAKEDEPEND
select HOST_SYSTEM_PYTHON
select HOST_SYSTEM_PYTHON_XML2
+ select HOST_LIBPTHREAD_STUBS
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 4115dfc..3a60c10 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -50,8 +50,6 @@ HOST_MESALIB_CONF_OPT := \
--disable-omx \
--disable-opencl \
--disable-opencl-icd \
- --disable-xlib-glx \
- --disable-r600-llvm-compiler \
--disable-gallium-tests \
--disable-shader-cache \
--disable-shared-glapi \
@@ -61,9 +59,11 @@ HOST_MESALIB_CONF_OPT := \
--disable-glx-tls \
--disable-llvm-shared-libs \
--disable-gallium-llvm \
+ --disable-libglvnd \
--with-sha1= \
--with-gallium-drivers= \
- --with-dri-drivers=
+ --with-dri-drivers= \
+ --without-vulkan-drivers
$(STATEDIR)/host-mesalib.install:
@$(call targetinfo)
diff --git a/rules/mesalib.make b/rules/mesalib.make
index c3ded89..1788f8a 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 11.2.2
-MESALIB_MD5 := e0ec73f7273662a74366f0d76dd19ac3
+MESALIB_VERSION := 12.0.1
+MESALIB_MD5 := 972fd5ad5a63aeabf173fb9adefc6522
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX)
@@ -28,7 +28,7 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
MESALIB_LICENSE := MIT
MESALIB_LICENSE_FILES := \
- file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de
+ file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5
# ----------------------------------------------------------------------------
# Prepare
@@ -108,8 +108,6 @@ MESALIB_CONF_OPT := \
--disable-omx \
--disable-opencl \
--disable-opencl-icd \
- --disable-xlib-glx \
- --disable-r600-llvm-compiler \
--disable-gallium-tests \
--disable-shader-cache \
--enable-shared-glapi \
@@ -119,10 +117,12 @@ MESALIB_CONF_OPT := \
--enable-glx-tls \
--disable-gallium-llvm \
--enable-llvm-shared-libs \
+ --disable-libglvnd \
--with-sha1= \
--with-gallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
--with-dri-driverdir=/usr/lib/dri \
--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
+ --without-vulkan-drivers \
--with-egl-platforms="$(MESALIBS_EGL_PLATFORMS-y)"
# ----------------------------------------------------------------------------