aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-video-voodoo
diff options
context:
space:
mode:
authorMatthew Rezny <rezny@FreeBSD.org>2017-02-11 14:17:58 +0000
committerMatthew Rezny <rezny@FreeBSD.org>2017-02-11 14:17:58 +0000
commit3f87b5cb51a9164076426ff318d5d77c12b0ced3 (patch)
treef850017ca906c1f973d599485b77a7dceb60e2fc /x11-drivers/xf86-video-voodoo
parentce75c0657853608ceeaeda9f2d28dc0d2c634129 (diff)
downloadports-3f87b5cb51a9164076426ff318d5d77c12b0ced3.tar.gz
ports-3f87b5cb51a9164076426ff318d5d77c12b0ced3.zip
Xorg-servers update to 1.18.4 with driver updates and revision bumps.
Update xf86-video-ati to 7.8.0 Update xf86-video-intel to 2.99.917.20170103 Update xf86-input-synaptics to 1.9.0 Update xf86-input-evdev to 2.10.5 Update xf86-video-r128 to 6.10.2 Update xf86-video-rendition to 4.2.6 New port: xf86-video-geode PR: 214591,216269,214687,214593,214715,216276,216277,216278,216287, 216288,216292,216298,214560,216299,216300,216301,216302 Approved by: swills (mentor, portmgr) Differential Revision: https://reviews.freebsd.org/D9436
Notes
Notes: svn path=/head/; revision=433863
Diffstat (limited to 'x11-drivers/xf86-video-voodoo')
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile2
-rw-r--r--x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h7
-rw-r--r--x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c12
-rw-r--r--x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c17
4 files changed, 31 insertions, 7 deletions
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 2113ace6b228..fea4fce68041 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-voodoo
PORTVERSION= 1.2.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
index e10001f5135c..94f19539bb78 100644
--- a/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
+++ b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
@@ -4,9 +4,7 @@ Date: Mon, 22 Sep 2014 10:56:02 +1000
Subject: don't use PCITAG in struct anymore
-diff --git a/src/voodoo.h b/src/voodoo.h
-index bfed497..c3eb64e 100644
---- src/voodoo.h
+--- src/voodoo.h.orig 2012-07-17 05:21:17 UTC
+++ src/voodoo.h
@@ -23,7 +23,9 @@ typedef struct {
@@ -18,6 +16,3 @@ index bfed497..c3eb64e 100644
CARD32 PhysBase;
CARD32 Width; /* Current width */
---
-cgit v0.10.2
-
diff --git a/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c
new file mode 100644
index 000000000000..1e0183b0e3c9
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c
@@ -0,0 +1,12 @@
+# Remove obsolete function call
+#
+--- src/voodoo_driver.c.orig 2016-11-25 18:37:43 UTC
++++ src/voodoo_driver.c
+@@ -680,7 +680,6 @@ VoodooScreenInit(SCREEN_INIT_ARGS_DECL)
+ if(pVoo->Accel)
+ Voodoo2XAAInit(pScreen);
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+
diff --git a/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c
new file mode 100644
index 000000000000..952fff7d0068
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c
@@ -0,0 +1,17 @@
+# Fix fubar code that worked by accident
+#
+--- src/voodoo_hardware.c.orig 2016-11-25 18:41:04 UTC
++++ src/voodoo_hardware.c
+@@ -390,10 +390,10 @@ static int voodoo_find_dac(VoodooPtr pVo
+ device_id = dac_in(pVoo, 2);
+
+ /* AT&T 20C409 and clones */
+- if(vendor_id == DAC_VENDOR_ATT && DAC_DEVICE_ATT20C409)
++ if(vendor_id == DAC_VENDOR_ATT && device_id == DAC_DEVICE_ATT20C409)
+ return DAC_ID_ATT;
+
+- if(vendor_id == DAC_VENDOR_TI && DAC_DEVICE_TITVP3409)
++ if(vendor_id == DAC_VENDOR_TI && device_id == DAC_DEVICE_TITVP3409)
+ return DAC_ID_TI;
+
+ /* ICS5432 doesn't implement the back door. Glide does some