Date: Fri, 25 Oct 2013 15:54:53 +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: r331603 - in head/graphics/libosmesa: . files Message-ID: <201310251554.r9PFsrSo022718@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Oct 25 15:54:53 2013 New Revision: 331603 URL: http://svnweb.freebsd.org/changeset/ports/331603 Log: - Update to 9.2.2 ChangeLogs: http://www.mesa3d.org/relnotes/9.2.1.html http://www.mesa3d.org/relnotes/9.2.2.html Added: head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am (contents, props changed) head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in (contents, props changed) Deleted: head/graphics/libosmesa/files/patch-scons_custom.py head/graphics/libosmesa/files/patch-scons_gallium.py head/graphics/libosmesa/files/patch-src-gallium-include-pipe_p_config.h head/graphics/libosmesa/files/patch-ws_dri.txt Modified: head/graphics/libosmesa/Makefile head/graphics/libosmesa/distinfo Modified: head/graphics/libosmesa/Makefile ============================================================================== --- head/graphics/libosmesa/Makefile Fri Oct 25 15:52:40 2013 (r331602) +++ head/graphics/libosmesa/Makefile Fri Oct 25 15:54:53 2013 (r331603) @@ -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> Modified: head/graphics/libosmesa/distinfo ============================================================================== --- head/graphics/libosmesa/distinfo Fri Oct 25 15:52:40 2013 (r331602) +++ head/graphics/libosmesa/distinfo Fri Oct 25 15:54:53 2013 (r331603) @@ -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 Added: head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am Fri Oct 25 15:54:53 2013 (r331603) @@ -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 Added: head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in Fri Oct 25 15:54:53 2013 (r331603) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310251554.r9PFsrSo022718>