summaryrefslogtreecommitdiffstats
path: root/x11-servers/XFree86-4-Server/files/patch-trident_video.c
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-08-28 02:38:21 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-08-28 02:38:21 +0800
commit5b69d6a22223574eeae92fc0926cdbbe59818798 (patch)
tree4393f5e84f8dd92ea8cd53c013c56aa90e80b2b5 /x11-servers/XFree86-4-Server/files/patch-trident_video.c
parent1131e65a1faad808d56038d0e97c0eaf7a8ae9e3 (diff)
downloadmarcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.tar
marcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.tar.gz
marcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.tar.bz2
marcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.tar.lz
marcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.tar.xz
marcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.tar.zst
marcuscom-ports-5b69d6a22223574eeae92fc0926cdbbe59818798.zip
Update freetype2 to 2.2.1, and fix various ports to allow compilation with
the new version. Please test heavily. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7159 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-servers/XFree86-4-Server/files/patch-trident_video.c')
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-trident_video.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_video.c b/x11-servers/XFree86-4-Server/files/patch-trident_video.c
new file mode 100644
index 000000000..776d1ded6
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-trident_video.c
@@ -0,0 +1,19 @@
+Index: programs/Xserver/hw/xfree86/drivers/trident/trident_video.c
+===================================================================
+RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v
+retrieving revision 1.47
+retrieving revision 1.48
+diff -u -r1.47 -r1.48
+--- programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 29 Mar 2004 16:25:22 -0000 1.47
++++ programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 30 Apr 2005 17:04:00 -0000 1.48
+@@ -1307,6 +1307,8 @@
+ * full vblank has passed.
+ * - Alan.
+ */
+- WAITFORVSYNC;
+- WAITFORVSYNC;
++ if (!xf86IsPc98()) {
++ WAITFORVSYNC;
++ WAITFORVSYNC;
++ }
+ }