diff options
| -rw-r--r-- | rules/host-mesalib.make | 11 | ||||
| -rw-r--r-- | rules/mesalib.in | 4 | ||||
| -rw-r--r-- | rules/mesalib.make | 31 |
3 files changed, 19 insertions, 27 deletions
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index 721fa677d..671a62a81 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -21,6 +21,7 @@ HOST_MESALIB_CONF_ENV := \ $(HOST_ENV) \ ac_cv_prog_PYTHON2=$(PTXDIST_TOPDIR)/bin/python +HOST_MESALIB_BUILD_OOT := YES HOST_MESALIB_CONF_TOOL := autoconf HOST_MESALIB_CONF_OPT := \ $(HOST_AUTOCONF) \ @@ -34,7 +35,6 @@ HOST_MESALIB_CONF_OPT := \ --enable-opengl \ --disable-gles1 \ --disable-gles2 \ - --disable-openvg \ --disable-dri \ --disable-dri3 \ --disable-glx \ @@ -43,28 +43,31 @@ HOST_MESALIB_CONF_OPT := \ --disable-egl \ --disable-xa \ --disable-gbm \ + --disable-nine \ --disable-xvmc \ --disable-vdpau \ + --disable-va \ --disable-omx \ --disable-opencl \ --disable-opencl-icd \ --disable-xlib-glx \ - --disable-gallium-egl \ - --disable-gallium-gbm \ --disable-r600-llvm-compiler \ --disable-gallium-tests \ + --disable-shader-cache \ --disable-shared-glapi \ --disable-sysfs \ + --disable-glx-read-only-text \ --disable-driglx-direct \ --disable-glx-tls \ --disable-llvm-shared-libs \ --disable-gallium-llvm \ + --with-sha1= \ --with-gallium-drivers= \ --with-dri-drivers= $(STATEDIR)/host-mesalib.install: @$(call targetinfo) - install -D -m755 $(HOST_MESALIB_DIR)/src/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/bin/mesa/glsl_compiler + install -D -m755 $(HOST_MESALIB_DIR)-build/src/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/bin/mesa/glsl_compiler @$(call touch) # vim: syntax=make diff --git a/rules/mesalib.in b/rules/mesalib.in index d7975dbf9..2acf69d51 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -110,10 +110,6 @@ config MESALIB_GLES2 select MESALIB_OPENGL prompt "OpenGL ES2" -config MESALIB_OPENVG - bool - prompt "OpenVG" - config MESALIB_EGL bool select MESALIB_UDEV diff --git a/rules/mesalib.make b/rules/mesalib.make index 1da6ff558..0852da7f2 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -19,11 +19,11 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION := 10.3.3 -MESALIB_MD5 := 4fe6fc9e28fb2a88a2387e5d3a49ae8b -MESALIB := MesaLib-$(MESALIB_VERSION) -MESALIB_SUFFIX := tar.bz2 -MESALIB_URL := ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/$(subst .0,,$(MESALIB_VERSION))/$(MESALIB).$(MESALIB_SUFFIX) +MESALIB_VERSION := 11.1.1 +MESALIB_MD5 := 1043dfb907beecb2a761272455960427 +MESALIB := mesa-$(MESALIB_VERSION) +MESALIB_SUFFIX := tar.xz +MESALIB_URL := ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX) MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX) MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION) MESALIB_LICENSE := MIT @@ -65,23 +65,12 @@ MESALIB_DRI_LIBS-y += \ $(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y)) \ $(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y)) -ifeq ($(MESALIB_GALLIUM_DRIVERS-y),) -MESALIB_GALLIUM_EGL := -MESALIB_GALLIUM_GBM := -else -MESALIB_GALLIUM_EGL := $(PTXCONF_MESALIB_EGL) -MESALIB_GALLIUM_GBM := $(PTXCONF_MESALIB_GBM) -endif - MESALIB_LIBS-y := libglapi MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM MESALIB_LIBS-$(PTXCONF_MESALIB_GLES2) += libGLESv2 -MESALIB_LIBS-$(PTXCONF_MESALIB_OPENVG) += libOpenVG MESALIB_LIBS-$(PTXCONF_MESALIB_EGL) += libEGL -MESALIB_LIBS-$(MESALIB_GALLIUM_EGL) += egl/egl_gallium MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm -MESALIB_LIBS-$(MESALIB_GALLIUM_GBM) += gbm/gbm_gallium_drm MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11 MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_DRM) += drm @@ -89,9 +78,11 @@ MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland MESALIB_LIBS-$(PTXCONF_MESALIB_EGL_WAYLAND) += libwayland-egl +MESALIB_BUILD_OOT := YES MESALIB_CONF_TOOL := autoconf MESALIB_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-largefile \ --disable-static \ --enable-shared \ --disable-debug \ @@ -102,7 +93,6 @@ MESALIB_CONF_OPT := \ --$(call ptx/endis, PTXCONF_MESALIB_OPENGL)-opengl \ --$(call ptx/endis, PTXCONF_MESALIB_GLES1)-gles1 \ --$(call ptx/endis, PTXCONF_MESALIB_GLES2)-gles2 \ - --$(call ptx/endis, PTXCONF_MESALIB_OPENVG)-openvg \ --enable-dri \ --disable-dri3 \ --$(call ptx/endis, PTXCONF_MESALIB_GLX)-glx \ @@ -111,22 +101,25 @@ MESALIB_CONF_OPT := \ --$(call ptx/endis, PTXCONF_MESALIB_EGL)-egl \ --disable-xa \ --$(call ptx/endis, PTXCONF_MESALIB_GBM)-gbm \ + --disable-nine \ --disable-xvmc \ --disable-vdpau \ + --disable-va \ --disable-omx \ --disable-opencl \ --disable-opencl-icd \ --disable-xlib-glx \ - --$(call ptx/endis, MESALIB_GALLIUM_EGL)-gallium-egl \ - --$(call ptx/endis, MESALIB_GALLIUM_GBM)-gallium-gbm \ --disable-r600-llvm-compiler \ --disable-gallium-tests \ + --disable-shader-cache \ --enable-shared-glapi \ --disable-sysfs \ + --disable-glx-read-only-text \ --enable-driglx-direct \ --enable-glx-tls \ --disable-gallium-llvm \ --enable-llvm-shared-libs \ + --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)) \ |