aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2002-10-17 08:39:11 +0800
committeranholt <anholt@FreeBSD.org>2002-10-17 08:39:11 +0800
commite53358da2e9ebf621c8b8dea5b0ab09138d94ffd (patch)
treee22832604aeb68a56ee5d06be65d8b9360625bf2
parent5aea66d0cc506c48de49787593095327dfe902d1 (diff)
downloadfreebsd-ports-gnome-e53358da2e9ebf621c8b8dea5b0ab09138d94ffd.tar.gz
freebsd-ports-gnome-e53358da2e9ebf621c8b8dea5b0ab09138d94ffd.tar.zst
freebsd-ports-gnome-e53358da2e9ebf621c8b8dea5b0ab09138d94ffd.zip
[1] Fix new sync-to-vblank option.
[2] Add G550 cursor fix from XFree86-4-Server PR: [2] 43760
-rw-r--r--graphics/dri-devel/Makefile1
-rw-r--r--graphics/dri-devel/files/patch-drm_os_freebsd.h17
-rw-r--r--graphics/dri-devel/files/patch-mga_driver.c10
3 files changed, 28 insertions, 0 deletions
diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index 850e8abe082e..a000c0caf3ca 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dri
PORTVERSION= 20021008
+PORTREVISION= 1
CATEGORIES= graphics x11-servers
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= anholt/dri-devel
diff --git a/graphics/dri-devel/files/patch-drm_os_freebsd.h b/graphics/dri-devel/files/patch-drm_os_freebsd.h
new file mode 100644
index 000000000000..444ed930268d
--- /dev/null
+++ b/graphics/dri-devel/files/patch-drm_os_freebsd.h
@@ -0,0 +1,17 @@
+Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h
+===================================================================
+RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h 29 Sep 2002 23:21:55 -0000 1.9
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h 14 Oct 2002 23:35:24 -0000 1.10
+@@ -142,7 +142,7 @@
+ #define DRM_HZ hz
+
+ #define DRM_WAIT_ON( ret, queue, timeout, condition ) \
+-while (condition) { \
++while (!condition) { \
+ ret = tsleep( &(queue), PZERO | PCATCH, "drmwtq", (timeout) ); \
+ if ( ret ) \
+ return ret; \
diff --git a/graphics/dri-devel/files/patch-mga_driver.c b/graphics/dri-devel/files/patch-mga_driver.c
new file mode 100644
index 000000000000..b33035d4ffef
--- /dev/null
+++ b/graphics/dri-devel/files/patch-mga_driver.c
@@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Thu Sep 19 00:12:42 2002
++++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Sep 19 00:13:56 2002
+@@ -2745,6 +2745,7 @@
+ case PCI_CHIP_MGAG200:
+ case PCI_CHIP_MGAG200_PCI:
+ case PCI_CHIP_MGAG400:
++ case PCI_CHIP_MGAG550:
+ if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
+ outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW,
+ pMga->FbCursorOffset >> 10);