- Update to 9.2.2

  ChangeLogs:

  http://www.mesa3d.org/relnotes/9.2.1.html
  http://www.mesa3d.org/relnotes/9.2.2.html

8 files changed, 66 insertions, 128 deletions

diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index 52c235dad5eb..2b4798c3e01d 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -2,87 +2,60 @@
 # $FreeBSD$
 
 PORTNAME=	libosmesa
-PORTVERSION=	9.2.0
+PORTVERSION=	9.2.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION:R}/
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
 DISTNAME=	MesaLib-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
-    		talloc:${PORTSDIR}/devel/talloc
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
 
 CONFLICTS=	mesagl-mangled-*
 
+USES+=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_SCONS=	yes
-SCONS_TARGET=	osmesa
-SCONS_ARGS+=	build=release \
-		verbose=yes
-SCONS_BUILDENV=	CC="${CC}" \
-		CXX="${CXX}" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-MAKE_JOBS_UNSAFE=
+USE_XORG=	x11 xext
+USE_AUTOTOOLS=	autoconf automake libtool
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-osmesa \
+		--disable-driglx-direct \
+		--disable-gallium-llvm \
+		--disable-glx \
+		--disable-dri \
+		--disable-egl \
+		--with-gallium-drivers=swrast
+CFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
+MAKE_JOBS_UNSAFE=yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if (empty(CC:T:Mgcc4*) && empty(CC:T:Mclang*)) || (empty(CXX:T:Mg??4*) && empty(CXX:T:Mclang++*))
-.if (${OSVERSION} >= 900014) && (exists(/usr/bin/clang++) && exists(/usr/bin/clang))
-CC=	/usr/bin/clang
-CXX=	/usr/bin/clang++
-CPP=	/usr/bin/clang-cpp
-.else
-USE_GCC=yes
-.endif
-.endif
-
-.if ${ARCH} == "i386"
-SCONS_ARGS+=	machine=x86
-SCONS_BUILD_DIR=${WRKSRC}/build/freebsd-x86
-.elif ${ARCH} == "amd64"
-SCONS_ARGS+=	machine=x86_64
-SCONS_BUILD_DIR=${WRKSRC}/build/freebsd-x86_64
-.else
-SCONS_ARGS+=	machine=generic
-SCONS_BUILD_DIR=${WRKSRC}/build/freebsd
-.endif
-
 INCLUDES=	gl.h gl_mangle.h glext.h glx.h glx_mangle.h \
 		glxext.h osmesa.h wglext.h wmesa.h
 
 post-patch:
-	${REINPLACE_CMD}  -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/scons/custom.py
-	${REINPLACE_CMD}  -e \
-	    's|@prefix@|${PREFIX}|; \
-	    s|@libdir@|${PREFIX}/lib|; \
-	    s|@includedir@|${PREFIX}/include/Mesa|; \
-	    s|@OSMESA_VERSION@|${PORTVERSION}|; \
-	    s|@OSMESA_LIB@|OSMesa|; \
-	    s|@OSMESA_PC_REQ@||; \
-	    s|@OSMESA_PC_LIB_PRIV@|-lm -pthread|' \
-	    ${WRKSRC}/src/mesa/drivers/osmesa/osmesa.pc.in
+	${REINPLACE_CMD} \
+	    -e '/^OSMESA_VERSION=/s|8|9|' \
+	    -e 's|-fno-builtin-memcmp||g' \
+	    ${WRKSRC}/configure.ac
+
+pre-configure:
+#	following line is borrowed from graphics/libGL/bsd.mesalib.mk
+	cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh
 
 do-install:
-	${MKDIR} ${PREFIX}/include/Mesa/GL
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/Mesa/GL
 .for inc in ${INCLUDES}
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${PREFIX}/include/Mesa/GL/
+	${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${STAGEDIR}${PREFIX}/include/Mesa/GL/
 .endfor
-	${INSTALL_DATA} ${SCONS_BUILD_DIR}/mesa/drivers/osmesa/libosmesa.so ${PREFIX}/lib/libOSMesa.so.9
-	${LN} -sf libOSMesa.so.9 ${PREFIX}/lib/libOSMesa.so
-	${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/osmesa/osmesa.pc.in ${PREFIX}/libdata/pkgconfig/osmesa.pc
+	${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/osmesa/.libs/libOSMesa.so.9 ${STAGEDIR}${PREFIX}/lib/
+	${LN} -s libOSMesa.so.9 ${STAGEDIR}${PREFIX}/lib/libOSMesa.so
+	${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/osmesa/osmesa.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/osmesa.pc
 
 .include <bsd.port.post.mk>
diff --git a/graphics/libosmesa/distinfo b/graphics/libosmesa/distinfo
index d0004c69488c..9eb6f1396c0b 100644
--- a/graphics/libosmesa/distinfo
+++ b/graphics/libosmesa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MesaLib-9.2.0.tar.bz2) = 75e6a9bf59fb402f5fbed846be4effafa8a5809229579cd41023b906223a9187
-SIZE (MesaLib-9.2.0.tar.bz2) = 6643026
+SHA256 (MesaLib-9.2.2.tar.bz2) = c78a5035233672844cf2492fe82dc10877e12026be227d04469d6ca6ac656a3d
+SIZE (MesaLib-9.2.2.tar.bz2) = 6664280
diff --git a/graphics/libosmesa/files/patch-scons_custom.py b/graphics/libosmesa/files/patch-scons_custom.py
deleted file mode 100644
index 1e7e2bc2cd63..000000000000
--- a/graphics/libosmesa/files/patch-scons_custom.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- scons/custom.py.orig	2012-10-10 16:32:44.000000000 +0200
-+++ scons/custom.py	2012-10-10 16:32:29.000000000 +0200
-@@ -301,6 +301,8 @@
-     createPkgConfigMethods(env)
-     createParseSourceListMethod(env)
- 
-+    env['LEX'] = '%%LOCALBASE%%/bin/flex'
-+
-     # for debugging
-     #print env.Dump()
- 
diff --git a/graphics/libosmesa/files/patch-scons_gallium.py b/graphics/libosmesa/files/patch-scons_gallium.py
deleted file mode 100644
index 2a17dae8634f..000000000000
--- a/graphics/libosmesa/files/patch-scons_gallium.py
+++ /dev/null
@@ -1,30 +0,0 @@
---- scons/gallium.py.orig	2013-03-20 00:28:25.000000000 +0100
-+++ scons/gallium.py	2013-05-15 09:37:15.000000000 +0200
-@@ -246,11 +246,11 @@
-         cppdefines += ['PROFILE']
-     if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'):
-         cppdefines += [
--            '_POSIX_SOURCE',
--            ('_POSIX_C_SOURCE', '199309L'),
--            '_SVID_SOURCE',
--            '_BSD_SOURCE',
--            '_GNU_SOURCE',
-+#            '_POSIX_SOURCE',
-+#            ('_POSIX_C_SOURCE', '199309L'),
-+#            '_SVID_SOURCE',
-+#            '_BSD_SOURCE',
-+#            '_GNU_SOURCE',
-             'HAVE_PTHREAD',
-             'HAVE_POSIX_MEMALIGN',
-         ]
-@@ -501,7 +501,9 @@
-     # Default libs
-     libs = []
-     if env['platform'] in ('darwin', 'freebsd', 'linux', 'posix', 'sunos'):
--        libs += ['m', 'pthread', 'dl']
-+        libs += ['m', 'pthread']
-+        if env['platform'] != 'freebsd':
-+            libs += ['dl']
-     if env['platform'] in ('linux',):
-         libs += ['rt']
-     env.Append(LIBS = libs)
diff --git a/graphics/libosmesa/files/patch-src-gallium-include-pipe_p_config.h b/graphics/libosmesa/files/patch-src-gallium-include-pipe_p_config.h
deleted file mode 100644
index ddc9198d7afe..000000000000
--- a/graphics/libosmesa/files/patch-src-gallium-include-pipe_p_config.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gallium/include/pipe/p_config.h.orig	2012-03-06 13:42:46.000000000 +0100
-+++ src/gallium/include/pipe/p_config.h	2012-03-06 13:43:21.000000000 +0100
-@@ -120,12 +120,12 @@
- # define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
- #include <machine/endian.h>
- 
--#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
-+#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN || _BYTE_ORDER == _LITTLE_ENDIAN
- # define PIPE_ARCH_LITTLE_ENDIAN
--#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
-+#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN || _BYTE_ORDER == _BIG_ENDIAN
- # define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
diff --git a/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am b/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am
new file mode 100644
index 000000000000..6fb2bf4048c2
--- /dev/null
+++ b/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am
@@ -0,0 +1,18 @@
+--- src/mesa/drivers/osmesa/Makefile.am.orig	2013-10-25 09:57:56.000000000 +0200
++++ src/mesa/drivers/osmesa/Makefile.am	2013-10-25 09:58:02.000000000 +0200
+@@ -49,15 +49,5 @@
+ 	$(GLAPI_LIB) \
+ 	$(OSMESA_LIB_DEPS)
+ 
+-if BUILD_SHARED
+-# Provide compatibility with scripts for the old Mesa build system for
+-# a while by putting a link to the driver into /lib of the build tree.
+-all-local: lib@OSMESA_LIB@.la
+-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+-	ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
+-	ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
+-	ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@.0.0 $(top_builddir)/$(LIB_DIR)/
+-endif
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = osmesa.pc
diff --git a/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in b/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in
new file mode 100644
index 000000000000..431254439c2c
--- /dev/null
+++ b/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in
@@ -0,0 +1,16 @@
+--- src/mesa/drivers/osmesa/Makefile.in.orig	2013-10-25 09:57:15.000000000 +0200
++++ src/mesa/drivers/osmesa/Makefile.in	2013-10-25 09:57:24.000000000 +0200
+@@ -879,13 +879,6 @@
+ 	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
+ 
+ 
+-# Provide compatibility with scripts for the old Mesa build system for
+-# a while by putting a link to the driver into /lib of the build tree.
+-@BUILD_SHARED_TRUE@all-local: lib@OSMESA_LIB@.la
+-@BUILD_SHARED_TRUE@	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+-@BUILD_SHARED_TRUE@	ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
+-@BUILD_SHARED_TRUE@	ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
+-@BUILD_SHARED_TRUE@	ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@.0.0 $(top_builddir)/$(LIB_DIR)/
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/libosmesa/files/patch-ws_dri.txt b/graphics/libosmesa/files/patch-ws_dri.txt
deleted file mode 100644
index a6b70710eda2..000000000000
--- a/graphics/libosmesa/files/patch-ws_dri.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/gallium/winsys/sw/dri/SConscript
-@@ -4,7 +4,7 @@
- 
- Import('*')
- 
--if env['platform'] in ('linux', 'sunos'):
-+if env['platform'] in ('freebsd', 'linux', 'sunos'):
- 
-     env = env.Clone()
-