[mesa] Update version

- Update version
- remove two patches that are fixed upstream
- Improve menu structure

Signed-off-by: Erwin Rol <erwin@erwinrol.com>

8 files changed, 69 insertions, 80 deletions

diff --git a/patches/MesaLib-7.5.2/add-destdir-support.diff b/patches/MesaLib-7.5.2/add-destdir-support.diff
deleted file mode 100644
index f8cda7dd5..000000000
--- a/patches/MesaLib-7.5.2/add-destdir-support.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: add DESTDIR support to src/gallium/winsys/xlib/Makefile
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 20091207 rsc: https://bugs.freedesktop.org/show_bug.cgi?id=25499
-
- src/gallium/winsys/xlib/Makefile |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: Mesa-7.5/src/gallium/winsys/xlib/Makefile
-===================================================================
---- Mesa-7.5.orig/src/gallium/winsys/xlib/Makefile
-+++ Mesa-7.5/src/gallium/winsys/xlib/Makefile
-@@ -86,11 +86,11 @@ depend: $(XLIB_WINSYS_SOURCES)
- 
- 
- install: default
--	$(INSTALL) -d $(INSTALL_DIR)/include/GL
--	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
--	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-+	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
- 	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
--		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
-+		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
- 	fi
- 
- 
diff --git a/patches/MesaLib-7.5.2/add-linker-to-mklib.diff b/patches/MesaLib-7.5.2/add-linker-to-mklib.diff
deleted file mode 100644
index 24475700a..000000000
--- a/patches/MesaLib-7.5.2/add-linker-to-mklib.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: add linker option to mklib call
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 20091107 rsc: https://bugs.freedesktop.org/show_bug.cgi?id=25500
-
- src/gallium/winsys/drm/Makefile.template |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: Mesa-7.5/src/gallium/winsys/drm/Makefile.template
-===================================================================
---- Mesa-7.5.orig/src/gallium/winsys/drm/Makefile.template
-+++ Mesa-7.5/src/gallium/winsys/drm/Makefile.template
-@@ -83,6 +83,7 @@ default: depend symlinks $(TOP)/$(LIB_DI
- 
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- 	$(MKLIB) -noprefix -o $@ \
-+		-linker "$(CC)" \
- 		$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES)  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
- 
- $(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
diff --git a/patches/MesaLib-7.5.2/series b/patches/MesaLib-7.5.2/series
deleted file mode 100644
index 7f9b860a2..000000000
--- a/patches/MesaLib-7.5.2/series
+++ /dev/null
@@ -1,3 +0,0 @@
-configure.ac.diff
-add-destdir-support.diff
-add-linker-to-mklib.diff
diff --git a/patches/MesaLib-7.5.2/autogen.sh b/patches/MesaLib-7.6.1/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/MesaLib-7.5.2/autogen.sh
+++ b/patches/MesaLib-7.6.1/autogen.sh
diff --git a/patches/MesaLib-7.5.2/configure.ac.diff b/patches/MesaLib-7.6.1/configure.ac.diff
index 6ffec837e..6ffec837e 100644
--- a/patches/MesaLib-7.5.2/configure.ac.diff
+++ b/patches/MesaLib-7.6.1/configure.ac.diff
diff --git a/patches/MesaLib-7.6.1/series b/patches/MesaLib-7.6.1/series
new file mode 100644
index 000000000..2b0af5b95
--- /dev/null
+++ b/patches/MesaLib-7.6.1/series
@@ -0,0 +1 @@
+configure.ac.diff
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 6d2b1762c..bc85e765b 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -23,7 +23,7 @@ if MESALIB
 
 choice
 	depends on MESALIB
-	prompt "backend driver"
+	prompt "backend driver "
 
 
 	config MESALIB_DRIVER_XLIB
@@ -44,31 +44,50 @@ endchoice
 
 if MESALIB_DRIVER_DRI
 
-comment "dri drivers"
-
-config MESALIB_DRI_I915
+config MESALIB_DRI_GALLIUM
 	bool
-	prompt "i915"
+	prompt "Enable Gallium"
 
 config MESALIB_DRI_SWRAST
 	bool
-	prompt "swrast"
+	prompt "Software Rasterizer           "
+
+menuconfig MESALIB_DRI_INTEL
+	bool
+	prompt "Intel DRI drivers             "
+
+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"
+
 config MESALIB_DRI_I965
 	bool
 	prompt "i965"
 
-config MESALIB_DRI_MACH64
+endif
+
+menuconfig MESALIB_DRI_ATI
 	bool
-	prompt "mach64"
+	prompt "Ati DRI drivers               "
 
-config MESALIB_DRI_MGA
+if MESALIB_DRI_ATI
+
+config MESALIB_DRI_MACH64
 	bool
-	prompt "mga"
+	prompt "mach64"
 
 config MESALIB_DRI_R128
 	bool
@@ -86,6 +105,14 @@ config MESALIB_DRI_RADEON
 	bool
 	prompt "radeon"
 
+endif
+
+menu "Other DRI Drivers             "
+
+config MESALIB_DRI_MGA
+	bool
+	prompt "mga"
+
 config MESALIB_DRI_S3V
 	bool
 	prompt "s3v"
@@ -116,11 +143,13 @@ config MESALIB_DRI_FFB
 	bool
 	prompt "ffb"
 
+endmenu
+
 endif
 
 menuconfig MESALIB_TOOLS
 	bool
-	prompt "tools"
+	prompt "Tools and Demos               "
 
 if MESALIB_TOOLS
 
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 57e1c369e..670b9ba70 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 7.5.2
+MESALIB_VERSION	:= 7.6.1
 MESALIB		:= MesaLib-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.bz2
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
@@ -27,14 +27,14 @@ MESALIB_DIR	:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
 
 MESALIB_URL	:= \
 	$(PTXCONF_SETUP_SFMIRROR)/mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.5.2/$(MESALIB).$(MESALIB_SUFFIX)
+	ftp://ftp.freedesktop.org/pub/mesa/7.6.1/$(MESALIB).$(MESALIB_SUFFIX)
 
 MESADEMOS		:= MesaDemos-$(MESALIB_VERSION)
 MESADEMOS_SOURCE	:= $(SRCDIR)/$(MESADEMOS).$(MESALIB_SUFFIX)
 
 MESADEMOS_URL		:= \
 	$(PTXCONF_SETUP_SFMIRROR)/mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.5.2/$(MESADEMOS).$(MESALIB_SUFFIX)
+	ftp://ftp.freedesktop.org/pub/mesa/7.6.1/$(MESADEMOS).$(MESALIB_SUFFIX)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -120,7 +120,25 @@ ifdef PTXCONF_ARCH_X86
 MESALIB_AUTOCONF += \
 	--enable-32-bit \
 	--disable-64-bit
+
+ifdef PTXCONF_MESALIB_DRI_GALLIUM
+MESALIB_AUTOCONF += \
+        --enable-gallium
+else
+MESALIB_AUTOCONF += \
+        --disable-gallium
 endif
+
+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
@@ -141,7 +159,7 @@ endif
 # ----------------------------------------------------------------------------
 
 MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_DRI)  := 1.2
-MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_XLIB) := 1.5.070502
+MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_XLIB) := 1.5.070601
 
 $(STATEDIR)/mesalib.targetinstall:
 	@$(call targetinfo)
@@ -296,13 +314,13 @@ ifndef PTXCONF_MESALIB_DRIVER_OSMESA
 	@$(call install_link, mesalib, libGL.so.$(MESALIB_GL_VERSION-y), /usr/lib/libGL.so)
 endif
 
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libGLU.so.1.3.070502)
-	@$(call install_link, mesalib, libGLU.so.1.3.070502, /usr/lib/libGLU.so.1)
-	@$(call install_link, mesalib, libGLU.so.1.3.070502, /usr/lib/libGLU.so)
+	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libGLU.so.1.3.070601)
+	@$(call install_link, mesalib, libGLU.so.1.3.070601, /usr/lib/libGLU.so.1)
+	@$(call install_link, mesalib, libGLU.so.1.3.070601, /usr/lib/libGLU.so)
 
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libOSMesa.so.7.5.2)
-	@$(call install_link, mesalib, libOSMesa.so.7.5.2, /usr/lib/libOSMesa.so.7)
-	@$(call install_link, mesalib, libOSMesa.so.7.5.2, /usr/lib/libOSMesa.so)
+	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libOSMesa.so.7.6.1)
+	@$(call install_link, mesalib, libOSMesa.so.7.6.1, /usr/lib/libOSMesa.so.7)
+	@$(call install_link, mesalib, libOSMesa.so.7.6.1, /usr/lib/libOSMesa.so)
 
 	@$(call install_finish, mesalib)