diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2012-08-05 06:52:02 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2012-08-05 06:52:02 +0800 |
| commit | 5aa7246575084f0aefcffe71d7305d0b36b2ed33 (patch) | |
| tree | a3b9f3e6c4e41379a4ad771026302ecf0ad0ae1b /graphics/libGL | |
| parent | 2d4609c1309d60a953f0d9a6be96d373ca6ccfc6 (diff) | |
| download | freebsd-ports-gnome-5aa7246575084f0aefcffe71d7305d0b36b2ed33.tar.gz freebsd-ports-gnome-5aa7246575084f0aefcffe71d7305d0b36b2ed33.tar.zst freebsd-ports-gnome-5aa7246575084f0aefcffe71d7305d0b36b2ed33.zip | |
Switch from libglut to freeglut and retire libglut. Libglut hasn't been
developed in years and has been dropped from the MESA 8.0 distribution.
Freeglut is a rewrite of glut and is actively developed and is used by
many linux distributions instead of libglut.
Bump all ports that directly depend on libglut because of the shlib version
change.
There are some extra items in this patch.
*) Because freeglut doesn't have the same dependancies as libglut, some ports
need extra dependencies added to USE_XORG to make them build.
*) Mark graphics/f90gl broken, f90gl depends on a header that is only shipped
with libglut.
*) Remove option for libglut/freeglut selection in games/cake, only freeglut
remains now.
*) While here fix a png related build issue games/vegastrike.
Thanks to miwi for running the exp-run.
Approved by: portmgr (miwi)
Collaboration with: zeising@
Obtained from: xorg-dev staging area.
Diffstat (limited to 'graphics/libGL')
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 09a5d91bf694..929994125c38 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -12,7 +12,6 @@ # - graphics/libGL # - graphics/libGLU # - graphics/libGLw -# - graphics/libglut # - graphics/dri # # $FreeBSD$ @@ -50,7 +49,7 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ - --disable-egl + --disable-egl --disable-glut .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${PATCHDIR}/extra-configure \ @@ -81,14 +80,8 @@ ARCH!= uname -p COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} -.if ${COMPONENT:Mglut} == "" -. if ${COMPONENT:Mglu} == "" -CONFIGURE_ARGS+= --disable-glu --disable-glut -. else -CONFIGURE_ARGS+= --disable-glut -. endif -.else -DISTFILES+= MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut +.if ${COMPONENT:Mglu} == "" +CONFIGURE_ARGS+= --disable-glu .endif .if ${COMPONENT:Mglw} == "" |