diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2001-10-06 21:20:26 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2001-10-06 21:20:26 +0000 |
| commit | 48bcbda3549a31e06f03927834f0ed6e1bb827de (patch) | |
| tree | 71b8b92ca7326597819717ce3e10486d5176ef44 /x11/XFree86-4 | |
| parent | Update to 20011006.1, a hotfix release. This fixes a bug where pkgdb fails to (diff) | |
re-enable DRI
Submitted by: Eric Anholt <eanholt@gladstone.uoregon.edu>
Notes
Notes:
svn path=/head/; revision=48507
Diffstat (limited to 'x11/XFree86-4')
| -rw-r--r-- | x11/XFree86-4/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-r128dri | 18 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-r128xmesa | 13 | ||||
| -rw-r--r-- | x11/XFree86-4/scripts/configure | 6 |
4 files changed, 33 insertions, 6 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index d68fbfd83677..9641495a9b03 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 4.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= 4.1.0 diff --git a/x11/XFree86-4/files/patch-r128dri b/x11/XFree86-4/files/patch-r128dri new file mode 100644 index 000000000000..c09b58c6ad40 --- /dev/null +++ b/x11/XFree86-4/files/patch-r128dri @@ -0,0 +1,18 @@ +--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.orig Sat Oct 6 05:29:25 2001 ++++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c Fri Oct 5 17:28:40 2001 +@@ -985,12 +985,12 @@ + /* Check the r128 DRM version */ + version = drmGetVersion(info->drmFD); + if (version) { +- if (version->version_major != 2 || +- version->version_minor < 1) { ++ if (version->version_major != 3 || ++ version->version_minor < 0) { + /* incompatible drm version */ + xf86DrvMsg(pScreen->myNum, X_ERROR, + "[dri] R128DRIScreenInit failed because of a version mismatch.\n" +- "[dri] r128.o kernel module version is %d.%d.%d but version 2.1.x is needed.\n" ++ "[dri] r128.o kernel module version is %d.%d.%d but version 3.0 or greater is needed.\n" + "[dri] Disabling the DRI.\n", + version->version_major, + version->version_minor, diff --git a/x11/XFree86-4/files/patch-r128xmesa b/x11/XFree86-4/files/patch-r128xmesa new file mode 100644 index 000000000000..fc33b516da12 --- /dev/null +++ b/x11/XFree86-4/files/patch-r128xmesa @@ -0,0 +1,13 @@ +--- lib/GL/mesa/src/drv/r128/r128_xmesa.c.orig Fri Oct 5 17:21:31 2001 ++++ lib/GL/mesa/src/drv/r128/r128_xmesa.c Fri Oct 5 17:22:59 2001 +@@ -80,8 +80,8 @@ + } + + /* Check that the DRM driver version is compatible */ +- if ( sPriv->drmMajor != 2 || +- sPriv->drmMinor < 1 ) { ++ if ( sPriv->drmMajor != 3 /*|| ++ sPriv->drmMinor < 1*/ ) { + char msg[1000]; + sprintf( msg, "R128 DRI driver expected DRM driver version 2.1.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch ); + __driMesaMessage( msg ); diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure index 03699ecb2348..0a037abb8484 100644 --- a/x11/XFree86-4/scripts/configure +++ b/x11/XFree86-4/scripts/configure @@ -230,11 +230,7 @@ yesno YES "Do you want to compile with PAM support?" echo "#define HasPam $answ" >> $F echo "#define InstallXserverSetUID NO " >> $F -# DRI is broken in 4.1 -#if [ $OSVERSION -lt 500013 -a X${MACHINE} != X"alpha" ]; then -# echo "#define BuildXF86DRI YES" >> $F -# echo "#define BuildXF86DRM YES" >> $F -#fi +echo "#define BuildXF86DRI YES" >> $F } configure |