Attachment 179096 Details for Bug 216282 – update x11-drivers/xf86-video-glint to 1.2.8

[patch] update x11-drivers/xf86-video-glint to 1.2.8

x11-drivers_xf86-video-glint.patch (text/plain), 3.73 KB, created by Matthew Rezny on 2017-01-19 21:17:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2017-01-19 21:17:33 UTC

Size: 3.73 KB

patch

obsolete

>Index: x11-drivers/xf86-video-glint/Makefile
>===================================================================
>--- x11-drivers/xf86-video-glint/Makefile	(revision 431798)
>+++ x11-drivers/xf86-video-glint/Makefile	(working copy)
>@@ -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 @@
> USE_GL=		gl
> 
> XORG_CAT=	driver
>-USE_XORG=	xf86driproto xf86dgaproto glproto
>+USE_XORG=	xf86dgaproto
> 
> .include <bsd.port.mk>
>Index: x11-drivers/xf86-video-glint/distinfo
>===================================================================
>--- x11-drivers/xf86-video-glint/distinfo	(revision 431798)
>+++ x11-drivers/xf86-video-glint/distinfo	(working copy)
>@@ -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
>Index: x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
>===================================================================
>--- x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c	(revision 431798)
>+++ x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c	(working copy)
>@@ -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"
>+@@ -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;
>  
>--#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);
>- 
>+     		    if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
>+  			if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) ||
>Index: x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
>===================================================================
>--- x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c	(nonexistent)
>+++ x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c	(working copy)
>@@ -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);
>
>Property changes on: x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>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

Actions: View | Diff

Attachments on bug 216282: 179096