From owner-svn-ports-all@FreeBSD.ORG Sun Sep 29 17:01:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 13448D0C; Sun, 29 Sep 2013 17:01:49 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0CA92EAF; Sun, 29 Sep 2013 17:01:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8TH1m4J021880; Sun, 29 Sep 2013 17:01:48 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8TH1gNv021817; Sun, 29 Sep 2013 17:01:42 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201309291701.r8TH1gNv021817@svn.freebsd.org> From: Niclas Zeising Date: Sun, 29 Sep 2013 17:01:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328711 - in head: . Mk astro/viking cad/pdnmesh cad/repsnapper deskutils/pinot devel/xorg-macros emulators/catapult emulators/qemu-devel emulators/tme games/klavaro games/sea-defender ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2013 17:01:49 -0000 Author: zeising Date: Sun Sep 29 17:01:41 2013 New Revision: 328711 URL: http://svnweb.freebsd.org/changeset/ports/328711 Log: The FreeBSD graphics/x11 team proudly presents a kwm, zeising production: MESA 9.1.6 Starring: Mesa 9.1.6, including libGL, libGLU and dri (new xorg only) Addition of libEGL and libglesv2 KMS support for ATI graphics cards in 10-current (new xorg only) Improved sparc64 support for new xorg. [1] pixman 0.30.2, including shlib bump and portrevision bumps libX11 1.6.2 Make absolute pointing devices work with x11-drivers/xf86-input-mouse x11-drivers/xf86-video-ati 7.2.0 for 10-current (KMS aware ati driver) Also starring: Updates to drivers and other libraries and utilities Additional notes: When updating MESA related ports (libGL, dri) you need to remove old versions first. See UPDATING for details. PR: ports/181962 [2] Submitted by: marius [1] zeising [2] Exp-run by: bdrewery Approved by: portmgr (bdrewery) Thanks to all who helped testing! Added: head/games/sea-defender/files/extra-snoutlib_gldefs.h (contents, props changed) head/graphics/libEGL/ head/graphics/libEGL/Makefile (contents, props changed) head/graphics/libEGL/pkg-descr (contents, props changed) head/graphics/libEGL/pkg-plist (contents, props changed) head/graphics/libGL/files-old/ head/graphics/libGL/files-old/patch-configure - copied unchanged from r326722, head/graphics/libGL/files/extra-configure-old head/graphics/libGL/files-old/patch-mach64_context.h - copied unchanged from r326722, head/graphics/libGL/files/extra-mach64_context.h-old head/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S - copied unchanged from r326722, head/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S head/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S - copied unchanged from r326722, head/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S head/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S - copied unchanged from r326722, head/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S head/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S - copied unchanged from r326722, head/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S head/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c - copied unchanged from r326722, head/graphics/libGL/files/extra-src_glx_x11_XF86dri.c head/graphics/libGL/files-old/patch-src_mesa_Makefile - copied, changed from r326722, head/graphics/libGL/files/patch-src_mesa_Makefile head/graphics/libGL/files/patch-configure - copied, changed from r328709, head/graphics/libGL/files/extra-configure head/graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp - copied unchanged from r326722, head/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp head/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h - copied unchanged from r326722, head/graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h head/graphics/libGL/files/patch-src_egl_main_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (contents, props changed) head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (contents, props changed) head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (contents, props changed) head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c (contents, props changed) head/graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp (contents, props changed) head/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c (contents, props changed) head/graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c (contents, props changed) head/graphics/libGL/files/patch-src_glx_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (contents, props changed) head/graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src_mesa_main_compiler.h (contents, props changed) head/graphics/libglesv2/ head/graphics/libglesv2/Makefile (contents, props changed) head/graphics/libglesv2/pkg-descr (contents, props changed) head/graphics/libglesv2/pkg-plist (contents, props changed) head/multimedia/bangarang/files/ head/multimedia/bangarang/files/patch-src_platform_infofetchers_lastfminfofetcher.cpp (contents, props changed) head/multimedia/bangarang/files/patch-src_platform_infofetchers_tmdbinfofetcher.cpp (contents, props changed) head/multimedia/bangarang/files/patch-src_platform_infofetchers_tvdbinfofetcher.cpp (contents, props changed) head/multimedia/libva-vdpau-driver/files/patch-src-utils_glx.h (contents, props changed) head/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (contents, props changed) head/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (contents, props changed) head/x11-servers/xorg-server/files/extra-config_devd.c (contents, props changed) head/x11-servers/xorg-server/files/extra-configure (contents, props changed) Deleted: head/graphics/libGL/files/extra-configure head/graphics/libGL/files/extra-configure-old head/graphics/libGL/files/extra-mach64_context.h-old head/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp head/graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h head/graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c head/graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c head/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S head/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S head/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S head/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S head/graphics/libGL/files/extra-src_glx_XF86dri.c head/graphics/libGL/files/extra-src_glx_x11_XF86dri.c head/graphics/libGL/files/patch-src_mesa_Makefile head/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h Modified: head/Mk/bsd.port.mk head/UPDATING head/astro/viking/Makefile head/cad/pdnmesh/Makefile head/cad/repsnapper/Makefile head/deskutils/pinot/Makefile head/devel/xorg-macros/Makefile head/devel/xorg-macros/distinfo head/emulators/catapult/Makefile head/emulators/qemu-devel/Makefile head/emulators/tme/Makefile head/games/klavaro/Makefile head/games/sea-defender/Makefile head/graphics/Makefile head/graphics/cairo/Makefile head/graphics/dri/Makefile head/graphics/dri/pkg-plist head/graphics/libGL/Makefile head/graphics/libGL/bsd.mesalib.mk head/graphics/libGL/distinfo head/graphics/libGL/pkg-plist head/graphics/libGLw/Makefile head/graphics/libdrm/Makefile head/graphics/libdrm/pkg-plist head/graphics/libreatlas/Makefile head/multimedia/freetuxtv/Makefile head/multimedia/libva-intel-driver/Makefile head/net/cvsup/Makefile head/net/tigervnc/Makefile head/print/photoprint/Makefile head/sysutils/gtk-imonc/Makefile head/sysutils/nitrogen/Makefile head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c head/x11-drivers/xf86-input-synaptics/Makefile head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-ati/distinfo head/x11-drivers/xf86-video-ati/pkg-plist head/x11-drivers/xf86-video-fbdev/Makefile head/x11-drivers/xf86-video-fbdev/distinfo head/x11-drivers/xf86-video-intel/Makefile head/x11-drivers/xf86-video-intel/distinfo head/x11-drivers/xf86-video-intel/files/extra-clang head/x11-drivers/xf86-video-intel/files/extra-i915kms head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c head/x11-drivers/xf86-video-vesa/Makefile head/x11-drivers/xf86-video-vesa/distinfo head/x11-drivers/xorg-drivers/Makefile head/x11-fonts/xfs/Makefile head/x11-servers/xephyr/Makefile head/x11-servers/xorg-dmx/Makefile head/x11-servers/xorg-nestserver/Makefile head/x11-servers/xorg-server/Makefile head/x11-themes/gtk-murrine-engine/Makefile head/x11-toolkits/gtkglext/Makefile head/x11-toolkits/libXaw/Makefile head/x11-toolkits/libXaw/distinfo head/x11-toolkits/libXmu/Makefile head/x11-toolkits/libXmu/distinfo head/x11-wm/awesome/Makefile head/x11-wm/jewel/files/patch-Makefile head/x11/libSM/Makefile head/x11/libSM/distinfo head/x11/libX11/Makefile head/x11/libX11/distinfo head/x11/libX11/pkg-plist head/x11/libXpm/Makefile head/x11/libXpm/distinfo head/x11/libXrandr/Makefile head/x11/libXrandr/distinfo head/x11/libXv/Makefile head/x11/libXv/distinfo head/x11/libxcb/Makefile head/x11/pixman/Makefile head/x11/pixman/distinfo head/x11/pixman/pkg-plist head/x11/xinput/Makefile head/x11/xinput/distinfo head/x11/xkeyboard-config/Makefile head/x11/xorg-cf-files/Makefile head/x11/xtrans/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Sep 29 17:01:28 2013 (r328710) +++ head/Mk/bsd.port.mk Sun Sep 29 17:01:41 2013 (r328711) @@ -358,7 +358,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # MAKE_ENV are extended with a DISPLAY variable. # # USE_GL - A list of Mesa or GL related dependencies needed by the port. -# Supported components are: glut, glu, glw, and gl. +# Supported components are: egl, glesv2, glut, glu, glw, and gl. # If set to "yes", this is equivalent to "glu". Note that # glew and glut depend on glu, glw and glu depend on gl. ## @@ -1892,13 +1892,15 @@ MAKE_ENV+= DISPLAY="localhost:1001" PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' -_GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL +_GL_glesv2_LIB_DEPENDS= libGLESv2.so:${PORTSDIR}/grahpics/libglesv2 +_GL_egl_LIB_DEPENDS= libEGL.so:${PORTSDIR}/graphics/libEGL +_GL_gl_LIB_DEPENDS= libGL.so:${PORTSDIR}/graphics/libGL _GL_gl_USE_XORG= glproto dri2proto -_GL_glew_LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew -_GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU +_GL_glew_LIB_DEPENDS= libGLEW.so:${PORTSDIR}/graphics/glew +_GL_glu_LIB_DEPENDS= libGLU.so:${PORTSDIR}/graphics/libGLU _GL_glu_USE_XORG= glproto dri2proto -_GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS= glut.12:${PORTSDIR}/graphics/freeglut +_GL_glw_LIB_DEPENDS= libGLw.so:${PORTSDIR}/graphics/libGLw +_GL_glut_LIB_DEPENDS= libglut.so:${PORTSDIR}/graphics/freeglut .if defined(USE_GL) . if ${USE_GL:L} == "yes" Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Sep 29 17:01:28 2013 (r328710) +++ head/UPDATING Sun Sep 29 17:01:41 2013 (r328711) @@ -5,6 +5,34 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +201309xx: + AFFECTS: users of x11/pixman + AUTHOR: zeising@FreeBSD.org + + The library version of x11/pixman has changed, and portrevision has + been bumped in all dependent ports. If you have external software that + depends on pixman, this software needs to be recompiled. + To recompile all software dependent on pixman, run: + + # portmaster -r pixman + or + # portupgrade -rf pixman + +201309xx: + AFFECTS: users of graphics/libGL, graphics/dri and other MESA ports + AUTHOR: zeising@FreeBSD.org + + The graphics/libGL, graphics/dri and related MESA ports have been + updated to 9.1 when compiled with WITH_NEW_XORG= set. It is necessary + to remove the old versions of both ports before updating. + + # pkg_delete -f libGl-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + +======= 20130925 AFFECTS: Users of print/qpdf AUTHOR: d.y.kazarov@mail.ru @@ -623,7 +651,7 @@ you update your ports collection, before settings in rc.conf prior to restarting postgrey. 20130525: - AFFECTS: users of x11/xorg and all X.Org ports + AFFECTS: users of x11/xorg and all xorg ports AUTHOR: zeising@FreeBSD.org X.Org, including libraries and some drivers, was updated. If you are Modified: head/astro/viking/Makefile ============================================================================== --- head/astro/viking/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/astro/viking/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,6 +3,7 @@ PORTNAME= viking PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ Modified: head/cad/pdnmesh/Makefile ============================================================================== --- head/cad/pdnmesh/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/cad/pdnmesh/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,7 +3,7 @@ PORTNAME= pdnmesh PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} Modified: head/cad/repsnapper/Makefile ============================================================================== --- head/cad/repsnapper/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/cad/repsnapper/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,6 +3,7 @@ PORTNAME= repsnapper PORTVERSION= 2.2.0b3 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= https://codeload.github.com/timschmidt/repsnapper/tar.gz/ DISTNAME= ${PORTVERSION} Modified: head/deskutils/pinot/Makefile ============================================================================== --- head/deskutils/pinot/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/deskutils/pinot/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,7 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ Modified: head/devel/xorg-macros/Makefile ============================================================================== --- head/devel/xorg-macros/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/devel/xorg-macros/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xorg-macros -PORTVERSION= 1.17 +PORTVERSION= 1.17.1 CATEGORIES= devel x11 DISTNAME= util-macros-$(PORTVERSION) Modified: head/devel/xorg-macros/distinfo ============================================================================== --- head/devel/xorg-macros/distinfo Sun Sep 29 17:01:28 2013 (r328710) +++ head/devel/xorg-macros/distinfo Sun Sep 29 17:01:41 2013 (r328711) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed -SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029 +SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) = 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625 +SIZE (xorg/util/util-macros-1.17.1.tar.bz2) = 79105 Modified: head/emulators/catapult/Makefile ============================================================================== --- head/emulators/catapult/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/emulators/catapult/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,7 +3,7 @@ PORTNAME= catapult PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION} DISTNAME= openmsx-${PORTNAME}-${PORTVERSION} @@ -32,8 +32,7 @@ OPTIONS_DEFINE= DEBUG DOCS USE_GNOME= gdkpixbuf2 glib20 gtk20 libxml2 USE_WX= 2.6+ USE_PYTHON_BUILD=yes -USE_GMAKE= yes -USES= gettext iconv +USES= gettext gmake iconv USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \ xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE= GNUmakefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/emulators/qemu-devel/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,7 +3,7 @@ PORTNAME= qemu PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -14,13 +14,12 @@ DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= nox@FreeBSD.org COMMENT= QEMU CPU Emulator - development version -LIB_DEPENDS= pixman-1:${PORTSDIR}/x11/pixman - HAS_CONFIGURE= yes USE_BZIP2= yes USES= gmake pkgconfig bison perl5 USE_PERL5= build USE_PYTHON_BUILD= -2.7 +USE_XORG= pixman USE_GNOME+= glib20 PATCH_STRIP= -p1 MAKE_ENV+= BSD_MAKE="${MAKE}" Modified: head/emulators/tme/Makefile ============================================================================== --- head/emulators/tme/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/emulators/tme/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,7 +3,7 @@ PORTNAME= tme PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://people.csail.mit.edu/fredette/tme/ @@ -21,9 +21,8 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig -USES= pkgconfig gettext iconv perl5 +USES= pkgconfig gettext gmake iconv perl5 USE_GNOME= gdkpixbuf2 gtk20 -USE_GMAKE= yes USE_AUTOTOOLS= libtool libltdl CONFIGURE_ENV= ac_cv_have_isinff=no CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings Modified: head/games/klavaro/Makefile ============================================================================== --- head/games/klavaro/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/games/klavaro/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,6 +3,7 @@ PORTNAME= klavaro PORTVERSION= 1.9.9 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/ Modified: head/games/sea-defender/Makefile ============================================================================== --- head/games/sea-defender/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/games/sea-defender/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -28,6 +28,10 @@ PORTDOCS= README NO_STAGE= yes .include +.if defined(WITH_NEW_XORG) +EXTRA_PATCHES+= ${FILESDIR}/extra-snoutlib_gldefs.h +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sea ${PREFIX}/libexec/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME} Added: head/games/sea-defender/files/extra-snoutlib_gldefs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/sea-defender/files/extra-snoutlib_gldefs.h Sun Sep 29 17:01:41 2013 (r328711) @@ -0,0 +1,11 @@ +--- snoutlib/gldefs.h.orig 2013-09-28 23:51:46.789551906 +0200 ++++ snoutlib/gldefs.h 2013-09-28 23:52:40.941548852 +0200 +@@ -94,7 +94,7 @@ + typedef GLboolean (GLFUNCDEF PFNGLISPROGRAMPROC) (GLuint); + typedef GLboolean (GLFUNCDEF PFNGLISSHADERPROC) (GLuint); + typedef void (GLFUNCDEF PFNGLLINKPROGRAMPROC) (GLuint); +-typedef void (GLFUNCDEF PFNGLSHADERSOURCEPROC) (GLuint, GLsizei, const GLchar* *, const GLint *); ++typedef void (GLFUNCDEF PFNGLSHADERSOURCEPROC) (GLuint, GLsizei, const GLchar* const *, const GLint *); + typedef void (GLFUNCDEF PFNGLUSEPROGRAMPROC) (GLuint); + typedef void (GLFUNCDEF PFNGLUNIFORM1FPROC) (GLint, GLfloat); + typedef void (GLFUNCDEF PFNGLUNIFORM2FPROC) (GLint, GLfloat, GLfloat); Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -484,6 +484,7 @@ SUBDIR += leptonica SUBDIR += lfview SUBDIR += lib3ds + SUBDIR += libEGL SUBDIR += libGL SUBDIR += libGLU SUBDIR += libGLw @@ -505,6 +506,7 @@ SUBDIR += libgeotiff SUBDIR += libgfx SUBDIR += libggi + SUBDIR += libglesv2 SUBDIR += libgltext SUBDIR += libgnomecanvas SUBDIR += libgnomecanvas-reference Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/cairo/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -4,7 +4,7 @@ PORTNAME= cairo PORTVERSION= 1.10.2 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH?= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ Modified: head/graphics/dri/Makefile ============================================================================== --- head/graphics/dri/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/dri/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -9,72 +9,108 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for the DRI -LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 USES= pkgconfig USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto +.include + +# gcc from base can't handle some code in mesa 9.1+ +# We only care for 9.x and 8.x, not for old pre-clang default current. +# This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver. +.if defined(WITH_NEW_XORG) +. if ${OSVERSION} >= 901000 && ${OSVERSION} < 902502 \ + && (${ARCH} == i386 || ${ARCH} == amd64) +CC=clang +CXX=clang++ +CPP=clang-cpp +. elif ${OSVERSION} < 901500 +USE_GCC=yes +. endif +.endif + +.if ${ARCH} == ia64 +#BROKEN= does not install on ia64 +.endif + ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST -.if ! defined(WITH_NEW_XORG) +.if !defined(WITH_NEW_XORG) ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME .endif NO_STAGE= yes .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -OPTIONS_DEFINE_i386= ${ALL_DRI_DRIVERS} -OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +PLIST_SUB+= VERSION=${MESADISTVERSION} -.if defined(WITH_NEW_XORG) -OPTIONS_DEFINE_powerpc= RADEON SWRAST -OPTIONS_DEFINE_sparc64= RADEON SWRAST -.else -OPTIONS_DEFINE_powerpc= MACH64 RADEON SWRAST TDFX -OPTIONS_DEFINE_sparc64= MACH64 RADEON SWRAST +.if ${ARCH} == amd64 || ${ARCH} == i386 +DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif -OPTIONS_DEFAULT=${OPTIONS_DEFINE} - -I810_DESC= Include DRI support for Intel i810 -I915_DESC= Include DRI support for Intel i915 -I965_DESC= Include DRI support for Intel i965 -MACH64_DESC= Include DRI support for AMD/ATI Mach64 -MGA_DESC= Include DRI support for Matrox -R128_DESC= Include DRI support for AMD/ATI R128 -R200_DESC= Include DRI support for AMD/ATI R200 -R300_DESC= Include DRI support for AMD/ATI R300 -R600_DESC= Include DRI support for AMD/ATI R600 -RADEON_DESC= Include DRI support for AMD/ATI RADEON -SAVAGE_DESC= Include DRI support for S3/Via Savage -SIS_DESC= Include DRI support for SiS 300 and 6326 -SWRAST_DESC= Include generic software DRI support -TDFX_DESC= Include DRI support for 3dfx Voodoo -UNICHROME_DESC= Include DRI support for S3/Via Unichrome - -.include +.if defined(WITH_NEW_XORG) +. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) +BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 +RUN_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33 + +CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl + +CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast +PLIST_SUB+= GALLIUM="" +. else +CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers +PLIST_SUB+= GALLIUM="@comment " +. endif +. if ${ARCH} == powerpc || ${ARCH} == ia64 +DRI_DRIVERS= RADEON SWRAST +. endif +. if ${ARCH} == sparc64 +DRI_DRIVERS= SWRAST +. endif +.else # !defined(WITH_NEW_XORG) +. if ${ARCH} == powerpc +DRI_DRIVERS= MACH64 RADEON SWRAST TDFX +. elif ${ARCH} == sparc64 +DRI_DRIVERS= MACH64 RADEON SWRAST +. endif +.endif # defined(WITH_NEW_XORG) -DRI_DRIVERS= .for _d in ${ALL_DRI_DRIVERS} -.if ${PORT_OPTIONS:M${_d}} -DRI_DRIVERS+= ${_d} +.if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" .else PLIST_SUB+= ${_d}_DRIVER="@comment " .endif .endfor -.if ${ARCH} == "ia64" -BROKEN= does not install on ia64 -.endif - -.if !(${ARCH} == "amd64" || ${ARCH} == "i386") +.if !(${ARCH} == amd64 || ${ARCH} == i386) CONFIGURE_ARGS+=--disable-gallium-intel .endif CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}" +.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ + && (${ARCH} == i386 || ${ARCH} == amd64) +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers." + @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" + @${ECHO_MSG} "Note that gallium support is highly experimental." + @${ECHO_MSG} "" +.endif + do-install: +.if !defined(WITH_NEW_XORG) cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri +.else + cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install + cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install +. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) + cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install + cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install +. endif +.endif .include Modified: head/graphics/dri/pkg-plist ============================================================================== --- head/graphics/dri/pkg-plist Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/dri/pkg-plist Sun Sep 29 17:01:41 2013 (r328711) @@ -1,19 +1,38 @@ +%%NEW%%%%I965_DRIVER%%etc/drirc include/GL/internal/dri_interface.h %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so +%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so +%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la %%I965_DRIVER%%lib/dri/i965_dri.so %%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so %%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so %%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so +%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so %%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so %%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so +%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la %%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so %%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so %%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so +%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la %%SWRAST_DRIVER%%lib/dri/swrast_dri.so %%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%NEW%%lib/libdricore%%VERSION%%.la +%%NEW%%lib/libdricore%%VERSION%%.so +%%NEW%%lib/libdricore%%VERSION%%.so.1 +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal Added: head/graphics/libEGL/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libEGL/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -0,0 +1,30 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME= libEGL +PORTVERSION= ${MESAVERSION} +CATEGORIES= graphics + +COMMENT= OpenEGL library + +LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs + +.if ! defined(WITH_NEW_XORG) +IGNORE= Please enable WITH_NEW_XORG, libEGL needs libdrm higher then 2.4.24 +.endif + +USE_XORG= x11 xau xcb xdmcp + +# stuff not needed by libEGL but configure wants it +USE_XORG+= glproto dri2proto xext xdamage xfixes +LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdrm.so:${PORTSDIR}/graphics/libdrm + +BUILD_WKRSRC= ${WRKSRC}/src/egl +INSTALL_WRKSRC= ${WRKSRC}/src/egl + +WITH_NEW_XORG= yes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Added: head/graphics/libEGL/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libEGL/pkg-descr Sun Sep 29 17:01:41 2013 (r328711) @@ -0,0 +1,3 @@ +This package contains the EGL utility library. + +WWW: http://www.freedesktop.org/Software/xorg Added: head/graphics/libEGL/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libEGL/pkg-plist Sun Sep 29 17:01:41 2013 (r328711) @@ -0,0 +1,11 @@ +include/EGL/egl.h +include/EGL/eglext.h +include/EGL/eglmesaext.h +include/EGL/eglplatform.h +include/KHR/khrplatform.h +lib/libEGL.la +lib/libEGL.so +lib/libEGL.so.1 +libdata/pkgconfig/egl.pc +@dirrmtry include/KHR +@dirrmtry include/EGL Modified: head/graphics/libGL/Makefile ============================================================================== --- head/graphics/libGL/Makefile Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/libGL/Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -3,14 +3,13 @@ PORTNAME= libGL PORTVERSION= ${MESAVERSION} -PORTREVISION= 4 +PORTREVISION= ${LIBGLREVISION} CATEGORIES= graphics -MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL library that renders using GLX or DRI -LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+= libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 USES= pkgconfig USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both @@ -18,19 +17,36 @@ USE_XORG= glproto x11 xext xxf86vm xdama SUB_FILES= pkg-install pkg-deinstall NO_STAGE= yes +.include + +.if defined(WITH_NEW_XORG) +LIBGLREVISION= 0 +.else +LIBGLREVISION= 4 +.endif + do-install: +.if ! defined(WITH_NEW_XORG) ${RM} -f ${WRKSRC}/include/GL/glu*.h + @${MKDIR} ${PREFIX}/lib/.libGL cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +.else + cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA + cd ${WRKSRC}/src/glx; ${GMAKE} install + ${MKDIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/ + @${MKDIR} ${PREFIX}/lib/.libGL + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/ + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/ +.endif post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include "${.CURDIR}/bsd.mesalib.mk" -.include - .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel .endif -.include +.include Modified: head/graphics/libGL/bsd.mesalib.mk ============================================================================== --- head/graphics/libGL/bsd.mesalib.mk Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/libGL/bsd.mesalib.mk Sun Sep 29 17:01:41 2013 (r328711) @@ -1,16 +1,12 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=4 -# -# bsd.mesa.mk - an attempt to refactor MesaLib ports. -# -# Created by: Florent Thoumie +# bsd.mesalib.mk - shared code between MesaLib ports. # # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION: # +# - graphics/libEGL # - graphics/libGL -# - graphics/libGLU +# - grahpics/libglesv2 # - graphics/dri # # $FreeBSD$ @@ -21,7 +17,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUB MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_XORG) -MESABASEVERSION= 8.0.5 +MESABASEVERSION= 9.1.6 # if there is a subversion, include the '-' between 7.11-rc2 for example. MESASUBVERSION= PLIST_SUB+= OLD="@comment " NEW="" @@ -35,64 +31,80 @@ MASTER_SITES= ftp://ftp.freedesktop.org/ DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?= x11@FreeBSD.org -# HACK: added lang/python as build dependency - we need to check, which -# python versions are cleanly supported by Mesa BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ - python:${PORTSDIR}/lang/python \ + python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 -USES+= bison -USE_PYTHON_BUILD=yes +USES= bison gmake pathfix pkgconfig shebangfix +USE_PYTHON_BUILD=-2.7 USE_BZIP2= yes -USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ - --disable-egl -.if defined(WITH_NEW_XORG) -EXTRA_PATCHES+= ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ - ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c \ - ${PATCHDIR}/extra-src_glx_XF86dri.c -.else -EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \ - ${PATCHDIR}/extra-mach64_context.h-old \ - ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \ - ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ - ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ - ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S \ - ${PATCHDIR}/extra-src_glx_x11_XF86dri.c -CONFIGURE_ARGS+=--disable-glut --disable-glw +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex .endif +.if defined(WITH_NEW_XORG) +USE_AUTOTOOLS= autoconf:env automake:env libtool:env +# probably be shared lib, and in it own port. +CONFIGURE_ARGS+= --enable-shared-glapi=no +# we need to reapply these patches because we doing wierd stuff with autogen +REAPPLY_PATCHES= \ + ${PATCHDIR}/patch-configure \ + ${PATCHDIR}/patch-src_egl_main_Makefile.in \ + ${PATCHDIR}/patch-src_glx_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in + +python_OLD_CMD= "/usr/bin/env[[:space:]]python" +python_CMD= ${LOCALBASE}/bin/python2 +SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ + src/gallium/drivers/svga/svgadump/svga_dump.py \ + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ + src/mapi/mapi/mapi_abi.py +.else +CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu + ALL_TARGET= default +.endif MASTERDIR= ${.CURDIR}/../../graphics/libGL +.if defined(WITH_NEW_XORG) PATCHDIR= ${MASTERDIR}/files +.else +PATCHDIR= ${MASTERDIR}/files-old +.endif DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION} -.if !defined(ARCH) -ARCH!= uname -p -.endif - COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} -.if ${COMPONENT:Mglu} == "" -CONFIGURE_ARGS+= --disable-glu +.if ${COMPONENT:Mglesv2} == "" +CONFIGURE_ARGS+= --disable-gles2 +.else +CONFIGURE_ARGS+= --enable-gles2 +.endif + +.if ${COMPONENT:Megl} == "" +CONFIGURE_ARGS+= --disable-egl +.else +CONFIGURE_ARGS+= --enable-egl .endif .if ${COMPONENT:Mdri} == "" -CONFIGURE_ARGS+= --with-dri-drivers=no +CONFIGURE_ARGS+=--with-dri-drivers=no +CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers .else -CONFIGURE_ARGS+= --with-dri-drivers="i915,i965,r200,radeon,swrast" +# done in the dri port .endif .if !defined(WITH_NEW_XORG) @@ -106,8 +118,35 @@ CONFIGURE_ARGS+= --enable-xcb post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c +.if !defined(WITH_NEW_XORG) @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile +.else + @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ + ${WRKSRC}/src/glsl/builtins/tools/*.py + @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' \ + ${WRKSRC}/src/mesa/main/get_hash_generator.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \ + +.endif + +pre-configure: +# workaround for stupid rerunning configure in do-build step +# xxx +.if defined(WITH_NEW_XORG) + cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh +. for file in ${REAPPLY_PATCHES} + @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} +. endfor +# make sure the pkg-config files are installed in the correct place. +# this was reverted by running autogen.sh + @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; +.endif Modified: head/graphics/libGL/distinfo ============================================================================== --- head/graphics/libGL/distinfo Sun Sep 29 17:01:28 2013 (r328710) +++ head/graphics/libGL/distinfo Sun Sep 29 17:01:41 2013 (r328711) @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e -SIZE (MesaLib-8.0.5.tar.bz2) = 5734571 +SHA256 (MesaLib-9.1.6.tar.bz2) = e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d +SIZE (MesaLib-9.1.6.tar.bz2) = 6134267 Copied: head/graphics/libGL/files-old/patch-configure (from r326722, head/graphics/libGL/files/extra-configure-old) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-configure Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-configure-old) @@ -0,0 +1,43 @@ +--- configure.orig 2009-12-22 03:31:30.000000000 +0100 ++++ configure 2012-06-27 19:49:26.000000000 +0200 +@@ -6946,12 +6946,35 @@ + CXXFLAGS="$CXXFLAGS -ansi -pedantic" + fi + +- # ffb and gamma are missing because they have not been converted +- # to use the new interface. +- if test "x$DRI_DIRS" = "xyes"; then +- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where it ++ # could *ever* be used. ++ if test "x$DRI_DIRS" = "xyes"; then ++ DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ + unichrome savage sis swrast" +- fi ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" = "xyes"; then ++ DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ ++ unichrome savage sis swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" = "xyes"; then ++ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" = "xyes"; then ++ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast" ++ fi ++ ;; ++ esac + ;; + gnu*) + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" Copied: head/graphics/libGL/files-old/patch-mach64_context.h (from r326722, head/graphics/libGL/files/extra-mach64_context.h-old) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-mach64_context.h Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-mach64_context.h-old) @@ -0,0 +1,20 @@ +--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:32.000000000 +0200 ++++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000000000 +0200 +@@ -294,11 +294,14 @@ + #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0) + #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) = (y); } while (0) + #else +-#ifndef __OpenBSD__ +-#include +-#else ++#if defined(__OpenBSD__) + #include + #define bswap_32 bswap32 ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32 bswap32 ++#else ++#include + #endif + + #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Copied: head/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (from r326722, head/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S) @@ -0,0 +1,12 @@ +--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100 +@@ -73,7 +73,8 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax ++ movl (%rax), %edi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) Copied: head/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (from r326722, head/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S) @@ -0,0 +1,74 @@ +--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 ++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 +@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: + * rdx = source + */ + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -116,7 +116,7 @@ p4_constants: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 +-.float 0f+1.0 ++.float 1.0 + + .text + .align 16 +@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: + movaps 16(%rax), %xmm10 + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -195,7 +195,7 @@ p4_3d_done: + _mesa_x86_64_transform_points4_identity: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -223,7 +223,7 @@ p4_identity_done: + _mesa_3dnow_transform_points4_3d_no_rot: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -287,7 +287,7 @@ p4_3d_no_rot_done: + _mesa_3dnow_transform_points4_perspective: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -353,7 +353,7 @@ p4_perspective_done: + _mesa_3dnow_transform_points4_2d_no_rot: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -408,7 +408,7 @@ p4_2d_no_rot_done: + _mesa_3dnow_transform_points4_2d: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ Copied: head/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (from r326722, head/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 +@@ -47,7 +47,7 @@ + #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) + + #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) +-#define GLOBL_FN(x) GLOBL x ; .type x, function ++#define GLOBL_FN(x) GLOBL x ; .type x, @function + #else + #define GLOBL_FN(x) GLOBL x + #endif Copied: head/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (from r326722, head/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200 ++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100 +@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: + testl $0x01, %ecx + je .L01 + +- movzxw (%eax), %ecx ++ movzwl (%eax), %ecx + movd %ecx, %mm4 + + pshufw $0x00, %mm4, %mm0 Copied: head/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (from r326722, head/graphics/libGL/files/extra-src_glx_x11_XF86dri.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c Sun Sep 29 17:01:41 2013 (r328711, copy of r326722, head/graphics/libGL/files/extra-src_glx_x11_XF86dri.c) @@ -0,0 +1,38 @@ +--- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 ++++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 +@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + #include + #include + #include "xf86dristr.h" ++#include + + + #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 +@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int + } + + if (rep.length) { +- if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) { ++ if (rep.busIdStringLength < INT_MAX) ++ *busIdString = Xcalloc(rep.busIdStringLength + 1, 1); ++ else ++ *busIdString = NULL; ++ if (*busIdString == NULL) { + _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); +@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy + *ddxDriverPatchVersion = rep.ddxDriverPatchVersion; + + if (rep.length) { +- if (! +- (*clientDriverName = +- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { ++ if (rep.clientDriverNameLength < INT_MAX) ++ *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1); ++ else ++ *clientDriverName = NULL; ++ if (*clientDriverName == NULL) { + _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); Copied and modified: head/graphics/libGL/files-old/patch-src_mesa_Makefile (from r326722, head/graphics/libGL/files/patch-src_mesa_Makefile) ============================================================================== --- head/graphics/libGL/files/patch-src_mesa_Makefile Sun Sep 8 12:35:41 2013 (r326722, copy source) +++ head/graphics/libGL/files-old/patch-src_mesa_Makefile Sun Sep 29 17:01:41 2013 (r328711) @@ -1,6 +1,6 @@ ---- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 -+++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***