[Midnightbsd-cvs] mports [23971] trunk/x11-drivers/xf86-video-trident: update

[laffer1 at midnightbsd.org]

Revision: 23971
          http://svnweb.midnightbsd.org/mports/?rev=23971
Author:   laffer1
Date:     2018-08-27 22:57:55 -0400 (Mon, 27 Aug 2018)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-trident/Makefile
    trunk/x11-drivers/xf86-video-trident/distinfo
    trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c

Added Paths:
-----------
    trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c

Modified: trunk/x11-drivers/xf86-video-trident/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-trident/Makefile	2018-08-28 02:57:10 UTC (rev 23970)
+++ trunk/x11-drivers/xf86-video-trident/Makefile	2018-08-28 02:57:55 UTC (rev 23971)
@@ -1,9 +1,7 @@
 # $MidnightBSD$
-#
 
 PORTNAME=	xf86-video-trident
-PORTVERSION=	1.3.6
-PORTREVISION=	2
+PORTVERSION=	1.3.8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -12,6 +10,6 @@
 LICENSE=	mit
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto xf86dgaproto
+USE_XORG=	xf86dgaproto
 
 .include <bsd.port.mk>

Modified: trunk/x11-drivers/xf86-video-trident/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-trident/distinfo	2018-08-28 02:57:10 UTC (rev 23970)
+++ trunk/x11-drivers/xf86-video-trident/distinfo	2018-08-28 02:57:55 UTC (rev 23971)
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
-SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
+TIMESTAMP = 1484716004
+SHA256 (xorg/driver/xf86-video-trident-1.3.8.tar.bz2) = 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f
+SIZE (xorg/driver/xf86-video-trident-1.3.8.tar.bz2) = 387742

Added: trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c
===================================================================
--- trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c	2018-08-28 02:57:55 UTC (rev 23971)
@@ -0,0 +1,15 @@
+# Fix a style warning
+#
+--- src/trident_dac.c.orig	2013-02-07 07:56:43 UTC
++++ src/trident_dac.c
+@@ -1226,8 +1226,8 @@ Tridentddc1Read(ScrnInfoPtr pScrn)
+     OUTW(0x3C4, (temp << 8) | NewMode1);
+ 
+     /* Wait until vertical retrace is in progress. */
+-    while (INB(vgaIOBase + 0xA) & 0x08);
+-    while (!(INB(vgaIOBase + 0xA) & 0x08));
++    while (INB(vgaIOBase + 0xA) & 0x08) {}
++    while (!(INB(vgaIOBase + 0xA) & 0x08)) {}
+ 
+     /* Get the result */
+     OUTB(vgaIOBase + 4, I2C);


Property changes on: trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.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
Modified: trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c	2018-08-28 02:57:10 UTC (rev 23970)
+++ trunk/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c	2018-08-28 02:57:55 UTC (rev 23971)
@@ -1,18 +1,13 @@
---- src/trident_driver.c.orig	2012-07-16 02:16:00 UTC
+# Correct a string that should be const
+#
+--- src/trident_driver.c.orig	2015-03-30 17:05:53 UTC
 +++ src/trident_driver.c
-@@ -56,7 +56,6 @@
+@@ -1010,7 +1010,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int fl
+     ClockRangePtr clockRanges;
+     Bool ddcLoaded = FALSE;
+     xf86MonPtr pMon = NULL;
+-    char *s;
++    const char *s;
+     Bool tmp_bool;
  
- #include "mipointer.h"
- 
--#include "mibstore.h"
- #include "shadow.h"
- #include "trident.h"
- #include "trident_regs.h"
-@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
-     	TridentAccelInit(pScreen);
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
-     /* Initialise cursor functions */
+     /* Allocate the TRIDENTRec driverPrivate */