From 09b6e1b4b7ac16d93d322727510f06a1426392c7 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 22 May 2000 14:43:22 +0000 Subject: Upgrade to the latest CVS snapshot and remove CVS hack. The driver is now in the pre-release stage, with first stable release scheduled within the one month or even less, so please test it hard and report bugs into utah's mailing list (see pkg/MESSAGE for details). Happy rendering! --- graphics/utah-glx/Makefile | 354 +++++---------------------------------- graphics/utah-glx/distinfo | 4 +- graphics/utah-glx/files/patch-ab | 39 +++++ graphics/utah-glx/files/patch-ac | 37 ++++ graphics/utah-glx/files/patch-ad | 12 ++ graphics/utah-glx/files/patch-ae | 20 +++ graphics/utah-glx/pkg-comment | 2 +- graphics/utah-glx/pkg-descr | 30 ++-- graphics/utah-glx/pkg-message | 41 ++--- graphics/utah-glx/pkg-plist | 41 ++--- 10 files changed, 192 insertions(+), 388 deletions(-) create mode 100644 graphics/utah-glx/files/patch-ab create mode 100644 graphics/utah-glx/files/patch-ac create mode 100644 graphics/utah-glx/files/patch-ad create mode 100644 graphics/utah-glx/files/patch-ae (limited to 'graphics') diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile index 0e0b70ee25cb..afe9885623ed 100644 --- a/graphics/utah-glx/Makefile +++ b/graphics/utah-glx/Makefile @@ -1,334 +1,66 @@ -# New ports collection makefile for: GLX -# Version required: CVS -# Date created: 13 September 1999 -# Whom: Marc E E van Woerkom +# New ports collection makefile for: utah-glx +# Date created: 13 September 1999 +# Whom: Marc E E van Woerkom # # $FreeBSD$ # -# -# Notes: -# -# . You need at least XFree86 3.3.4 (or the glx patched 3.3.3.1)! -# This port is set up for 3.3.5 -# -# . Mesa-3.0 has to be uninstalled before this port builds! -# Why? Because we need to create a glx aware version. -# -# . This stuff has been tested with -# - a Diamond Viper 330 (RIVA 128), -# - a Diamond Viper 550 (RIVA TNT), -# - and was reported to work with a Matrox G200 card -# -# . Glx on n-vidia's site is outdated (we have XFree86-3.3.5 now -# so I rolled my own snapshot of the open project glx code. -# It is slightly outdated but will be updated soon. -# -# . The current Mesa3 port for FreeBSD does not stop at the 'patch' -# target, but will instead try to build X11 immediatley if XFree86 -# is not present. -# For this version (XFree86 3.3.5 needs no patches for glx yet) we -# ignore this wrong behaviour. -# -# . We need tclsh for building - the choice for tclsh 8.0 is due to -# lack of time to include a proper selection scheme -# -# . You can set CHIPSET_3D appropriately in /etc/make.conf if the -# question bugs you -# -PORTNAME= glx -PORTVERSION= 990802 +PORTNAME= utah-glx +PORTVERSION= 0.9.1 CATEGORIES= graphics -MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/XF3.3.5/ -DISTFILES= ${DISTNAME}.tar.bz2 \ - riva-x-glx.faq.bz2 \ - Mesa-3_0.diff.bz2 - -MAINTAINER= 3d@freebsd.org +MASTER_SITES= http://people.FreeBSD.org/~sobomax/ -# search for tclsh, if not present build it -BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80 +MAINTAINER= 3d@FreeBSD.org -# These settings are here to make future updates to this port easier -#PATCH_XFREE= yes -PATCH_MESA= yes - -.if defined(PATCH_XFREE) -BUILD_DEPENDS= /nonexistent:${PORTSDIR}/x11/XFree86:patch -.endif -.if defined(PATCH_MESA) -BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/Mesa3:patch -.endif +BUILD_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82 \ + autoconf:${PORTSDIR}/devel/autoconf \ + nonexistent:${PORTSDIR}/graphics/Mesa3:patch +USE_X_PREFIX= yes +USE_GMAKE= yes USE_BZIP2= yes - -EXTRACT_ONLY= ${DISTNAME}.tar.bz2 - -DIST_SUBDIR= glx - -WRKSRC= ${WRKDIR}/${DISTNAME} - -# I don't want to build XFree86 too soon, so don't use USE_X_PREFIX -#USE_X_PREFIX= yes -PREFIX= ${X11BASE} - -XFCONFIG= /etc/XF86Config - -XFREEVER= 3.3.5 -XFREEDIR= ${PORTSDIR}/x11/XFree86/work/xc - -MESAVER= 3.0 -MESADIR= ${PORTSDIR}/graphics/Mesa3/work/Mesa-3.0 - -# As we ask for CHIPSET_3D if not set -IS_INTERACTIVE= YES - -# comment out the following line, -# if you want to build with Imake (Linux/alpha favours that) -USE_AUTOCONF= yes GNU_CONFIGURE= yes -# we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards -.if defined(CHIPSET_3D) -.if ${CHIPSET_3D} == RIVA -CONFIGURE_ARGS= --with-chipset=tnt -.endif -.if ${CHIPSET_3D} == MGA -CONFIGURE_ARGS= --with-chipset=mga -.endif -.endif - -CONFIGURE_ARGS+= --with-mesa=${MESADIR} \ - --with-mesa-version=mesa30 \ - # --with-mmx-asm --with-3dnow-asm - -USE_GMAKE= yes - -.if !defined(GNU_CONFIGURE) -USE_IMAKE= yes -.endif +GLVER?= 14 +GLUTVER?= 3 -.include +CONFIGURE_SCRIPT=autogen.sh +CONFIGURE_ARGS= --enable-extra \ + --with-mesa=${PORTSDIR}/graphics/Mesa3/work/Mesa-3.2 \ + --sysconfdir=${PREFIX}/etc \ + --with-moduledir=${PREFIX}/lib/modules +CONFIGURE_ENV= TCLSH="tclsh8.2" +MAKE_ENV= GLVER="${GLVER}" GLUTVER="${GLUTVER}" +PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}" -# -# before 'patch' -# -# . apply some patches to the Mesa 3.0 distribution -# -pre-patch: -.if defined(PATCH_XFREE) - @${ECHO} "=> Patching XFree86-${XFREEVER} for GLX .." - cd ${XFREEDIR}; \ - ${PATCH} -s -f <${FILESDIR}/XFree86-3_3_5.diff -.endif -.if defined(PATCH_MESA) - @${ECHO} "=> Checking Mesa-${MESAVER} installation .." - @if \ - pkg_info -e "Mesa-${MESAVER}"; \ - then \ - ${ECHO} "Found Mesa-${MESAVER} - please deinstall"; \ - ${ECHO} "Aborting.."; \ - ${FALSE} ; \ - fi -.if exists(${MESADIR}/../.glxpatch_done) - @${ECHO} "=> Mesa-${MESAVER} seems already patched for GLX .." -.else - @${ECHO} "=> Patching Mesa-${MESAVER} for GLX acceleration .." - @${ECHO} "(ignore the rejections, as they should happen in comments only)" - -cd ${MESADIR}; \ - bzcat ${DISTDIR}/${DIST_SUBDIR}/Mesa-3_0.diff.bz2 | ${PATCH} -s -f - ${TOUCH} ${MESADIR}/../.glxpatch_done -.endif +.if defined(DEBUG) +CFLAGS+= -g +CONFIGURE_ARGS+=--enable-debug .endif -# -# before 'configure' -# -# . patch glx configure.in, libGL/Makefile.in, -# serverglx/Makefile.in (yes, this is an ugly hack) -# -pre-configure: -.if !defined(CHIPSET_3D) || ${CHIPSET_3D} != RIVA && ${CHIPSET_3D} != MGA - @${ECHO} - @${ECHO} You must set the variable CHIPSET_3D to 'RIVA' if you use - @${ECHO} a nvidia RIVA 128, 128ZX, TNT, TNT2 .. based graphics card, - @${ECHO} or to 'MGA' if you use a Matrox G200/G400 graphics adapter - @${FALSE} -.endif -.if defined(GNU_CONFIGURE) - @${ECHO} "=> Adjusting ${WRKSRC}/configure.in .." - @cd ${WRKSRC}; \ - ${SED} -e 's;tclsh;tclsh8\.0;g' \ - configure.in.new; \ - ${MV} configure.in.new configure.in - @${ECHO} "=> Adjusting ${WRKSRC}/libGL/Makefile.in .." - @cd ${WRKSRC}/libGL; \ - ${SED} -e 's;SOGLREV = 1\.0;SOGLREV = 1;' \ - Makefile.in.new; \ - ${MV} Makefile.in.new Makefile.in - @${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Makefile.in .." - @cd ${WRKSRC}/servGL/serverglx; \ - ${SED} -e 's;tclsh;tclsh8\.0;g' \ - Makefile.in.new; \ - ${MV} Makefile.in.new Makefile.in -.endif +ALL_TARGET= depend all -# -# after 'configure' -# -# . only for the old IMAKE style configuration -# -post-configure: -.if !defined(GNU_CONFIGURE) - @${ECHO} "Using IMAKE" - @${ECHO} "=> Adjusting ${WRKSRC}/Config .." - @cd ${WRKSRC}; \ - ${SED} -e 's;XSERVTOP = .*;XSERVTOP = ${XFREEDIR};' \ - -e 's;MESATOP = .*;MESATOP = ${MESADIR};' \ - Config; - @${ECHO} "=> Adjusting ${WRKSRC}/libGL/Imakefile .." - @cd ${WRKSRC}/libGL; \ - ${SED} -e 's;tclsh;tclsh8\.0;' Imakefile.new; \ - ${MV} Imakefile.new Imakefile - @${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Imakefile .." - @cd ${WRKSRC}/servGL/serverglx; \ - ${SED} -e 's;tclsh;tclsh8\.0;' Imakefile.new; \ - ${MV} Imakefile.new Imakefile -.endif +.include -# -# before 'build': -# -# . build a glx aware Mesa lib -# . create makefiles (old IMAKE style configuration) -# -pre-build: -.if defined(PATCH_XFREE) - @${ECHO} "=> Building and installing XFree86-${XFREEVER} with GLX support .." - cd ${XFREEDIR}/../..; \ - ${MAKE} all install -.endif -.if defined(PATCH_MESA) - @${ECHO} "=> Building and installing Mesa-${MESAVER} with GLX support .." - cd ${MESADIR}/../..; \ - ${MAKE} all install -.endif -.if !defined(GNU_CONFIGURE) - @${ECHO} "=> Creating makefiles .." - cd ${WRKSRC}; \ - ${XMKMF}; \ - ${MAKE} Makefile; \ - ${MAKE} Makefiles -.endif +post-extract: + @${ECHO_MSG} + @${ECHO_MSG} "WARNING: This port will only work with XFree86 3.3 series of X-servers." + @${ECHO_MSG} " Users of XFree86 4.0 and above should use DRI instead." + @${ECHO_MSG} -# -# before 'install': -# -# . check for proper installed XFree86 version (3.3.4 or higher) -# . check for glx installation (please deinstall) -# . check for Mesa 3.0 installtion (please deinstall) -# pre-install: - @${ECHO} "=> Checking XFree86 installation .." - @if \ - pkg_info -e "XFree86-3.3.4"; \ - then \ - ${ECHO} "Found XFree86 3.3.4 - this port should still work"; \ - elif \ - pkg_info -e "XFree86-3.3.5"; \ - then \ - ${ECHO} "OK, found XFree86 3.3.5 - this port should work"; \ - elif \ - pkg_info -e "XFree86-3.3.6"; \ - then \ - ${ECHO} "Found XFree86 3.3.6 - this port should work"; \ - elif \ - pkg_info -e "XFree86-3.3.3.1"; \ - then \ - ${ECHO} ""; \ - ${ECHO} "This port will work only if your XFree86 3.3.3.1 version"; \ - ${ECHO} "has been patched for use with glx!"; \ - ${ECHO} ""; \ - ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \ - ${ECHO} ""; \ - ${ECHO} "(We continue with fingers crossed)"; \ - ${ECHO} ""; \ - else \ - ${ECHO} ""; \ - ${ECHO} "This port depends on having a proper version of XFree86"; \ - ${ECHO} "installed - preferably ${XFREEVER}!"; \ - ${ECHO} ""; \ - ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \ - ${ECHO} ""; \ - ${ECHO} "Aborting.."; \ - ${FALSE} ; \ - fi +.if exists(${PREFIX}/lib/libGL.so.${GLVER}) && !defined(GL_CHECK_OVERRIDE) + @${ECHO_MSG} + @${ECHO_MSG} "ERROR: It seems that another GL implementation currently installed in" + @${ECHO_MSG} " ${PREFIX}/lib/libGL.so.${GLVER}" + @${ECHO_MSG} + @${ECHO_MSG} " You have to deinstall it prior to Utah-Glx installation." + @${ECHO_MSG} + @false +.endif -# -# after 'install': -# -# . install some docs -# . move old Mesa lib away (old IMAKE style configuration) -# . check XFree86 configuration file for colordepth (RIVA only) -# . check XFree86 configuration file for glx module -# . give some hints -# post-install: -.if !defined(NOPORTDOCS) - @${ECHO} "=> Installing documentation .." - ${MKDIR} ${PREFIX}/share/doc/riva-glx - ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/riva-x-glx.faq.bz2 ${PREFIX}/share/doc/riva-glx - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/riva-glx - ${INSTALL_MAN} ${WRKSRC}/tested.html ${PREFIX}/share/doc/riva-glx - -.endif -.if !defined(GNU_CONFIGURE) - @${ECHO} "=> Adjusting links .." - -${MV} ${X11BASE}/lib/libMesaGL.a ${X11BASE}/lib/libMesaGL.a.old - -${MV} ${X11BASE}/lib/libMesaGL.so.14 ${X11BASE}/lib/libMesaGL.so.14.old - -${LN} -s ${X11BASE}/lib/libGL.a ${X11BASE}/lib/libMesaGL.a - -${LN} -s ${X11BASE}/lib/libGL.so.1 ${X11BASE}/lib/libMesaGL.so.14 -.endif -.if !defined(CHIPSET_3D) || ${CHIPSET_3D} == RIVA - @${ECHO} "=> Checking for \"DefaultColorDepth\" in ${XFCONFIG} .." - @${ECHO} "" - @if \ - ${GREP} '^ *DefaultColorDepth *1[56] *$$' ${XFCONFIG}; \ - then \ - ${ECHO} ""; \ - ${ECHO} "Found something."; \ - else \ - ${ECHO} "Nope, nothing found - please use"; \ - ${ECHO} ""; \ - ${ECHO} " DefaultColorDepth 16"; \ - ${ECHO} ""; \ - ${ECHO} "or"; \ - ${ECHO} ""; \ - ${ECHO} " DefaultColorDepth 15"; \ - ${ECHO} ""; \ - ${ECHO} "in your ${XFCONFIG} file with your RIVA card!"; \ - fi -.endif - @${ECHO} "=> Checking for Section \"Module\" in ${XFCONFIG} .." - @${ECHO} "" - @if \ - ${GREP} -A2 '^ *Section *"Module" *$$' ${XFCONFIG} | \ - ${GREP} -B1 -A1 '^ *Load *"glx\.so" *$$' | \ - ${GREP} -B2 '^ *EndSection *$$' | \ - ${GREP} -A2 '^ *Section *"Module" *$$'; \ - then \ - ${ECHO} ""; \ - ${ECHO} "Looks OK to me."; \ - else \ - ${ECHO} "Nope, not found - please add"; \ - ${ECHO} ""; \ - ${ECHO} " Section \"Module\""; \ - ${ECHO} " Load \"glx.so\""; \ - ${ECHO} " EndSection"; \ - ${ECHO} ""; \ - ${ECHO} "to the end of your ${XFCONFIG} file!"; \ - fi - @${ECHO} "=> Giving last advice .." - @${CAT} ${PKGDIR}/MESSAGE + ${MKDIR} ${PREFIX}/share/doc/utah-glx + ${INSTALL_MAN} ${WRKSRC}/docs/README.* ${PREFIX}/share/doc/utah-glx .include diff --git a/graphics/utah-glx/distinfo b/graphics/utah-glx/distinfo index 05f85047abac..3a7fae321dd8 100644 --- a/graphics/utah-glx/distinfo +++ b/graphics/utah-glx/distinfo @@ -1,3 +1 @@ -MD5 (glx/glx-990802.tar.bz2) = 5b04e03339dfffca73b6a11ce64cd59e -MD5 (glx/riva-x-glx.faq.bz2) = 6c5b499db143f071c6f69ba6c43db4c4 -MD5 (glx/Mesa-3_0.diff.bz2) = 5631bc2d7a54c366e072a72e45fca6c7 +MD5 (utah-glx-0.9.1.tar.bz2) = 2d1379f6cc7a3b803df452ca189fd8a6 diff --git a/graphics/utah-glx/files/patch-ab b/graphics/utah-glx/files/patch-ab new file mode 100644 index 000000000000..053b3c568792 --- /dev/null +++ b/graphics/utah-glx/files/patch-ab @@ -0,0 +1,39 @@ +--- libGLU/Makefile.in.orig Thu Dec 16 05:30:13 1999 ++++ libGLU/Makefile.in Fri Dec 31 04:19:58 1999 +@@ -13,10 +13,10 @@ + # These define the name/version of the shared library we're building + # ------------------------------------------------------------------ + LIBNAME = GLU +-GLUREV_major = 1 +-GLUREV_minor = 2 +-GLUREV_micro = 0 +-SOGLUREV = ${GLUREV_major}.${GLUREV_minor}.${GLUREV_micro} ++GLUREV_major = ${GLVER} ++GLUREV_minor = ++GLUREV_micro = ++SOGLUREV = ${GLUREV_major} + GLULIB = lib${LIBNAME}.so.${SOGLUREV} + + # FIXME: different library version for Mesa 3.2? +@@ -104,8 +104,8 @@ + @if [ -d ${INSTALL_libdir} ]; then set +x; \ + else (set -x; ${MKDIR} ${INSTALL_libdir}); fi + ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} ${GLULIB} ${INSTALL_libdir} +- ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ;\ +- ${LN} ${GLULIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ++# ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ;\ ++# ${LN} ${GLULIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} + ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so ;\ + ${LN} ${GLULIB} ${INSTALL_libdir}/lib${LIBNAME}.so + else +@@ -128,8 +128,8 @@ + ${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,lib${LIBNAME}.so.${GLUREV_major} ${OBJS} ${MATHLIBS} + ${RM} $@ + ${MV} $@~ $@ +- ${RM} lib${LIBNAME}.so.${GLUREV_major} +- ${LN} $@ lib${LIBNAME}.so.${GLUREV_major} ++# ${RM} lib${LIBNAME}.so.${GLUREV_major} ++# ${LN} $@ lib${LIBNAME}.so.${GLUREV_major} + ${RM} lib${LIBNAME}.so + ${LN} $@ lib${LIBNAME}.so + diff --git a/graphics/utah-glx/files/patch-ac b/graphics/utah-glx/files/patch-ac new file mode 100644 index 000000000000..167b606cea59 --- /dev/null +++ b/graphics/utah-glx/files/patch-ac @@ -0,0 +1,37 @@ +--- libglut/Makefile.in.orig Thu Dec 16 05:30:14 1999 ++++ libglut/Makefile.in Fri Dec 31 04:34:53 1999 +@@ -13,9 +13,9 @@ + # These define the name/version of the shared library we're building + # ------------------------------------------------------------------ + LIBNAME = glut +-GLUTREV_major = 3 +-GLUTREV_minor = 7 +-SOGLUTREV = ${GLUTREV_major}.${GLUTREV_minor} ++GLUTREV_major = ${GLUTVER} ++GLUTREV_minor = ++SOGLUTREV = ${GLUTREV_major}${GLUTREV_minor} + GLUTLIB = lib${LIBNAME}.so.${SOGLUTREV} + + # Source and Object definitions +@@ -113,8 +113,8 @@ + @if [ -d ${INSTALL_libdir} ]; then set +x; \ + else (set -x; ${MKDIR} ${INSTALL_libdir}); fi + ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} ${GLUTLIB} ${INSTALL_libdir} +- ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ;\ +- ${LN} ${GLUTLIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ++# ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ;\ ++# ${LN} ${GLUTLIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} + ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so ;\ + ${LN} ${GLUTLIB} ${INSTALL_libdir}/lib${LIBNAME}.so + else +@@ -139,8 +139,8 @@ + ${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,lib${LIBNAME}.so.${GLUTREV_major} ${OBJS} ${MATHLIBS} + ${RM} $@ + ${MV} $@~ $@ +- ${RM} lib${LIBNAME}.so.${GLUTREV_major} +- ${LN} $@ lib${LIBNAME}.so.${GLUTREV_major} ++# ${RM} lib${LIBNAME}.so.${GLUTREV_major} ++# ${LN} $@ lib${LIBNAME}.so.${GLUTREV_major} + ${RM} lib${LIBNAME}.so + ${LN} $@ lib${LIBNAME}.so + diff --git a/graphics/utah-glx/files/patch-ad b/graphics/utah-glx/files/patch-ad new file mode 100644 index 000000000000..ad3787fbb2e2 --- /dev/null +++ b/graphics/utah-glx/files/patch-ad @@ -0,0 +1,12 @@ +--- Makefile.in.orig Wed Mar 22 22:25:54 2000 ++++ Makefile.in Fri Apr 28 03:51:47 2000 +@@ -40,7 +40,8 @@ + ( cd $$i && ${MAKE} $@ ) || exit 1; \ + done + test -s ${sysconfdir}/glx.conf || \ +- ${INSTALL} -m 644 glx.conf ${sysconfdir}/glx.conf ++ ${INSTALL} -c -m 644 glx.conf ${sysconfdir}/glx.conf ++ ${INSTALL} -c -m 644 glx.conf ${sysconfdir}/glx.conf.default + + real-clean: + ${RM} config.status diff --git a/graphics/utah-glx/files/patch-ae b/graphics/utah-glx/files/patch-ae new file mode 100644 index 000000000000..cc4603b35a43 --- /dev/null +++ b/graphics/utah-glx/files/patch-ae @@ -0,0 +1,20 @@ +--- libGL/Makefile.in.orig Mon Feb 28 20:57:28 2000 ++++ libGL/Makefile.in Mon Feb 28 21:09:30 2000 +@@ -14,7 +14,7 @@ + # These define the name/version of the shared library we're building + # ------------------------------------------------------------------ + LIBNAME = GL +-SOGLREV = 1.0 ++SOGLREV = ${GLVER} + + # Source and Object files + # ----------------------- +@@ -111,7 +111,7 @@ + + lib${LIBNAME}.so.${SOGLREV} : render.c ${OBJS} + ${RM} $@~ +- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ ++ @SONAME=`echo $@`; set -x; \ + if [ `uname` = "SunOS" ] ; then \ + ${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-h,$$SONAME ${OBJS} \ + ${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \ diff --git a/graphics/utah-glx/pkg-comment b/graphics/utah-glx/pkg-comment index 2183297aafc6..59e513ac5ae9 100644 --- a/graphics/utah-glx/pkg-comment +++ b/graphics/utah-glx/pkg-comment @@ -1 +1 @@ -Hardware accelerated OpenGL 3d graphics (RIVA & G200/G400) +Utah-GLX is a hardware OpenGL support for XFree86 X-Servers diff --git a/graphics/utah-glx/pkg-descr b/graphics/utah-glx/pkg-descr index 503b87841c9d..882c1a11bc0b 100644 --- a/graphics/utah-glx/pkg-descr +++ b/graphics/utah-glx/pkg-descr @@ -1,21 +1,15 @@ -OpenGL hardware acceleration for RIVA based cards and Matrox G200. +Utah-GLX is a hardware OpenGL support for XFree86 X-Servers. -To bridge the time until the XFree86-4 release, this port will build a -Mesa 3.0 Graphics Library that makes use of the 3d hardware acceleration -features of nvidia's RIVA 128/128ZX and RIVA TNT/TNT2/VANTAGE based -graphics cards and the Matrox G200/G400. +Currently supported hardware: + o Matrox MGA-G200, MGA-G400 + o ATI RagePro (Mach64) + o Intel i810 + o NVIDIA Riva series + o SiS 6326 + o S3 Virge -WARNING: +Please note that some of the videocards above (e.g. i810) require kernel +support, which at the time of this writting (May 2000) is not implemented for +FreeBSD yet, so it may or may not work for your particular h/w. -Please note that this build might need a considerable amount of time. -(AMD K6/300MHz/196MB/SCSI: XFree86 3 hours, Mesa 1/2 hour, glx 10 min) - -See Jordan K Hubbard's article in the July '99 issue of - - http://www.freebsdzine.org - -for more information or visit - -WWW: http://people.FreeBSD.org/~3d - -Marc E E van Woerkom <3d@freebsd.org> +WWW: http://utah-glx.sourceforge.net/ diff --git a/graphics/utah-glx/pkg-message b/graphics/utah-glx/pkg-message index 261d44c9e218..7d02c0f8eef9 100644 --- a/graphics/utah-glx/pkg-message +++ b/graphics/utah-glx/pkg-message @@ -1,29 +1,12 @@ - -Additional Notes: ------------------ - -If you built an SVGA server with 3d hardware acceleration for a nvidia card -(RIVA 128, TNT, TNT2, TNT2 Ultra ..) please check that - -- you changed the default colour depth to 16 or 15 in your /etc/XF86Config - file (keyword: DefaultColorDepth) plus - -and (this holds for Matrox G200/G400 too) check if - -- you added to /etc/XF86Config (outside of any other section) the - following 3 lines: - - Section "Module" - Load "glx.so" - EndSection - -- you enabled System V shared memory support in your kernel - - -Things you might want to do: - -. Try out ports/x11/xscreensaver (e.g. superquadrics) as an sample OpenGL - application, -. read the article or -. have a look at the docs in X11/share/doc/riva-glx, esp the FAQ or -. visit http://people.FreeBSD.org/~3d +-------------------------------------------------------------------------------- + NOTE: This software currently is "work in progress" and while it may work for + your particular hardware (for example it is known to work quite reliably + on Mach64), but it may have problems with some other supported h/w. + Therefore we are encouraging all testers to report problems with this + drivers to the official Utah-glx developers' mailing list. + + If you found any bugs or incompatibilities with some particular + hardware configuration please fill the bug report and send it to the + address, which is the mailing list + for Utah-glx. +-------------------------------------------------------------------------------- diff --git a/graphics/utah-glx/pkg-plist b/graphics/utah-glx/pkg-plist index 4ac032ed9a38..16e5c3f94242 100644 --- a/graphics/utah-glx/pkg-plist +++ b/graphics/utah-glx/pkg-plist @@ -1,31 +1,20 @@ -include/GL/GLXproto.h -include/GL/dosmesa.h -include/GL/foomesa.h -include/GL/fxmesa.h -include/GL/ggimesa.h +etc/glx.conf.default include/GL/gl.h -include/GL/gl_mangle.h include/GL/glu.h -include/GL/glu_mangle.h include/GL/glut.h +include/GL/glutf90.h include/GL/glx.h -include/GL/glx_mangle.h -include/GL/mglmesa.h -include/GL/osmesa.h -include/GL/osmesa3.h -include/GL/svgamesa.h -include/GL/wmesa.h -include/GL/xmesa.h -lib/libGL.a -lib/libGL.so.1 -lib/libMesaGL.a -lib/libMesaGL.so.14 -lib/libMesaGLU.a -lib/libMesaGLU.so.14 -lib/libglut.a -lib/libglut.so.3 +lib/libGL.so +lib/libGL.so.%%GLVER%% +lib/libGLU.so +lib/libGLU.so.%%GLVER%% +lib/libglut.so +lib/libglut.so.%%GLUTVER%% lib/modules/glx.so -share/doc/riva-glx/README -share/doc/riva-glx/riva-x-glx.faq.bz2 -share/doc/riva-glx/tested.html -@dirrm share/doc/riva-glx +share/doc/utah-glx/README.i810 +share/doc/utah-glx/README.mach64 +share/doc/utah-glx/README.mga +share/doc/utah-glx/README.nv +share/doc/utah-glx/README.s3virge +@dirrm include/GL +@dirrm share/doc/utah-glx -- cgit v1.2.3