Merge branch 'master' into mate-1.16mate-1.16

4 files changed, 40 insertions, 22 deletions

diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index f8ac400cef6d..080cf854e8c0 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.8
-PORTREVISION=	6
+PORTVERSION=	1.2.9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,6 +10,6 @@ COMMENT=	X.Org glint display driver
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	xf86driproto xf86dgaproto glproto
+USE_XORG=	xf86dgaproto
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 8d55f3705992..0c26611aea19 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
-SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
+TIMESTAMP = 1484715946
+SHA256 (xorg/driver/xf86-video-glint-1.2.9.tar.bz2) = 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2
+SIZE (xorg/driver/xf86-video-glint-1.2.9.tar.bz2) = 419524
diff --git a/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
index 057c03757ab0..cea382aec998 100644
--- a/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
+++ b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
@@ -1,19 +1,15 @@
---- src/glint_driver.c.orig	2012-07-16 02:50:47 UTC
+# Correct the type of a few variables
+#
+--- src/glint_driver.c.orig	2017-01-17 22:34:15 UTC
 +++ src/glint_driver.c
-@@ -52,8 +52,6 @@
- #include "compiler.h"
- #include "mipointer.h"
- 
--#include "mibstore.h"
--
- #include "pm3_regs.h"
- #include "glint_regs.h"
- #include "IBM.h"
-@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
+@@ -1326,8 +1326,8 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flag
+ 		    int basecopro = 
+ 			PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
+ 		    int basedelta = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM)  & 0xFFFFC000;
+-		    int dummy;
+-		    int base3copro, offset;
++		    uint32_t dummy;
++		    uint32_t base3copro, offset;
  
+     		    if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
+  			if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) ||
diff --git a/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c b/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
new file mode 100644
index 000000000000..73e6e93adb91
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
@@ -0,0 +1,22 @@
+# Correct a couple strings that should be const
+#
+--- src/pm2_video.c.orig	2013-02-07 07:55:44 UTC
++++ src/pm2_video.c
+@@ -2593,7 +2593,7 @@ Permedia2ReadInput(int fd, pointer unuse
+ }
+ 
+ static Bool
+-xvipcOpen(char *name, ScrnInfoPtr pScrn)
++xvipcOpen(const char *name, ScrnInfoPtr pScrn)
+ {
+     const char *osname;
+ 
+@@ -3170,7 +3170,7 @@ Permedia2VideoInit(ScreenPtr pScreen)
+ 
+     if (VideoIO ? xf86XVScreenInit(pScreen, &VARPtrs[0], 3) :
+ 		  xf86XVScreenInit(pScreen, &VARPtrs[2], 1)) {
+-	char *s;
++	const char *s;
+ 
+ 	xvEncoding	= MAKE_ATOM(XV_ENCODING);
+ 	xvHue		= MAKE_ATOM(XV_HUE);