diff options
| -rw-r--r-- | rules/host-mesalib.in | 1 | ||||
| -rw-r--r-- | rules/mesalib.in | 14 | ||||
| -rw-r--r-- | rules/mesalib.make | 19 |
3 files changed, 26 insertions, 8 deletions
diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in index 29a6a22a2..7c7c224f8 100644 --- a/rules/host-mesalib.in +++ b/rules/host-mesalib.in @@ -8,3 +8,4 @@ config HOST_MESALIB select HOST_SYSTEM_PYTHON_XML2 select HOST_SYSTEM_PYTHON_MAKO select HOST_LIBPTHREAD_STUBS + select HOST_ZLIB diff --git a/rules/mesalib.in b/rules/mesalib.in index a5faa5c39..2f60ce75d 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -21,6 +21,7 @@ menuconfig MESALIB select LIBDRM_NOUVEAU if MESALIB_DRI_NOUVEAU || MESALIB_DRI_NOUVEAU_VIEUX select LIBDRM_FREEDRENO if MESALIB_DRI_FREEDRENO select LIBDRM_ETNAVIV if MESALIB_DRI_ETNAVIV + select LM_SENSORS if MESALIB_LMSENSORS select XORG_PROTO_DRI2 if MESALIB_GLX select XORG_LIB_X11 if MESALIB_GLX select XORG_LIB_XEXT if MESALIB_GLX @@ -29,6 +30,7 @@ menuconfig MESALIB select XORG_LIB_XFIXES if MESALIB_GLX select XORG_PROTO_GL if MESALIB_GLX select EXPAT + select ZLIB help Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL. See the project homepage for @@ -151,5 +153,17 @@ config MESALIB_EGL_WAYLAND prompt "Wayland" endif + +comment "Gallium HUD options" + +config MESALIB_EXTENDED_HUD + prompt "Extended Gallium HUD options" + bool + +config MESALIB_LMSENSORS + prompt "LMsensors support" + depends on MESALIB_EXTENDED_HUD + bool + endif diff --git a/rules/mesalib.make b/rules/mesalib.make index 1f49c8267..5d0a62ad3 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION := 17.0.4 -MESALIB_MD5 := 4a16cfc1c6d034cc17314b866eada628 +MESALIB_VERSION := 17.1.1 +MESALIB_MD5 := a4844bc6052578574f9629458bcbb749 MESALIB := mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL := \ @@ -30,7 +30,7 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX) MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION) MESALIB_LICENSE := MIT MESALIB_LICENSE_FILES := \ - file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5 + file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4 # ---------------------------------------------------------------------------- # Prepare @@ -92,18 +92,18 @@ MESALIB_CONF_OPT := \ --disable-pwr8 \ --disable-debug \ --disable-profile \ - --disable-libglvnd \ - --disable-mangling \ + --disable-sanitize \ --disable-texture-float \ --disable-asm \ --disable-selinux \ --disable-llvm-shared-libs \ + --disable-libunwind \ --$(call ptx/endis, PTXCONF_MESALIB_OPENGL)-opengl \ --$(call ptx/endis, PTXCONF_MESALIB_GLES1)-gles1 \ --$(call ptx/endis, PTXCONF_MESALIB_GLES2)-gles2 \ --enable-dri \ - --disable-gallium-extra-hud \ - --disable-lmsensors \ + --$(call ptx/endis, PTXCONF_MESALIB_EXTENDED_HUD)-gallium-extra-hud \ + --$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)-lmsensors \ --disable-dri3 \ --$(call ptx/endis, PTXCONF_MESALIB_GLX)-glx \ --disable-osmesa \ @@ -119,17 +119,20 @@ MESALIB_CONF_OPT := \ --disable-opencl \ --disable-opencl-icd \ --disable-gallium-tests \ + --disable-libglvnd \ + --disable-mangling \ --enable-shared-glapi \ --enable-driglx-direct \ --enable-glx-tls \ --disable-glx-read-only-text \ --disable-gallium-llvm \ + --disable-llvm \ --disable-valgrind \ --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)" + --with-platforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) # ---------------------------------------------------------------------------- # Compile |