Date: Mon, 14 Jan 2013 16:39:47 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310395 - in head/graphics/libosmesa: . files Message-ID: <201301141639.r0EGdlUZ049003@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Jan 14 16:39:46 2013 New Revision: 310395 URL: http://svnweb.freebsd.org/changeset/ports/310395 Log: - Update to 9.0.1 Release notes: * 9.0 http://www.mesa3d.org/relnotes-9.0.html * 9.0.1 http://www.mesa3d.org/relnotes-9.0.1.html - This update includes the switch from autotools to SCons Added: head/graphics/libosmesa/files/patch-scons_custom.py (contents, props changed) head/graphics/libosmesa/files/patch-scons_gallium.py (contents, props changed) Deleted: head/graphics/libosmesa/files/patch-configure head/graphics/libosmesa/files/patch-src-glu_Makefile head/graphics/libosmesa/files/patch-src-mesa_Makefile Modified: head/graphics/libosmesa/Makefile head/graphics/libosmesa/distinfo head/graphics/libosmesa/pkg-plist (contents, props changed) Modified: head/graphics/libosmesa/Makefile ============================================================================== --- head/graphics/libosmesa/Makefile Mon Jan 14 16:08:57 2013 (r310394) +++ head/graphics/libosmesa/Makefile Mon Jan 14 16:39:46 2013 (r310395) @@ -1,12 +1,8 @@ -# New ports collection makefile for: libosmesa -# Date created: 9 April 2010 -# Whom: gahr -# +# Created by: gahr # $FreeBSD$ -# PORTNAME= libosmesa -PORTVERSION= 8.0.4 +PORTVERSION= 9.0.1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/ DISTNAME= MesaLib-${PORTVERSION} @@ -14,28 +10,60 @@ DISTNAME= MesaLib-${PORTVERSION} MAINTAINER= gahr@FreeBSD.org COMMENT= Off-Screen Mesa implementation of the OpenGL API -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - talloc.2:${PORTSDIR}/devel/talloc -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - bison:${PORTSDIR}/devel/bison \ +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 CONFLICTS= mesagl-mangled-* USE_BZIP2= yes -USE_GCC= 4.2+ USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack USE_PYTHON= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-driver=osmesa --with-osmesa-bits=32 \ - --with-gallium-drivers= --disable-asm \ - --disable-egl \ - --includedir=${PREFIX}/include/Mesa -CFLAGS+= -I${LOCALBASE}/include -fPIC -CPPFLAGS= ${CFLAGS} +USE_SCONS= yes +SCONS_TARGET= osmesa +SCONS_ARGS+= build=release \ + verbose=yes +CCFLAGS+= -I${LOCALBASE}/include + +MAKE_JOBS_UNSAFE= WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.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 +.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 + +do-install: + ${MKDIR} ${PREFIX}/include/Mesa/GL +.for inc in ${INCLUDES} + ${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${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 + +.include <bsd.port.post.mk> Modified: head/graphics/libosmesa/distinfo ============================================================================== --- head/graphics/libosmesa/distinfo Mon Jan 14 16:08:57 2013 (r310394) +++ head/graphics/libosmesa/distinfo Mon Jan 14 16:39:46 2013 (r310395) @@ -1,2 +1,2 @@ -SHA256 (MesaLib-8.0.4.tar.bz2) = 02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e -SIZE (MesaLib-8.0.4.tar.bz2) = 5737052 +SHA256 (MesaLib-9.0.1.tar.bz2) = 57a7ba83bace3f3a7dc0929fe026ef5f0ad454234ec4ad8a3e0d31650a75db6f +SIZE (MesaLib-9.0.1.tar.bz2) = 6115959 Added: head/graphics/libosmesa/files/patch-scons_custom.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libosmesa/files/patch-scons_custom.py Mon Jan 14 16:39:46 2013 (r310395) @@ -0,0 +1,11 @@ +--- 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() + Added: head/graphics/libosmesa/files/patch-scons_gallium.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libosmesa/files/patch-scons_gallium.py Mon Jan 14 16:39:46 2013 (r310395) @@ -0,0 +1,30 @@ +--- scons/gallium.py.orig 2012-11-09 19:16:31.000000000 +0100 ++++ scons/gallium.py 2013-01-14 17:25:58.000000000 +0100 +@@ -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', + ] +@@ -499,7 +499,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'] + env.Append(LIBS = libs) + + # OpenMP Modified: head/graphics/libosmesa/pkg-plist ============================================================================== --- head/graphics/libosmesa/pkg-plist Mon Jan 14 16:08:57 2013 (r310394) +++ head/graphics/libosmesa/pkg-plist Mon Jan 14 16:39:46 2013 (r310395) @@ -1,20 +1,14 @@ include/Mesa/GL/gl.h include/Mesa/GL/gl_mangle.h include/Mesa/GL/glext.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/osmesa.h -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/libOSMesa32.so.8 +lib/libOSMesa.so +lib/libOSMesa.so.9 libdata/pkgconfig/osmesa.pc -libdata/pkgconfig/osglu.pc @dirrm include/Mesa/GL @dirrm include/Mesa
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301141639.r0EGdlUZ049003>