summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/utah-glx/Makefile90
-rw-r--r--graphics/utah-glx/distinfo6
-rw-r--r--graphics/utah-glx/files/patch-ab39
-rw-r--r--graphics/utah-glx/files/patch-ac37
-rw-r--r--graphics/utah-glx/files/patch-ad12
-rw-r--r--graphics/utah-glx/files/patch-ae20
-rw-r--r--graphics/utah-glx/files/patch-af58
-rw-r--r--graphics/utah-glx/files/patch-ag364
-rw-r--r--graphics/utah-glx/files/patch-ah20
-rw-r--r--graphics/utah-glx/files/patch-ba15
-rw-r--r--graphics/utah-glx/files/patch-bb15
-rw-r--r--graphics/utah-glx/files/patch-bc15
-rw-r--r--graphics/utah-glx/files/patch-bd15
-rw-r--r--graphics/utah-glx/files/patch-be15
-rw-r--r--graphics/utah-glx/files/patch-bf15
-rw-r--r--graphics/utah-glx/files/patch-bg16
-rw-r--r--graphics/utah-glx/files/patch-bh15
-rw-r--r--graphics/utah-glx/files/patch-bi15
-rw-r--r--graphics/utah-glx/pkg-descr16
-rw-r--r--graphics/utah-glx/pkg-message12
-rw-r--r--graphics/utah-glx/pkg-plist21
22 files changed, 0 insertions, 832 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index f4522bcef1cc..45556697a089 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -570,7 +570,6 @@
SUBDIR += tulip
SUBDIR += uDrawGraph
SUBDIR += urt
- SUBDIR += utah-glx
SUBDIR += vcg
SUBDIR += vertex
SUBDIR += vid
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
deleted file mode 100644
index 0f305ca6edbd..000000000000
--- a/graphics/utah-glx/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# New ports collection makefile for: utah-glx
-# Date created: 13 September 1999
-# Whom: Marc E E van Woerkom <van.woerkom@netcologne.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME= utah-glx
-PORTVERSION= 0.9.20010504
-PORTREVISION= 1
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/g}
-MASTER_SITE_SUBDIR= sobomax/:local mesa3d/:sf
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:local \
- MesaLib-${MESA_VER}${EXTRACT_SUFX}:sf \
- MesaDemos-${MESA_VER}${EXTRACT_SUFX}:sf
-
-MAINTAINER= 3d@FreeBSD.org
-COMMENT= A hardware OpenGL support for XFree86 X-Servers
-
-DEPRECATED= depends on XFree86-3 and no development since 2003 and
-EXPIRATION_DATE= 2005-12-05
-
-BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83
-
-USE_AUTOTOOLS= autoconf:253:env
-USE_X_PREFIX= yes
-USE_PERL5_BUILD=yes
-USE_GMAKE= yes
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
-
-MESA_VER= 3.2.1
-
-GLVER?= 14
-GLUTVER?= 3
-
-AGP_DEVICE= /dev/agpgart
-
-CFLAGS+= -DAGP_DEVICE=\\\"${AGP_DEVICE}\\\"
-CONFIGURE_SCRIPT=autogen.sh
-CONFIGURE_ARGS= --enable-extra \
- --with-mesa=${WRKDIR}/Mesa-${MESA_VER} \
- --sysconfdir=${PREFIX}/etc \
- --with-moduledir=${PREFIX}/lib/modules
-CONFIGURE_ENV= TCLSH="tclsh8.3"
-MAKE_ENV= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
-PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
-
-.if defined(DEBUG)
-CFLAGS+= -g
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-ALL_TARGET= depend all
-
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-IGNORE= "Requires XFree86 3.3.* - will not work with XFree86 4.*"
-.endif
-
-pre-build:
- @${FIND} ${WRKSRC} -type f | ${XARGS} grep -l linux/agpgart | \
- ${XARGS} perl -pi -e "s|linux/agpgart|sys/agpio|"
-
-pre-install:
-.if exists(${PREFIX}/lib/libGL.so.${GLVER}) && !defined(GL_CHECK_OVERRIDE) && !defined(PACKAGE_BUILDING)
- @${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
-
-post-install:
-.if exists(/usr/include/sys/agpio.h)
- @${ECHO_MSG}
- @${ECHO_MSG} "The module has been built with experimental AGP support. To use it you should"
- @${ECHO_MSG} "create device node for agp driver (cd /dev ; sh MAKEDEV agpgart) and enable"
- @${ECHO_MSG} "AGP support in ${PREFIX}/etc/glx.conf file."
- @${ECHO_MSG}
-.endif
- ${MKDIR} ${PREFIX}/share/doc/utah-glx
- ${INSTALL_MAN} ${WRKSRC}/docs/README.* ${PREFIX}/share/doc/utah-glx
-
-.include <bsd.port.post.mk>
diff --git a/graphics/utah-glx/distinfo b/graphics/utah-glx/distinfo
deleted file mode 100644
index f744ac337cea..000000000000
--- a/graphics/utah-glx/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (utah-glx-0.9.20010504.tar.bz2) = ca28a07a59dc299399d23293f982f69a
-SIZE (utah-glx-0.9.20010504.tar.bz2) = 582057
-MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58
-SIZE (MesaLib-3.2.1.tar.bz2) = 1225518
-MD5 (MesaDemos-3.2.1.tar.bz2) = 621bd95ed9f93467f4dfa615e2f27c16
-SIZE (MesaDemos-3.2.1.tar.bz2) = 881768
diff --git a/graphics/utah-glx/files/patch-ab b/graphics/utah-glx/files/patch-ab
deleted file mode 100644
index 3a1d6d1e7cd1..000000000000
--- a/graphics/utah-glx/files/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
---- libGLU/Makefile.in.orig Thu Aug 24 16:53:46 2000
-+++ libGLU/Makefile.in Thu Aug 24 21:42:43 2000
-@@ -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 ${DESTDIR}${INSTALL_libdir} ]; then set +x; \
- else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi
- ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} ${GLULIB} ${DESTDIR}${INSTALL_libdir}
-- ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ;\
-- ${LN} ${GLULIB} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major}
-+# ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ;\
-+# ${LN} ${GLULIB} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major}
- ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so ;\
- ${LN} ${GLULIB} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so
- else
-@@ -135,8 +135,8 @@
- fi;
- ${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
deleted file mode 100644
index 81348f78bf87..000000000000
--- a/graphics/utah-glx/files/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- libglut/Makefile.in.orig Thu Aug 24 16:53:46 2000
-+++ libglut/Makefile.in Thu Aug 24 21:44:21 2000
-@@ -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
-@@ -114,8 +114,8 @@
- @if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \
- else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi
- ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} ${GLUTLIB} ${DESTDIR}${INSTALL_libdir}
-- ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ;\
-- ${LN} ${GLUTLIB} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major}
-+# ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ;\
-+# ${LN} ${GLUTLIB} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major}
- ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so ;\
- ${LN} ${GLUTLIB} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so
- else
-@@ -147,8 +147,8 @@
- fi;
- ${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
deleted file mode 100644
index 5e166fee090c..000000000000
--- a/graphics/utah-glx/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig Thu Aug 24 16:53:45 2000
-+++ Makefile.in Thu Aug 24 21:46:36 2000
-@@ -44,7 +44,8 @@
- done
- ${MKDIR} ${DESTDIR}${sysconfdir}
- test -s ${DESTDIR}${sysconfdir}/glx.conf || \
-- ${INSTALL} -m 644 glx.conf ${DESTDIR}${sysconfdir}/glx.conf
-+ ${INSTALL} -c -m 644 glx.conf ${DESTDIR}${sysconfdir}/glx.conf
-+ ${INSTALL} -c -m 644 glx.conf ${DESTDIR}${sysconfdir}/glx.conf.default
-
- real-clean:
- ${RM} config.status config.cache config.log
diff --git a/graphics/utah-glx/files/patch-ae b/graphics/utah-glx/files/patch-ae
deleted file mode 100644
index cc4603b35a43..000000000000
--- a/graphics/utah-glx/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/files/patch-af b/graphics/utah-glx/files/patch-af
deleted file mode 100644
index 05954672444e..000000000000
--- a/graphics/utah-glx/files/patch-af
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.in.orig Thu Aug 24 09:53:45 2000
-+++ configure.in Mon Oct 9 21:39:56 2000
-@@ -846,19 +846,19 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h unistd.h floatingpoint.h \
- sys/types.h sys/mman.h sys/perm.h asm/sigcontext.h)
--AC_CHECK_HEADER(asm/mtrr.h,
-+AC_CHECK_HEADER(sys/memrange.h,
- [
- if test "$enable_mtrr" = "no"
- then
- echo "disabling mtrr (manual override)"
- cflags="$cflags -DNO_MTRR"
- else
-- dnl For some reason, some <asm/mtrr.h> files are incomplete
-+ dnl For some reason, some <sys/memrange.h> files are incomplete
- dnl Verify the validity of the file here
-- AC_MSG_CHECKING(validity of asm/mtrr.h)
-+ AC_MSG_CHECKING(validity of sys/memrange.h)
- AC_EGREP_CPP([GLX_maGiC_VALID],[
--#include <asm/mtrr.h>
--#ifdef MTRRIOC_ADD_ENTRY
-+#include <sys/memrange.h>
-+#ifdef MDF_WRITECOMBINE
- GLX_maGiC_VALID
- #endif
- ],
-@@ -879,7 +879,7 @@
- ])
-
- dnl agp driver support
--AC_CHECK_HEADER(linux/agpgart.h,
-+AC_CHECK_HEADER(sys/agpio.h,
- [
- if test "$enable_agp" = "no"
- then
-@@ -887,9 +887,9 @@
- else
- dnl see which version of the gart module we've found
- AC_MSG_CHECKING(validity of agpgart.h)
-- AC_EGREP_CPP([/dev/agpgart],[
--#include <linux/agpgart.h>
--AGP_DEVICE
-+ AC_EGREP_CPP([],[
-+#include <sys/agpio.h>
-+AGPIOC_INFO
- ],
- [
- AC_MSG_RESULT([new agpgart module])
-@@ -906,7 +906,7 @@
- fi
- ],
- [
-- dnl *didn't* find linux/agpgart.h on the system
-+ dnl *didn't* find sys/agpio.h on the system
- if test "$enable_agp" = "yes"
- then
- AC_MSG_RESULT([ enabling agpgart support anyway (manual override)])
diff --git a/graphics/utah-glx/files/patch-ag b/graphics/utah-glx/files/patch-ag
deleted file mode 100644
index f73242728f07..000000000000
--- a/graphics/utah-glx/files/patch-ag
+++ /dev/null
@@ -1,364 +0,0 @@
---- servGL/hwglx/common/hw_mtrr.c.orig Mon Oct 9 21:42:30 2000
-+++ servGL/hwglx/common/hw_mtrr.c Mon Oct 9 21:42:55 2000
-@@ -1,4 +1,3 @@
--
- #include <stdlib.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -7,13 +6,15 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <signal.h>
-+#include <sys/ioctl.h>
-
- #include "glx_symbols.h"
- #include "hwlog.h"
-
--
- #ifndef NO_MTRR
-
-+#ifdef linux
-+
- #define MTRR_NEED_STRINGS
- #include <errno.h>
- #include <asm/mtrr.h>
-@@ -237,6 +238,339 @@
- sentry.base, sentry.size );
- }
- }
-+
-+#endif
-+
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+
-+#ifndef __NetBSD__
-+#include <sys/memrange.h>
-+#else
-+#include "memrange.h"
-+#endif
-+#define X_MTRR_ID "XFree86"
-+
-+typedef struct x_RangeRec {
-+ struct mem_range_desc mrd;
-+ int wasWC;
-+ struct x_RangeRec * next;
-+} RangeRec, *RangePtr;
-+
-+static RangePtr savedRangeList = NULL;
-+static int devMemFd = -1;
-+
-+/*
-+ * getAllRanges returns the full list of memory ranges with attributes set.
-+ */
-+
-+static struct mem_range_desc *
-+getAllRanges(int *nmr)
-+{
-+ struct mem_range_desc *mrd;
-+ struct mem_range_op mro;
-+
-+ /*
-+ * Find how many ranges there are. If this fails, then the kernel
-+ * probably doesn't have MTRR *support.
-+ */
-+ mro.mo_arg[0] = 0;
-+ if (ioctl(devMemFd, MEMRANGE_GET, &mro))
-+ return NULL;
-+ *nmr = mro.mo_arg[0];
-+ mrd = (struct mem_range_desc *)xalloc(*nmr * sizeof(struct mem_range_desc));
-+ mro.mo_arg[0] = *nmr;
-+ mro.mo_desc = mrd;
-+ if (ioctl(devMemFd, MEMRANGE_GET, &mro)) {
-+ xfree(mrd);
-+ return NULL;
-+ }
-+ return mrd;
-+}
-+
-+static void
-+freeRangeList(RangePtr range)
-+{
-+ RangePtr rp;
-+
-+ while (range) {
-+ rp = range;
-+ range = rp->next;
-+ xfree(rp);
-+ }
-+}
-+
-+static RangePtr
-+dupRangeList(RangePtr list)
-+{
-+ RangePtr new = NULL, rp, p;
-+
-+ rp = list;
-+ while (rp) {
-+ p = (RangePtr)xalloc(sizeof(RangeRec));
-+ *p = *rp;
-+ p->next = new;
-+ new = p;
-+ rp = rp->next;
-+ }
-+ return new;
-+}
-+
-+static RangePtr
-+sortRangeList(RangePtr list)
-+{
-+ RangePtr rp1, rp2, copy, sorted = NULL, minp, prev, minprev;
-+ unsigned long minBase;
-+
-+ /* Sort by base address */
-+ rp1 = copy = dupRangeList(list);
-+ while (rp1) {
-+ minBase = rp1->mrd.mr_base;
-+ minp = rp1;
-+ minprev = NULL;
-+ prev = rp1;
-+ rp2 = rp1->next;
-+ while (rp2) {
-+ if (rp2->mrd.mr_base < minBase) {
-+ minBase = rp2->mrd.mr_base;
-+ minp = rp2;
-+ minprev = prev;
-+ }
-+ prev = rp2;
-+ rp2 = rp2->next;
-+ }
-+ if (minprev) {
-+ minprev->next = minp->next;
-+ rp1 = copy;
-+ } else {
-+ rp1 = minp->next;
-+ }
-+ minp->next = sorted;
-+ sorted = minp;
-+ }
-+ return sorted;
-+}
-+
-+/*
-+ * findRanges returns a list of ranges that overlap the specified range.
-+ */
-+
-+static void
-+findRanges(unsigned long base, unsigned long size, RangePtr *ucp, RangePtr *wcp)
-+{
-+ struct mem_range_desc *mrd;
-+ int nmr, i;
-+ RangePtr rp, *p;
-+
-+ if (!(mrd = getAllRanges(&nmr)))
-+ return;
-+
-+ for (i = 0; i < nmr; i++) {
-+ if ((mrd[i].mr_flags & MDF_ACTIVE) &&
-+ mrd[i].mr_base < base + size &&
-+ mrd[i].mr_base + mrd[i].mr_len > base) {
-+ if (mrd[i].mr_flags & MDF_WRITECOMBINE)
-+ p = wcp;
-+ else if (mrd[i].mr_flags & MDF_UNCACHEABLE)
-+ p = ucp;
-+ else
-+ continue;
-+ rp = (RangePtr)xalloc(sizeof(RangeRec));
-+ rp->mrd = mrd[i];
-+ rp->next = *p;
-+ *p = rp;
-+ }
-+ }
-+ xfree(mrd);
-+}
-+
-+/*
-+ * This checks if the existing overlapping ranges fully cover the requested
-+ * range. Is this overkill?
-+ */
-+
-+static int
-+fullCoverage(unsigned long base, unsigned long size, RangePtr overlap)
-+{
-+ RangePtr rp1, sorted = NULL;
-+ unsigned long end;
-+
-+ sorted = sortRangeList(overlap);
-+ /* Look for gaps */
-+ rp1 = sorted;
-+ end = base + size;
-+ while (rp1) {
-+ if (rp1->mrd.mr_base > base) {
-+ freeRangeList(sorted);
-+ return FALSE;
-+ } else {
-+ base = rp1->mrd.mr_base + rp1->mrd.mr_len;
-+ }
-+ if (base >= end) {
-+ freeRangeList(sorted);
-+ return 1;
-+ }
-+ rp1 = rp1->next;
-+ }
-+ freeRangeList(sorted);
-+ return 0;
-+}
-+
-+static RangePtr
-+addWC(unsigned long base, unsigned long size)
-+{
-+ RangePtr uc = NULL, wc = NULL, retlist = NULL;
-+ struct mem_range_desc mrd;
-+ struct mem_range_op mro;
-+
-+ findRanges(base, size, &uc, &wc);
-+
-+ /* See of the full range is already WC */
-+ if (!uc && fullCoverage(base, size, wc)) {
-+ hwMsg(1, "Write-combining range (0x%lx,0x%lx) was already set\n",
-+ base, size);
-+ return NULL;
-+ }
-+
-+ /* Otherwise, try to add the new range */
-+ mrd.mr_base = base;
-+ mrd.mr_len = size;
-+ strcpy(mrd.mr_owner, X_MTRR_ID);
-+ mrd.mr_flags = MDF_WRITECOMBINE;
-+ mro.mo_desc = &mrd;
-+ mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-+ if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-+ hwError("Failed to set write-combining range "
-+ "(0x%lx,0x%lx)\n", base, size);
-+ return NULL;
-+ } else {
-+ hwMsg(1, "Write-combining range (0x%lx,0x%lx)\n", base, size);
-+ retlist = (RangePtr)xalloc(sizeof(RangeRec));
-+ retlist->mrd = mrd;
-+ retlist->wasWC = FALSE;
-+ retlist->next = NULL;
-+ return retlist;
-+ }
-+}
-+
-+static void
-+undoWC(RangePtr rp)
-+{
-+ struct mem_range_op mro;
-+ int failed;
-+
-+ while (rp) {
-+ hwMsg(1,"Undo for (0x%lx,0x%lx), %d\n",
-+ (unsigned long)rp->mrd.mr_base,
-+ (unsigned long)rp->mrd.mr_len, rp->wasWC);
-+ failed = FALSE;
-+ if (rp->wasWC) {
-+ mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-+ rp->mrd.mr_flags = MDF_WRITECOMBINE;
-+ strcpy(rp->mrd.mr_owner, "unknown");
-+ } else {
-+ mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-+ }
-+ mro.mo_desc = &rp->mrd;
-+
-+ if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-+ if (!rp->wasWC) {
-+ mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-+ rp->mrd.mr_flags = MDF_UNCACHEABLE;
-+ strcpy(rp->mrd.mr_owner, "unknown");
-+ if (ioctl(devMemFd, MEMRANGE_SET, &mro))
-+ failed = TRUE;
-+ } else
-+ failed = TRUE;
-+ }
-+ if (failed) {
-+ hwError("Failed to restore MTRR range (0x%lx,0x%lx)\n",
-+ (unsigned long)rp->mrd.mr_base,
-+ (unsigned long)rp->mrd.mr_len);
-+ }
-+ rp = rp->next;
-+ }
-+}
-+
-+static int
-+cleanMTRR()
-+{
-+ struct mem_range_desc *mrd;
-+ struct mem_range_op mro;
-+ int nmr, i;
-+
-+ /* This shouldn't happen */
-+ if (devMemFd < 0)
-+ return FALSE;
-+
-+ if (!(mrd = getAllRanges(&nmr)))
-+ return FALSE;
-+
-+ for (i = 0; i < nmr; i++) {
-+ if (strcmp(mrd[i].mr_owner, X_MTRR_ID) == 0 &&
-+ (mrd[i].mr_flags & MDF_ACTIVE)) {
-+ hwMsg( 1,"Clean for (0x%lx,0x%lx)\n",
-+ (unsigned long)mrd[i].mr_base,
-+ (unsigned long)mrd[i].mr_len);
-+ if (mrd[i].mr_flags & MDF_FIXACTIVE) {
-+ mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-+ mrd[i].mr_flags = MDF_UNCACHEABLE;
-+ } else {
-+ mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-+ }
-+ mro.mo_desc = mrd + i;
-+ ioctl(devMemFd, MEMRANGE_SET, &mro);
-+ }
-+ }
-+ xfree(mrd);
-+ return TRUE;
-+}
-+
-+static void CloseMTRR( void )
-+{
-+ undoWC(savedRangeList);
-+ close(devMemFd);
-+}
-+
-+static void OpenMTRR( void )
-+{
-+ if ( ( devMemFd = open( "/dev/mem", O_RDWR, 0 ) ) == -1 )
-+ {
-+ hwError( "Error opening /dev/mem: %s\n", strerror( errno ) );
-+ hwError( "MTRR not enabled\n" );
-+ return;
-+ }
-+
-+ if ( !cleanMTRR() ) {
-+ close(devMemFd);
-+ devMemFd = -1;
-+ return;
-+ }
-+
-+ atexit( CloseMTRR );
-+}
-+
-+void SetWriteCombining( long physical, int bytes )
-+{
-+ RangePtr rp;
-+
-+ if ( devMemFd < 0 ) {
-+ OpenMTRR();
-+ }
-+
-+ if ( devMemFd < 0 ) {
-+ return;
-+ }
-+
-+ rp = addWC(physical, bytes);
-+
-+ if ( NULL != rp ) {
-+ rp->next = savedRangeList;
-+ savedRangeList = rp;
-+ }
-+}
-+
-+
-+#endif /* end of BSD MTRR support */
-
- /*
- * FlushWriteCombining
diff --git a/graphics/utah-glx/files/patch-ah b/graphics/utah-glx/files/patch-ah
deleted file mode 100644
index fff204b6df5b..000000000000
--- a/graphics/utah-glx/files/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
---- servGL/hwglx/mga/mgadirect.c.orig Mon Oct 9 21:47:35 2000
-+++ servGL/hwglx/mga/mgadirect.c Mon Oct 9 21:48:18 2000
-@@ -62,17 +62,6 @@
- #include "glx_clients.h"
- #include "glx_init.h"
-
--#ifndef NO_MTRR
--#define MTRR_NEED_STRINGS
--#include <errno.h>
--#include <asm/mtrr.h>
--#include <fcntl.h>
--#include <sys/ioctl.h>
--#include <unistd.h>
--int mtrr;
--void mgaCloseMTRR();
--#endif
--
- #include "xf86_OSproc.h"
-
-
diff --git a/graphics/utah-glx/files/patch-ba b/graphics/utah-glx/files/patch-ba
deleted file mode 100644
index 252f0e6080ce..000000000000
--- a/graphics/utah-glx/files/patch-ba
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN libGL/pointers.c libGL/pointers.c
---- libGL/pointers.c Wed Jan 26 15:28:36 2000
-+++ libGL/pointers.c Sun Nov 5 19:21:46 2000
-@@ -332,9 +332,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bb b/graphics/utah-glx/files/patch-bb
deleted file mode 100644
index 55dde321512f..000000000000
--- a/graphics/utah-glx/files/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/common/glx_symbols.c servGL/hwglx/common/glx_symbols.c
---- servGL/hwglx/common/glx_symbols.c Wed Mar 22 07:25:59 2000
-+++ servGL/hwglx/common/glx_symbols.c Sun Nov 5 19:22:23 2000
-@@ -187,9 +187,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fprintf( stderr, "%s\n", error );
-+ if (tmp == NULL) {
-+ fputs( dlerror(), stderr );
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bc b/graphics/utah-glx/files/patch-bc
deleted file mode 100644
index 1406dcf53638..000000000000
--- a/graphics/utah-glx/files/patch-bc
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/common/x11_symbols.c servGL/hwglx/common/x11_symbols.c
---- servGL/hwglx/common/x11_symbols.c Mon Jan 17 09:11:02 2000
-+++ servGL/hwglx/common/x11_symbols.c Sun Nov 5 19:22:44 2000
-@@ -92,9 +92,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bd b/graphics/utah-glx/files/patch-bd
deleted file mode 100644
index a1845ce48b81..000000000000
--- a/graphics/utah-glx/files/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/i810/i810symbols.c servGL/hwglx/i810/i810symbols.c
---- servGL/hwglx/i810/i810symbols.c Mon Jan 17 09:11:02 2000
-+++ servGL/hwglx/i810/i810symbols.c Sun Nov 5 19:17:44 2000
-@@ -28,9 +28,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-be b/graphics/utah-glx/files/patch-be
deleted file mode 100644
index b46a94e3caa1..000000000000
--- a/graphics/utah-glx/files/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/mga/mgasymbols.c servGL/hwglx/mga/mgasymbols.c
---- servGL/hwglx/mga/mgasymbols.c Tue Feb 29 12:40:30 2000
-+++ servGL/hwglx/mga/mgasymbols.c Sun Nov 5 19:18:33 2000
-@@ -29,9 +29,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bf b/graphics/utah-glx/files/patch-bf
deleted file mode 100644
index cdb0dada01f2..000000000000
--- a/graphics/utah-glx/files/patch-bf
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/nv/riva_symbols.c servGL/hwglx/nv/riva_symbols.c
---- servGL/hwglx/nv/riva_symbols.c Sun Feb 13 22:02:30 2000
-+++ servGL/hwglx/nv/riva_symbols.c Sun Nov 5 19:19:04 2000
-@@ -29,9 +29,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bg b/graphics/utah-glx/files/patch-bg
deleted file mode 100644
index b89473c885b5..000000000000
--- a/graphics/utah-glx/files/patch-bg
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -druN servGL/hwglx/s3savage/s3savglx.c servGL/hwglx/s3savage/s3savglx.c
---- servGL/hwglx/s3savage/s3savglx.c Sun Aug 20 08:50:25 2000
-+++ servGL/hwglx/s3savage/s3savglx.c Sun Nov 5 19:20:54 2000
-@@ -83,10 +83,9 @@
- my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
--if ((error = dlerror()) != 0)
-+ if (tmp == NULL)
- {
-- fputs(error, stderr);
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bh b/graphics/utah-glx/files/patch-bh
deleted file mode 100644
index a9679899d5e6..000000000000
--- a/graphics/utah-glx/files/patch-bh
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/s3virge/s3virgesymbols.c servGL/hwglx/s3virge/s3virgesymbols.c
---- servGL/hwglx/s3virge/s3virgesymbols.c Sun Jan 16 03:22:47 2000
-+++ servGL/hwglx/s3virge/s3virgesymbols.c Sun Nov 5 19:19:36 2000
-@@ -24,9 +24,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/files/patch-bi b/graphics/utah-glx/files/patch-bi
deleted file mode 100644
index 3045e3037bf8..000000000000
--- a/graphics/utah-glx/files/patch-bi
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -druN servGL/hwglx/sis6326/sis6326symbols.c servGL/hwglx/sis6326/sis6326symbols.c
---- servGL/hwglx/sis6326/sis6326symbols.c Sun Mar 5 11:10:37 2000
-+++ servGL/hwglx/sis6326/sis6326symbols.c Sun Nov 5 19:20:00 2000
-@@ -10,9 +10,8 @@
- static void *my_dlsym(void *handle, const char *name)
- {
- void *tmp = dlsym(handle, name);
-- char *error;
-- if ((error = dlerror()) != 0) {
-- fputs(error, stderr);
-+ if (tmp == NULL) {
-+ fputs(dlerror(), stderr);
- any_error = 1;
- return 0;
- }
diff --git a/graphics/utah-glx/pkg-descr b/graphics/utah-glx/pkg-descr
deleted file mode 100644
index 4138a70148e0..000000000000
--- a/graphics/utah-glx/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Utah-GLX is a hardware OpenGL support for XFree86 X-Servers.
-
-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
- o S3 Savage3D
-
-Please note that some of the videocards above (e.g. i810) require kernel
-support, which at the time of this writing (May 2000) is not implemented for
-FreeBSD yet, so it may or may not work for your particular h/w.
-
-WWW: http://utah-glx.sourceforge.net/
diff --git a/graphics/utah-glx/pkg-message b/graphics/utah-glx/pkg-message
deleted file mode 100644
index 7d02c0f8eef9..000000000000
--- a/graphics/utah-glx/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
---------------------------------------------------------------------------------
- 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
- <utah-glx-dev@lists.sourceforge.net> address, which is the mailing list
- for Utah-glx.
---------------------------------------------------------------------------------
diff --git a/graphics/utah-glx/pkg-plist b/graphics/utah-glx/pkg-plist
deleted file mode 100644
index 5131945f1894..000000000000
--- a/graphics/utah-glx/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/glx.conf.default
-include/GL/gl.h
-include/GL/glu.h
-include/GL/glut.h
-include/GL/glutf90.h
-include/GL/glx.h
-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/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.s3savage
-share/doc/utah-glx/README.s3virge
-@dirrm include/GL
-@dirrm share/doc/utah-glx
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 19:05:25 +0000