[Midnightbsd-cvs] mports [23924] trunk/x11-drivers/xf86-video-voodoo: add patches

[laffer1 at midnightbsd.org]

Revision: 23924
          http://svnweb.midnightbsd.org/mports/?rev=23924
Author:   laffer1
Date:     2018-08-26 17:32:22 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
add patches

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-voodoo/Makefile

Added Paths:
-----------
    trunk/x11-drivers/xf86-video-voodoo/files/
    trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
    trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c
    trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c

Modified: trunk/x11-drivers/xf86-video-voodoo/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-voodoo/Makefile	2018-08-26 21:31:18 UTC (rev 23923)
+++ trunk/x11-drivers/xf86-video-voodoo/Makefile	2018-08-26 21:32:22 UTC (rev 23924)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-voodoo
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ports at MidnightBSD.org

Added: trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
===================================================================
--- trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h	2018-08-26 21:32:22 UTC (rev 23924)
@@ -0,0 +1,18 @@
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: don't use PCITAG in struct anymore
+
+
+--- src/voodoo.h.orig	2012-07-17 05:21:17 UTC
++++ src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+   
+   Bool		      Voodoo2;		/* Set if Voodoo2 */
+   pciVideoPtr	      PciInfo;		/* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG	      PciTag;
++#endif
+   CARD32	      PhysBase;
+   
+   CARD32	      Width;		/* Current width */


Property changes on: trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c	2018-08-26 21:32:22 UTC (rev 23924)
@@ -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);
+   
+ 


Property changes on: trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c
===================================================================
--- trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c	2018-08-26 21:32:22 UTC (rev 23924)
@@ -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


Property changes on: trunk/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property