- Update to 7.11

  Release notes: http://mesa3d.org/relnotes-7.11.html
- Unbreak on 9.x amd64

6 files changed, 66 insertions, 41 deletions

diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index 260cab9d1bd5..6a12d4c2af37 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libosmesa
-PORTVERSION=	7.10.2
+PORTVERSION=	7.11
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
 DISTNAME=	MesaLib-${PORTVERSION}
@@ -16,51 +16,24 @@ COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
     		talloc.2:${PORTSDIR}/devel/talloc
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
-    		makedepend:${PORTSDIR}/devel/makedepend
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
-    		makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
+		bison:${PORTSDIR}/devel/bison
 
 CONFLICTS=	mesagl-mangled-*
 
 USE_BZIP2=	yes
 USE_GCC=	4.2+
 USE_LDCONFIG=	yes
-USE_XORG=	xxf86vm xext xfixes xdamage xt
 USE_GMAKE=	yes
-USE_PYTHON_BUILD=	yes
+USE_GNOME=	pkgconfig gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-driver=osmesa --with-osmesa-bits=32 \
+		--with-gallium-drivers= --disable-asm \
+		--disable-egl \
 		--includedir=${PREFIX}/include/Mesa
-CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
+CFLAGS+=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS=	${CFLAGS}
 
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
 
-GLINC=		gl.h glext.h osmesa.h
-GLLIB=		OSMesa32
-SHLIB_VERS=	${PORTVERSION:R:R}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
-BROKEN=	Fails to build
-.endif
-
-do-install:
-	${MKDIR} ${PREFIX}/include/Mesa/GL
-	${MKDIR} ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/libdata/pkgconfig
-# header files
-.for i in ${GLINC}
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/Mesa/GL/
-.endfor
-# shlib
-	${INSTALL_DATA} ${WRKSRC}/lib/libOSMesa32.so.${SHLIB_VERS} ${PREFIX}/lib
-	${LN} -sf libOSMesa32.so.${SHLIB_VERS} ${PREFIX}/lib/libOSMesa32.so
-	${LN} -sf libOSMesa32.so.${SHLIB_VERS} ${PREFIX}/lib/libOSMesa.so.${SHLIB_VERS}
-	${LN} -sf libOSMesa32.so.${SHLIB_VERS} ${PREFIX}/lib/libOSMesa.so
-# pkg-config
-	cd ${WRKSRC}/src/mesa && ${GMAKE} osmesa.pc
-	${INSTALL_DATA} ${WRKSRC}/src/mesa/osmesa.pc ${PREFIX}/libdata/pkgconfig
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/libosmesa/distinfo b/graphics/libosmesa/distinfo
index f6c258708f7a..1d55e88fd85d 100644
--- a/graphics/libosmesa/distinfo
+++ b/graphics/libosmesa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MesaLib-7.10.2.tar.bz2) = 8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1
-SIZE (MesaLib-7.10.2.tar.bz2) = 5863551
+SHA256 (MesaLib-7.11.tar.bz2) = f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf
+SIZE (MesaLib-7.11.tar.bz2) = 6559702
diff --git a/graphics/libosmesa/files/patch-configs_autoconf.in b/graphics/libosmesa/files/patch-configs_autoconf.in
new file mode 100644
index 000000000000..bdfa9e8b70c2
--- /dev/null
+++ b/graphics/libosmesa/files/patch-configs_autoconf.in
@@ -0,0 +1,11 @@
+--- configs/autoconf.in.orig	2011-08-03 18:16:02.000000000 +0200
++++ configs/autoconf.in	2011-08-03 18:16:14.000000000 +0200
+@@ -66,7 +66,7 @@
+ 
+ # Library names (base name)
+ GL_LIB = GL
+-GLU_LIB = GLU
++GLU_LIB = OSGLU
+ GLUT_LIB = glut
+ GLW_LIB = GLw
+ OSMESA_LIB = @OSMESA_LIB@
diff --git a/graphics/libosmesa/files/patch-src-glu_Makefile b/graphics/libosmesa/files/patch-src-glu_Makefile
new file mode 100644
index 000000000000..6d9c1ecc8658
--- /dev/null
+++ b/graphics/libosmesa/files/patch-src-glu_Makefile
@@ -0,0 +1,14 @@
+--- src/glu/Makefile.orig	2010-02-05 01:10:40.000000000 +0100
++++ src/glu/Makefile	2011-08-04 10:48:42.000000000 +0200
+@@ -29,9 +29,9 @@
+ 
+ install: glu.pc
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
+-	$(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++	$(INSTALL) -m 644 glu.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/osglu.pc
+ 
+ clean:
+ 	-@for dir in $(SUBDIRS) ; do \
diff --git a/graphics/libosmesa/files/patch-src-mesa_Makefile b/graphics/libosmesa/files/patch-src-mesa_Makefile
new file mode 100644
index 000000000000..816cbab18bad
--- /dev/null
+++ b/graphics/libosmesa/files/patch-src-mesa_Makefile
@@ -0,0 +1,15 @@
+--- src/mesa/Makefile.orig	2011-08-04 10:47:51.000000000 +0200
++++ src/mesa/Makefile	2011-08-04 10:48:17.000000000 +0200
+@@ -191,10 +191,10 @@
+ 
+ install-osmesa: default osmesa.pc
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
+ 		$(DESTDIR)$(INSTALL_LIB_DIR)
+-	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 
+ install-dri: default
+ 	cd drivers/dri && $(MAKE) install
diff --git a/graphics/libosmesa/pkg-plist b/graphics/libosmesa/pkg-plist
index 690615909547..81b7320b67ec 100644
--- a/graphics/libosmesa/pkg-plist
+++ b/graphics/libosmesa/pkg-plist
@@ -1,10 +1,22 @@
 include/Mesa/GL/gl.h
+include/Mesa/GL/gl_mangle.h
 include/Mesa/GL/glext.h
+include/Mesa/GL/glfbdev.h
+include/Mesa/GL/glu.h
+include/Mesa/GL/glu_mangle.h
+include/Mesa/GL/glx.h
+include/Mesa/GL/glx_mangle.h
+include/Mesa/GL/glxext.h
+include/Mesa/GL/mesa_wgl.h
 include/Mesa/GL/osmesa.h
-lib/libOSMesa32.so.7
+include/Mesa/GL/vms_x_fix.h
+include/Mesa/GL/wglext.h
+include/Mesa/GL/wmesa.h
+lib/libOSGLU.so
+lib/libOSGLU.so.1
 lib/libOSMesa32.so
-lib/libOSMesa.so.7
-lib/libOSMesa.so
+lib/libOSMesa32.so.7
 libdata/pkgconfig/osmesa.pc
+libdata/pkgconfig/osglu.pc
 @dirrm include/Mesa/GL
 @dirrm include/Mesa