summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libGL/Makefile3
-rw-r--r--graphics/libGL/bsd.mesalib.mk43
-rw-r--r--graphics/libGL/distinfo4
-rw-r--r--graphics/libGLU/Makefile2
-rw-r--r--graphics/libGLU/distinfo4
-rw-r--r--graphics/libGLw/Makefile2
-rw-r--r--graphics/libGLw/distinfo4
-rw-r--r--graphics/libglut/Makefile2
-rw-r--r--graphics/libglut/distinfo8
9 files changed, 23 insertions, 49 deletions
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 83198ab..4093fc1 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -2,7 +2,7 @@
# Date created: 7 May 2004
# Whom: anholt@FreeBSD.org
#
-# $FreeBSD: ports/graphics/libGL/Makefile,v 1.17 2011/02/25 16:52:06 miwi Exp $
+# $FreeBSD$
#
PORTNAME= libGL
@@ -16,6 +16,7 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \
expat.6:${PORTSDIR}/textproc/expat2
+USE_BISON= build
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
USE_PYTHON= yes
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 13f06a9..ad496cb 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -21,31 +21,22 @@
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-.ifdef WITHOUT_NOUVEAU
-BROKEN= please unset WITHOUT_NOUVEAU, support for this isn't there yet.
-MESABASEVERSION= 7.6.1
+MESABASEVERSION= 7.10.3
MESASUBVERSION=
-PLIST_SUB+= MESALIB76= MESALIB74="@comment "
-.else
-MESABASEVERSION= 7.10.1
-MESASUBVERSION=
-PLIST_SUB+= MESALIB74= MESALIB76="@comment "
-#EXTRA_PATCHES+= ${PATCHDIR}/mesalib74-configure
-.endif
-MASTER_SITES?= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut,demos
-MASTER_SITE_SUBDIR= mesa3d
-DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
+MASTER_SITES= LOCAL/kwm:mesa,glut
+DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
MAINTAINER?= x11@FreeBSD.org
-USE_BZIP2= yes
-USE_GMAKE= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-gallium
ALL_TARGET= default
@@ -57,12 +48,6 @@ WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}
ARCH!= uname -p
.endif
-.if ${ARCH} == alpha
-FAST_MATH=
-.else
-FAST_MATH= -ffast-math
-.endif
-
COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//}
.if ${COMPONENT:Mglut} == ""
@@ -81,12 +66,7 @@ CONFIGURE_ARGS+= --disable-glw
CONFIGURE_ARGS+= --enable-motif
.endif
-.if ${COMPONENT:Mdemos} == ""
CONFIGURE_ARGS+= --with-demos=no
-.else
-DISTFILES+= MesaDemos-${MESADISTVERSION}${EXTRACT_SUFX}:demos
-CONFIGURE_ARGS+= --with-demos=demos,xdemos
-.endif
.if ${COMPONENT:Mdri} == ""
CONFIGURE_ARGS+= --with-dri-drivers=no
@@ -110,10 +90,3 @@ post-patch:
@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/src/glut/glx/Makefile
.endif
-.if ${COMPONENT:Mdemos} != ""
- @${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
- -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
- -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
- -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
- ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
-.endif
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index c8cd81c..868bf87 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MesaLib-7.10.1.tar.bz2) = 9f4c67b212d9ecb83819e76645cecbebafbbfd6cb76290d0c2ea9f5ad9507390
-SIZE (MesaLib-7.10.1.tar.bz2) = 5866217
+SHA256 (MesaLib-7.10.3.tar.bz2) = a612fce124a0ddb31c9047bb8cfdf1a9c84fd8df5023f8f692eecafcf9ecf4d6
+SIZE (MesaLib-7.10.3.tar.bz2) = 6466724
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 65ae244..e82c5d8 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -2,7 +2,7 @@
# Date created: 7 May 2004
# Whom: anholt@FreeBSD.org
#
-# $FreeBSD: ports/graphics/libGLU/Makefile,v 1.14 2011/02/25 16:52:06 miwi Exp $
+# $FreeBSD$
#
PORTNAME= libGLU
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index c8cd81c..868bf87 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MesaLib-7.10.1.tar.bz2) = 9f4c67b212d9ecb83819e76645cecbebafbbfd6cb76290d0c2ea9f5ad9507390
-SIZE (MesaLib-7.10.1.tar.bz2) = 5866217
+SHA256 (MesaLib-7.10.3.tar.bz2) = a612fce124a0ddb31c9047bb8cfdf1a9c84fd8df5023f8f692eecafcf9ecf4d6
+SIZE (MesaLib-7.10.3.tar.bz2) = 6466724
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index 9b14ad6..d40418d 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -2,7 +2,7 @@
# Date created: 7 May 2004
# Whom: anholt@FreeBSD.org
#
-# $FreeBSD: ports/graphics/libGLw/Makefile,v 1.10 2011/02/25 16:52:07 miwi Exp $
+# $FreeBSD$
#
PORTNAME= libGLw
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
index c8cd81c..868bf87 100644
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MesaLib-7.10.1.tar.bz2) = 9f4c67b212d9ecb83819e76645cecbebafbbfd6cb76290d0c2ea9f5ad9507390
-SIZE (MesaLib-7.10.1.tar.bz2) = 5866217
+SHA256 (MesaLib-7.10.3.tar.bz2) = a612fce124a0ddb31c9047bb8cfdf1a9c84fd8df5023f8f692eecafcf9ecf4d6
+SIZE (MesaLib-7.10.3.tar.bz2) = 6466724
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index e811cb7..ee3dc59 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -2,7 +2,7 @@
# Date created: Tue Feb 7 12:02:49 1995
# Whom: anholt
#
-# $FreeBSD: ports/graphics/libglut/Makefile,v 1.25 2011/02/25 16:52:07 miwi Exp $
+# $FreeBSD$
#
PORTNAME= libglut
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
index cd2ea93..b150aa6 100644
--- a/graphics/libglut/distinfo
+++ b/graphics/libglut/distinfo
@@ -1,4 +1,4 @@
-SHA256 (MesaLib-7.10.1.tar.bz2) = 9f4c67b212d9ecb83819e76645cecbebafbbfd6cb76290d0c2ea9f5ad9507390
-SIZE (MesaLib-7.10.1.tar.bz2) = 5866217
-SHA256 (MesaGLUT-7.10.1.tar.bz2) = 2d82cbb7d0e453bca5e920e736f21a27e533258f65cfbe3f8d7508e5bdc5611e
-SIZE (MesaGLUT-7.10.1.tar.bz2) = 200698
+SHA256 (MesaLib-7.10.3.tar.bz2) = a612fce124a0ddb31c9047bb8cfdf1a9c84fd8df5023f8f692eecafcf9ecf4d6
+SIZE (MesaLib-7.10.3.tar.bz2) = 6466724
+SHA256 (MesaGLUT-7.10.3.tar.bz2) = a18edbdda2d722103417c54008e78e5de84fbbcadd7a218f25d4bc59da8962f5
+SIZE (MesaGLUT-7.10.3.tar.bz2) = 201644