mesalib: version bump 7.8.2 -> 8.0.3

demos are now a separate package

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

13 files changed, 354 insertions, 593 deletions

diff --git a/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch b/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch
deleted file mode 100644
index fc6ae0902..000000000
--- a/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 9 Jul 2010 13:35:14 +0200
-Subject: [PATCH] add linker option to mklib call
-
-When cross compiling, we have to handle the (cross-)linker to the mklib
-call.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/gallium/winsys/drm/i965/xorg/Makefile  |    2 +-
- src/gallium/winsys/drm/intel/xorg/Makefile |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/winsys/drm/i965/xorg/Makefile b/src/gallium/winsys/drm/i965/xorg/Makefile
-index c25726b..3e00035 100644
---- a/src/gallium/winsys/drm/i965/xorg/Makefile
-+++ b/src/gallium/winsys/drm/i965/xorg/Makefile
-@@ -35,7 +35,7 @@ TARGET_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(TARGET)
- all default: $(TARGET) $(TARGET_STAGING)
- 
- $(TARGET): $(OBJECTS) Makefile $(GALLIUMDIR)/state_trackers/xorg/libxorgtracker.a $(LIBS)
--	$(TOP)/bin/mklib -noprefix -o $@ \
-+	$(TOP)/bin/mklib -noprefix -linker '$(CC)' -o $@ \
- 	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
- 
- $(TOP)/$(LIB_DIR)/gallium:
-diff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/gallium/winsys/drm/intel/xorg/Makefile
-index 14c2462..ad44715 100644
---- a/src/gallium/winsys/drm/intel/xorg/Makefile
-+++ b/src/gallium/winsys/drm/intel/xorg/Makefile
-@@ -34,7 +34,7 @@ DRIVER_DEFINES = \
- all default: $(TARGET)
- 
- $(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
--	$(TOP)/bin/mklib -noprefix -o $@ \
-+	$(TOP)/bin/mklib -noprefix -linker '$(CC)' -o $@ \
- 	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
- 
- clean:
--- 
-1.7.1
-
diff --git a/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch b/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch
deleted file mode 100644
index 8d9fbf323..000000000
--- a/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 7 Jul 2010 10:58:14 +0200
-Subject: [PATCH] HACK: allow compiling host tools without configure
-
-This patch modifies the Makefiles for the hosttools to allow
-compiling without configure. This way we can avoid
-unnecessary dependencies when only compiling host tools.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/glsl/Makefile      |    4 ++++
- src/glsl/apps/Makefile |    8 ++++++++
- src/glsl/cl/Makefile   |    4 ++++
- src/glsl/pp/Makefile   |    4 ++++
- 4 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/src/glsl/Makefile b/src/glsl/Makefile
-index ca7f2d2..69e980a 100644
---- a/src/glsl/Makefile
-+++ b/src/glsl/Makefile
-@@ -2,7 +2,11 @@
- 
- TOP = ../..
- 
-+ifeq ($(wildcard $(TOP)/configs/current),)
-+include $(TOP)/configs/default
-+else
- include $(TOP)/configs/current
-+endif
- 
- SUBDIRS = pp cl apps
- 
-diff --git a/src/glsl/apps/Makefile b/src/glsl/apps/Makefile
-index 39a0df7..aba16f0 100644
---- a/src/glsl/apps/Makefile
-+++ b/src/glsl/apps/Makefile
-@@ -2,7 +2,11 @@
- 
- TOP = ../../..
- 
-+ifeq ($(wildcard $(TOP)/configs/current),)
-+include $(TOP)/configs/default
-+else
- include $(TOP)/configs/current
-+endif
- 
- LIBS = \
- 	$(TOP)/src/glsl/pp/libglslpp.a \
-@@ -37,6 +41,10 @@ INCLUDES = -I.
- default: $(APPS)
- 
- install:
-+	@for app in $(APPS); do \
-+		echo install -D -m 0755 $$app $(DESTDIR)/bin/mesa/$$app; \
-+		install -D -m 0755 $$app $(DESTDIR)/bin/mesa/$$app; \
-+	done
- 
- clean:
- 	-rm -f $(APPS)
-diff --git a/src/glsl/cl/Makefile b/src/glsl/cl/Makefile
-index 04a52df..209dd7b 100644
---- a/src/glsl/cl/Makefile
-+++ b/src/glsl/cl/Makefile
-@@ -2,7 +2,11 @@
- 
- TOP = ../../..
- 
-+ifeq ($(wildcard $(TOP)/configs/current),)
-+include $(TOP)/configs/default
-+else
- include $(TOP)/configs/current
-+endif
- 
- LIBNAME = glslcl
- 
-diff --git a/src/glsl/pp/Makefile b/src/glsl/pp/Makefile
-index fda1c42..d4ad55c 100644
---- a/src/glsl/pp/Makefile
-+++ b/src/glsl/pp/Makefile
-@@ -2,7 +2,11 @@
- 
- TOP = ../../..
- 
-+ifeq ($(wildcard $(TOP)/configs/current),)
-+include $(TOP)/configs/default
-+else
- include $(TOP)/configs/current
-+endif
- 
- LIBNAME = glslpp
- 
--- 
-1.7.1
-
diff --git a/patches/MesaLib-7.8.2/series b/patches/MesaLib-7.8.2/series
deleted file mode 100644
index 69ee29fbe..000000000
--- a/patches/MesaLib-7.8.2/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-0001-remove-crosscompile-check.patch
-0002-add-linker-option-to-mklib-call.patch
-0003-HACK-allow-compiling-host-tools-without-configure.patch
-# 57f02633d9553fe7ee434b1e860f6099  - git-ptx-patches magic
diff --git a/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch b/patches/MesaLib-8.0.3/0001-remove-crosscompile-check.patch
index 4a7e170c9..a874846c8 100644
--- a/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch
+++ b/patches/MesaLib-8.0.3/0001-remove-crosscompile-check.patch
@@ -10,13 +10,13 @@ Signed-off-by: Erwin Rol <erwin@erwinrol.com>
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  configure.ac |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index e711634..e8f32eb 100644
+index fbaa376..1777d91 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -317,14 +317,14 @@ GLAPI_ASM_SOURCES=""
+@@ -457,14 +457,14 @@ GLAPI_ASM_SOURCES=""
  AC_MSG_CHECKING([whether to enable assembly])
  test "x$enable_asm" = xno && AC_MSG_RESULT([no])
  # disable if cross compiling on x86/x86_64 since we must run gen_matypes
@@ -39,6 +39,3 @@ index e711634..e8f32eb 100644
  # check for supported arches
  if test "x$enable_asm" = xyes; then
      case "$host_cpu" in
--- 
-1.7.1
-
diff --git a/patches/MesaLib-8.0.3/0002-HACK-allow-compiling-host-tools-without-configure.patch b/patches/MesaLib-8.0.3/0002-HACK-allow-compiling-host-tools-without-configure.patch
new file mode 100644
index 000000000..7f4386048
--- /dev/null
+++ b/patches/MesaLib-8.0.3/0002-HACK-allow-compiling-host-tools-without-configure.patch
@@ -0,0 +1,48 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 7 Jul 2010 10:58:14 +0200
+Subject: [PATCH] HACK: allow compiling host tools without configure
+
+This patch modifies the Makefiles for the hosttools to allow
+compiling without configure. This way we can avoid
+unnecessary dependencies when only compiling host tools.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/glsl/Makefile |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/glsl/Makefile b/src/glsl/Makefile
+index d9ecbc8..c6726a7 100644
+--- a/src/glsl/Makefile
++++ b/src/glsl/Makefile
+@@ -3,7 +3,11 @@
+ 
+ TOP = ../..
+ 
++ifeq ($(wildcard $(TOP)/configs/current),)
++include $(TOP)/configs/default
++else
+ include $(TOP)/configs/current
++endif
+ 
+ LIBNAME = glsl
+ 
+@@ -118,7 +122,8 @@ endif
+ 
+ # Dummy target
+ install: $(DRICORE_INSTALL_TARGET)
+-	@echo -n ""
++	$(INSTALL) -d $(DESTDIR)/bin/mesa/
++	$(INSTALL) -m 755 builtin_compiler $(DESTDIR)/bin/mesa/
+ 
+ install-dricore: default
+ 	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+@@ -165,7 +170,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
+ builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
+ 	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
+ 
+-builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
++builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py
+ 	@echo Regenerating builtin_function.cpp...
+ 	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
+ 
diff --git a/patches/MesaLib-7.8.2/autogen.sh b/patches/MesaLib-8.0.3/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/MesaLib-7.8.2/autogen.sh
+++ b/patches/MesaLib-8.0.3/autogen.sh
diff --git a/patches/MesaLib-8.0.3/series b/patches/MesaLib-8.0.3/series
new file mode 100644
index 000000000..d6e472d43
--- /dev/null
+++ b/patches/MesaLib-8.0.3/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-remove-crosscompile-check.patch
+0002-HACK-allow-compiling-host-tools-without-configure.patch
+# 4eecf2c7eca888d7920cf111797a97d5  - git-ptx-patches magic
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index e648b2e79..63d4c7519 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -21,6 +21,6 @@ HOST_MESALIB_SUBDIR	:= src/glsl
 # ----------------------------------------------------------------------------
 
 HOST_MESALIB_CONF_TOOL	:= NO
-HOST_MESALIB_MAKE_OPT	:= $(HOST_ENV) default
+HOST_MESALIB_MAKE_OPT	:= $(HOST_ENV) builtin_compiler
 
 # vim: syntax=make
diff --git a/rules/mesa-demos.in b/rules/mesa-demos.in
new file mode 100644
index 000000000..8e107948a
--- /dev/null
+++ b/rules/mesa-demos.in
@@ -0,0 +1,115 @@
+## SECTION=multimedia_xorg_support_libs
+
+menuconfig MESA_DEMOS
+	bool
+	select MESALIB
+	select GLEW
+	prompt "mesa tools & demos            "
+
+if MESA_DEMOS
+
+config MESA_DEMOS_CORENDER
+	bool
+	prompt "corender"
+
+config MESA_DEMOS_GLSYNC
+	bool
+	prompt "glsync"
+
+config MESA_DEMOS_GLTHREADS
+	bool
+	prompt "glthreads"
+
+config MESA_DEMOS_GLXCONTEXTS
+	bool
+	prompt "glxcontexts"
+
+config MESA_DEMOS_GLXDEMO
+	bool
+	prompt "glxdemo"
+
+config MESA_DEMOS_GLXGEARS
+	bool
+	prompt "glxgears"
+
+config MESA_DEMOS_GLXGEARS_FBCONFIG
+	bool
+	prompt "glxgears_fbconfig"
+
+config MESA_DEMOS_GLXGEARS_PIXMAP
+	bool
+	prompt "glxgears_pixmap"
+
+config MESA_DEMOS_GLXHEADS
+	bool
+	prompt "glxheads"
+
+config MESA_DEMOS_GLXINFO
+	bool
+	prompt "glxinfo"
+
+config MESA_DEMOS_GLXPBDEMO
+	bool
+	prompt "glxpbdemo"
+
+config MESA_DEMOS_GLXPIXMAP
+	bool
+	prompt "glxpixmap"
+
+config MESA_DEMOS_GLXSNOOP
+	bool
+	prompt "glxsnoop"
+
+config MESA_DEMOS_GLXSWAPCONTROL
+	bool
+	prompt "glxswapcontrol"
+
+config MESA_DEMOS_MANYWIN
+	bool
+	prompt "manywin"
+
+config MESA_DEMOS_MULTICTX
+	bool
+	prompt "multictx"
+
+config MESA_DEMOS_OFFSET
+	bool
+	prompt "offset"
+
+config MESA_DEMOS_OVERLAY
+	bool
+	prompt "overlay"
+
+config MESA_DEMOS_PBDEMO
+	bool
+	prompt "pbdemo"
+
+config MESA_DEMOS_PBINFO
+	bool
+	prompt "pbinfo"
+
+config MESA_DEMOS_SHAREDTEX
+	bool
+	prompt "sharedtex"
+
+config MESA_DEMOS_SHAREDTEX_MT
+	bool
+	prompt "sharedtex_mt"
+
+config MESA_DEMOS_TEXTURE_FROM_PIXMAP
+	bool
+	prompt "texture_from_pixmap"
+
+config MESA_DEMOS_WINCOPY
+	bool
+	prompt "wincopy"
+
+config MESA_DEMOS_XFONT
+	bool
+	prompt "xfont"
+
+config MESA_DEMOS_XROTFONTDEMO
+	bool
+	prompt "xrotfontdemo"
+
+endif
diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
new file mode 100644
index 000000000..25bfbdf2f
--- /dev/null
+++ b/rules/mesa-demos.make
@@ -0,0 +1,92 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_MESA_DEMOS) += mesa-demos
+
+#
+# Paths and names
+#
+MESA_DEMOS_VERSION	:= 8.0.1
+MESA_DEMOS_MD5		:= 320c2a4b6edc6faba35d9cb1e2a30bf4
+MESA_DEMOS		:= mesa-demos-$(MESA_DEMOS_VERSION)
+MESA_DEMOS_SUFFIX	:= tar.bz2
+MESA_DEMOS_URL		:= ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
+MESA_DEMOS_SOURCE	:= $(SRCDIR)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
+MESA_DEMOS_DIR		:= $(BUILDDIR)/$(MESA_DEMOS)
+MESA_DEMOS_LICENSE	:= unknown
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+MESA_DEMOS_CONF_TOOL	:= autoconf
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_CORENDER)		+= corender
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLSYNC)		+= glsync
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLTHREADS)		+= glthreads
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXCONTEXTS)		+= glxcontexts
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXDEMO)		+= glxdemo
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXGEARS)		+= glxgears
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXGEARS_FBCONFIG)	+= glxgears_fbconfig
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXGEARS_PIXMAP)	+= glxgears_pixmap
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXHEADS)		+= glxheads
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXINFO)		+= glxinfo
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXPBDEMO)		+= glxpbdemo
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXPIXMAP)		+= glxpixmap
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXSNOOP)		+= glxsnoop
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_GLXSWAPCONTROL)	+= glxswapcontrol
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_MANYWIN)		+= manywin
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_MULTICTX)		+= multictx
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_OFFSET)		+= offset
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_OVERLAY)		+= overlay
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_PBDEMO)		+= pbdemo
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_PBINFO)		+= pbinfo
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_SHAREDTEX)		+= sharedtex
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_SHAREDTEX_MT)	+= sharedtex_mt
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_TEXTURE_FROM_PIXMAP)+= texture_from_pixmap
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_WINCOPY)		+= wincopy
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_XFONT)		+= xfont
+MESA_DEMOS_BIN-$(PTXCONF_MESA_DEMOS_XROTFONTDEMO)	+= xrotfontdemo
+
+$(STATEDIR)/mesa-demos.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, mesa-demos)
+	@$(call install_fixup, mesa-demos,PRIORITY,optional)
+	@$(call install_fixup, mesa-demos,SECTION,base)
+	@$(call install_fixup, mesa-demos,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+	@$(call install_fixup, mesa-demos,DESCRIPTION,missing)
+
+	@$(foreach bin, $(MESA_DEMOS_BIN-y), \
+		$(call install_copy, mesa-demos, 0, 0, 0755, -, /usr/bin/$(bin));)
+
+	@$(call install_finish, mesa-demos)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+#$(STATEDIR)/mesa-demos.clean:
+#	@$(call targetinfo)
+#	@$(call clean_pkg, MESA_DEMOS)
+
+# vim: syntax=make
diff --git a/rules/mesalib.in b/rules/mesalib.in
index d4b9aa3ed..279f0650e 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -7,13 +7,13 @@ menuconfig MESALIB
 	select DRI2PROTO
 	select HOST_MESALIB
 	select HOST_MAKEDEPEND
-	select XORG_LIB_X11		if MESALIB_DRIVER_DRI
-	select XORG_LIB_XEXT		if MESALIB_DRIVER_DRI || MESALIB_DRIVER_XLIB
-	select XORG_LIB_XXF86VM		if MESALIB_DRIVER_DRI
-	select XORG_LIB_XDAMAGE		if MESALIB_DRIVER_DRI
-	select XORG_LIB_XFIXES		if MESALIB_DRIVER_DRI
-	select XORG_PROTO_GL		if MESALIB_DRIVER_DRI
-	select EXPAT			if MESALIB_DRIVER_DRI
+	select XORG_LIB_X11		if MESALIB_DRI
+	select XORG_LIB_XEXT		if MESALIB_DRI || MESALIB_XLIB_GLX
+	select XORG_LIB_XXF86VM		if MESALIB_DRI
+	select XORG_LIB_XDAMAGE		if MESALIB_DRI
+	select XORG_LIB_XFIXES		if MESALIB_DRI
+	select XORG_PROTO_GL		if MESALIB_DRI
+	select EXPAT			if MESALIB_DRI
 	select GCCLIBS
 	select GCCLIBS_CXX
 	help
@@ -25,32 +25,24 @@ menuconfig MESALIB
 
 if MESALIB
 
-choice
-	depends on MESALIB
-	prompt "backend driver "
-
-
-	config MESALIB_DRIVER_XLIB
-		depends on !XORG_SERVER_EXT_GLX
-		bool
-		prompt "xlib"
-
-	config MESALIB_DRIVER_DRI
-		bool
-		prompt "dri"
-
-	config MESALIB_DRIVER_OSMESA
-		depends on !XORG_SERVER_EXT_GLX
-		bool
-		prompt "osmesa"
+config MESALIB_DRI
+	prompt "DRI modules"
+	bool
 
-endchoice
+config MESALIB_GLX
+	prompt "GLX library"
+	bool
 
-if MESALIB_DRIVER_DRI
+config MESALIB_XLIB_GLX
+	depends on MESALIB_GLX
+	default !MESALIB_DRI && !MESALIB_OSMESA
+	bool
 
-config MESALIB_DRI_GALLIUM
+config MESALIB_OSMESA
+	prompt "OSMesa library"
 	bool
-	prompt "Enable Gallium"
+
+if MESALIB_DRI
 
 config MESALIB_DRI_SWRAST
 	bool
@@ -62,17 +54,6 @@ menuconfig MESALIB_DRI_INTEL
 
 if MESALIB_DRI_INTEL
 
-config MESALIB_DRI_INTEL_GALLIUM
-	bool
-	depends on MESALIB_DRI_GALLIUM
-	prompt "Enable Gallium"
-
-comment "Drivers"
-
-config MESALIB_DRI_I810
-	bool
-	prompt "i810"
-
 config MESALIB_DRI_I915
 	bool
 	prompt "i915"
@@ -89,16 +70,10 @@ menuconfig MESALIB_DRI_ATI
 
 if MESALIB_DRI_ATI
 
-config MESALIB_DRI_MACH64
-	bool
-	prompt "mach64"
-
-config MESALIB_DRI_R128
-	bool
-	prompt "r128"
-
 config MESALIB_DRI_R200
 	bool
+	# needs libdrm_radeon
+	depends on BROKEN
 	prompt "r200"
 
 config MESALIB_DRI_R300
@@ -111,145 +86,23 @@ config MESALIB_DRI_R600
 
 config MESALIB_DRI_RADEON
 	bool
+	# needs libdrm_radeon
+	depends on BROKEN
 	prompt "radeon"
 
 endif
 
 menu "Other DRI Drivers             "
 
-config MESALIB_DRI_MGA
-	bool
-	prompt "mga"
-
-config MESALIB_DRI_SAVAGE
+config MESALIB_DRI_NOUVEAU
 	bool
-	prompt "savage"
-
-config MESALIB_DRI_SIS
-	bool
-	# sis_context.h:408:2: error: #error platform needs WMB
+	# need libdrm_nouveau
 	depends on BROKEN
-	prompt "sis"
-
-config MESALIB_DRI_TDFX
-	bool
-	prompt "tdfx"
-
-config MESALIB_DRI_UNICHROME
-	bool
-	prompt "unichrome"
+	prompt "nouveau"
 
 endmenu
 
 endif
 
-menuconfig MESALIB_TOOLS
-	bool
-	prompt "Tools and Demos               "
-
-if MESALIB_TOOLS
-
-config MESALIB_TOOLS_CORENDER
-	bool
-	prompt "corender"
-
-config MESALIB_TOOLS_GLSYNC
-	bool
-	prompt "glsync"
-
-config MESALIB_TOOLS_GLTHREADS
-	bool
-	prompt "glthreads"
-
-config MESALIB_TOOLS_GLXCONTEXTS
-	bool
-	prompt "glxcontexts"
-
-config MESALIB_TOOLS_GLXDEMO
-	bool
-	prompt "glxdemo"
-
-config MESALIB_TOOLS_GLXGEARS
-	bool
-	prompt "glxgears"
-
-config MESALIB_TOOLS_GLXGEARS_FBCONFIG
-	bool
-	prompt "glxgears_fbconfig"
-
-config MESALIB_TOOLS_GLXGEARS_PIXMAP
-	bool
-	prompt "glxgears_pixmap"
-
-config MESALIB_TOOLS_GLXHEADS
-	bool
-	prompt "glxheads"
-
-config MESALIB_TOOLS_GLXINFO
-	bool
-	prompt "glxinfo"
-
-config MESALIB_TOOLS_GLXPBDEMO
-	bool
-	prompt "glxpbdemo"
-
-config MESALIB_TOOLS_GLXPIXMAP
-	bool
-	prompt "glxpixmap"
-
-config MESALIB_TOOLS_GLXSNOOP
-	bool
-	prompt "glxsnoop"
-
-config MESALIB_TOOLS_GLXSWAPCONTROL
-	bool
-	prompt "glxswapcontrol"
-
-config MESALIB_TOOLS_MANYWIN
-	bool
-	prompt "manywin"
-
-config MESALIB_TOOLS_OFFSET
-	bool
-	prompt "offset"
-
-config MESALIB_TOOLS_OVERLAY
-	bool
-	prompt "overlay"
-
-config MESALIB_TOOLS_PBDEMO
-	bool
-	prompt "pbdemo"
-
-config MESALIB_TOOLS_PBINFO
-	bool
-	prompt "pbinfo"
-
-config MESALIB_TOOLS_SHAREDTEX
-	bool
-	prompt "sharedtex"
-
-config MESALIB_TOOLS_SHAREDTEX_MT
-	bool
-	prompt "sharedtex_mt"
-
-config MESALIB_TOOLS_TEXTURE_FROM_PIXMAP
-	bool
-	prompt "texture_from_pixmap"
-
-config MESALIB_TOOLS_WINCOPY
-	bool
-	prompt "wincopy"
-
-config MESALIB_TOOLS_XFONT
-	bool
-	prompt "xfont"
-
-config MESALIB_TOOLS_XROTFONTDEMO
-	bool
-	prompt "xrotfontdemo"
-
-endif
-
 endif
 
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 253ab9888..7c1bf4103 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,187 +19,108 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 7.8.2
-MESALIB_MD5	:= 6be2d343a0089bfd395ce02aaf8adb57
+MESALIB_VERSION	:= 8.0.3
+MESALIB_MD5	:= cc5ee15e306b8c15da6a478923797171
 MESALIB		:= MesaLib-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.bz2
+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_URL	:= \
-	$(call ptx/mirror, SF, mesa3d/$(MESALIB).$(MESALIB_SUFFIX)) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESALIB).$(MESALIB_SUFFIX)
-
-MESADEMOS		:= MesaDemos-$(MESALIB_VERSION)
-MESADEMOS_MD5		:= 757d9e2e06f48b1a52848be9b0307ced
-MESADEMOS_SOURCE	:= $(SRCDIR)/$(MESADEMOS).$(MESALIB_SUFFIX)
-MESADEMOS_DIR		:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
-
-MESADEMOS_URL		:= \
-	$(call ptx/mirror, SF, mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX)) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESADEMOS).$(MESALIB_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(MESALIB_SOURCE):
-	@$(call targetinfo)
-	@$(call get, MESALIB)
-
-$(MESADEMOS_SOURCE):
-	@$(call targetinfo)
-	@$(call get, MESADEMOS)
-
-$(STATEDIR)/mesalib.get:
-	@$(call targetinfo)
-	@$(call world/get, MESALIB)
-	@$(call world/check_src, MESALIB)
-ifdef PTXCONF_MESALIB_TOOLS
-	@$(call check_src, MESADEMOS)
-endif
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-ifdef PTXCONF_MESALIB_TOOLS
-$(STATEDIR)/mesalib.get: $(MESADEMOS_SOURCE)
-endif
-
-$(STATEDIR)/mesalib.extract:
-	@$(call targetinfo)
-	@$(call clean, $(MESALIB_DIR))
-	@$(call extract, MESALIB)
-ifdef PTXCONF_MESALIB_TOOLS
-	@$(call extract, MESADEMOS)
-endif
-	@$(call patchin, MESALIB, $(MESALIB_DIR))
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-MESALIB_COMPILE_ENV := $(CROSS_ENV_CC_FOR_BUILD)
+MESALIB_CONF_ENV := \
+	ac_cv_prog_PYTHON2=$(PTXDIST_TOPDIR)/bin/python
 
-MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_XLIB)		+= xlib
-MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_DRI)		+= dri
-MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_OSMESA)	+= osmesa
-
-ifndef PTXCONF_ARCH_ARM
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I810)		+= i810
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I965)		+= i965
+ifdef PTXCONF_ARCH_X86
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I915)		+= i915
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I965)		+= i965
 endif
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_MACH64)	+= mach64
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_MGA)		+= mga
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R128)		+= r128
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200)		+= r200
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)		+= r300
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)		+= r600
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_RADEON)	+= radeon
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_S3V)		+= s3v
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SAVAGE)	+= savage
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SIS)		+= sis
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_TDFX)		+= tdfx
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_TRIDENT)	+= trident
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_UNICHROME)	+= unichrome
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_FFB)		+= ffb
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
+
+ifdef PTXCONF_ARCH_X86
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_I915)	+= i915
+endif
+ifndef PTXCONF_ARCH_X86 # needs llvm
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)	+= r300
+endif
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R600)	+= r600
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
 
-MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_XLIB)	+= glx
-MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI)	+= dri
-# circular dependency with xorg
-#MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI)	+= xorg
+MESALIB_DRI_LIBS-y += $(MESALIB_DRI_DRIVERS-y) $(MESALIB_GALLIUM_DRIVERS-y)
 
-MESALIB_AUTOCONF   := \
+MESALIB_CONF_TOOL	:= autoconf
+MESALIB_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-static \
 	--enable-shared \
 	--disable-debug \
+	--disable-mangling \
+	--disable-texture-float \
 	--disable-asm \
 	--enable-pic \
 	--disable-selinux \
-	--enable-xcb \
-	--disable-glx-tls \
+	--enable-opengl \
+	--disable-gles1 \
+	--disable-gles2 \
+	--disable-openvg \
+	--$(call ptx/endis, PTXCONF_MESALIB_DRI)-dri \
+	--$(call ptx/endis, PTXCONF_MESALIB_GLX)-glx \
+	--$(call ptx/endis, PTXCONF_MESALIB_OSMESA)-osmesa \
+	--disable-egl \
+	--disable-xorg \
+	--disable-xa \
+	--disable-d3d1x \
+	--disable-gbm \
+	--disable-xvmc \
+	--disable-vdpau \
+	--disable-va \
+	--$(call ptx/endis, PTXCONF_MESALIB_XLIB_GLX)-xlib-glx \
+	--disable-gallium-egl \
+	--disable-gallium-gbm \
+	--disable-shared-glapi \
 	--enable-driglx-direct \
+	--disable-shared-dricore \
+	--$(call ptx/endis,PTXCONF_XORG_SERVER_OPT_GLX_TLS)-glx-tls \
+	--disable-gallium-g3dvl \
 	--enable-glu \
-	--disable-glw \
-	--disable-motif \
-	--disable-glut \
-	--disable-egl \
-	--with-driver=$(subst $(space),$(comma),$(MESALIB_DRIVERS-y)) \
-	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y))
+	--disable-gallium-llvm \
+	--with-gallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
+	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
+	--with-expat=$(SYSROOT)/usr
+
 
 # the 32/64 bit options result in CFLAGS -> -m32 and -m64 which seem
 # only to be available on x86
 
-ifdef PTXCONF_MESALIB_DRI_GALLIUM
-MESALIB_AUTOCONF += \
-	--enable-gallium \
-	--with-state-trackers=$(subst $(space),$(comma),$(MESALIB_STATE_TRACKERS-y))
-else
-MESALIB_AUTOCONF += \
-	--disable-gallium \
-	--without-state-trackers
-endif
-
 ifdef PTXCONF_ARCH_X86
-MESALIB_AUTOCONF += \
+MESALIB_CONF_OPT += \
 	--enable-32-bit \
 	--disable-64-bit
-
-ifdef PTXCONF_MESALIB_DRI_INTEL_GALLIUM
-MESALIB_AUTOCONF += --enable-gallium-intel
-else
-MESALIB_AUTOCONF += --disable-gallium-intel
-endif
-
-endif
-
-ifdef PTXCONF_ARCH_ARM
-MESALIB_AUTOCONF += --disable-gallium-intel
-endif
-
-ifdef PTXCONF_MESALIB_DRIVER_OSMESA
-MESALIB_AUTOCONF += --disable-gl-osmesa
-else
-MESALIB_AUTOCONF += --enable-gl-osmesa
 endif
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
+MESALIB_MAKE_OPT := HOST_CC=$(HOSTCC)
+
 $(STATEDIR)/mesalib.compile:
 	@$(call targetinfo)
-	@cp $(PTXCONF_SYSROOT_HOST)/bin/mesa/* $(MESALIB_DIR)/src/glsl/apps
+	cp $(PTXCONF_SYSROOT_HOST)/bin/mesa/* $(MESALIB_DIR)/src/glsl/
 	@$(call compile, MESALIB)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/mesalib.install:
-	@$(call targetinfo)
-	@$(call install, MESALIB)
-	@mkdir -p $(MESALIB_PKGDIR)/usr/bin/
-ifdef PTXCONF_MESALIB_TOOLS
-	@cd $(MESALIB_DIR)/progs/xdemos/ && find -type f -perm /111 | \
-		xargs install -m 755 -D -t $(MESALIB_PKGDIR)/usr/bin/
-endif
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_DRI)  := 1.2
-MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_XLIB) := 1.5.07.8.2
-
 $(STATEDIR)/mesalib.targetinstall:
 	@$(call targetinfo)
 
@@ -209,146 +130,16 @@ $(STATEDIR)/mesalib.targetinstall:
 	@$(call install_fixup, mesalib,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, mesalib,DESCRIPTION,missing)
 
-ifdef PTXCONF_MESALIB_DRIVER_DRI
-
-ifndef PTXCONF_ARCH_ARM
-ifdef PTXCONF_MESALIB_DRI_I915
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/i915_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_I810
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/i810_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_I965
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/i965_dri.so)
-endif
-endif
-ifdef PTXCONF_MESALIB_DRI_SWRAST
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/swrast_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_MACH64
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/mach64_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_MGA
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/mga_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_R128
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/r128_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_R200
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/r200_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_R300
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/r300_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_RADEON
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/radeon_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_S3V
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/s3v_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_SAVAGE
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/savage_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_SIS
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/sis_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_TDFX
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/tdfx_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_TRIDENT
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/trident_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_UNICHROME
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/unichrome_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_FFB
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/ffb_dri.so)
-endif
-
+ifdef PTXCONF_MESALIB_DRI
+	@$(foreach lib, $(MESALIB_DRI_LIBS-y), \
+		$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/$(lib)_dri.so);)
 endif
 
-ifdef PTXCONF_MESALIB_TOOLS_CORENDER
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/corender)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLSYNC
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glsync)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLTHREADS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glthreads)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXCONTEXTS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxcontexts)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxdemo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXGEARS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxgears)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXGEARS_FBCONFIG
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxgears_fbconfig)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXGEARS_PIXMAP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxgears_pixmap)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXHEADS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxheads)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXINFO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxinfo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXPBDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxpbdemo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXPIXMAP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxpixmap)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXSNOOP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxsnoop)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXSWAPCONTROL
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxswapcontrol)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_MANYWIN
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/manywin)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_OFFSET
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/offset)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_OVERLAY
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/overlay)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_PBDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/pbdemo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_PBINFO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/pbinfo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_SHAREDTEX
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/sharedtex)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_SHAREDTEX_MT
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/sharedtex_mt)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_TEXTURE_FROM_PIXMAP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/texture_from_pixmap)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_WINCOPY
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/wincopy)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_XFONT
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/xfont)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_XROTFONTDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/xrotfontdemo)
-endif
-
-ifndef PTXCONF_MESALIB_DRIVER_OSMESA
 	@$(call install_lib, mesalib, 0, 0, 0644, libGL)
-endif
-
 	@$(call install_lib, mesalib, 0, 0, 0644, libGLU)
+ifdef PTXCONF_MESALIB_OSMESA
 	@$(call install_lib, mesalib, 0, 0, 0644, libOSMesa)
+endif
 
 	@$(call install_finish, mesalib)
 
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 845efceb0..5108e2dea 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -384,7 +384,8 @@ config XORG_SERVER_EXT_GLX
 	bool
 	# This select doesn't work! But it is workarounded by mesalib only
 	# presenting the DRI driver as it's backend if GLX is active.
-	select MESALIB_DRIVER_DRI
+	select MESALIB_DRI
+	select MESALIB_GLX
 	prompt "glx extension"
 	help
 	  --enable-glx