svn commit: r432174 - in head/x11-drivers/xf86-video-glint: . files
Baptiste Daroussin
bapt at FreeBSD.org
Mon Jan 23 00:15:50 UTC 2017
Author: bapt
Date: Mon Jan 23 00:15:48 2017
New Revision: 432174
URL: https://svnweb.freebsd.org/changeset/ports/432174
Log:
Update to 1.2.9 (which is compatible with newer xorg)
PR: 216282
Submitted by: matthew at reztek.cz
Added:
head/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c (contents, props changed)
Modified:
head/x11-drivers/xf86-video-glint/Makefile
head/x11-drivers/xf86-video-glint/distinfo
head/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
Modified: head/x11-drivers/xf86-video-glint/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-glint/Makefile Mon Jan 23 00:12:38 2017 (r432173)
+++ head/x11-drivers/xf86-video-glint/Makefile Mon Jan 23 00:15:48 2017 (r432174)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-glint
-PORTVERSION= 1.2.8
-PORTREVISION= 6
+PORTVERSION= 1.2.9
CATEGORIES= x11-drivers
MAINTAINER= x11 at 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>
Modified: head/x11-drivers/xf86-video-glint/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-glint/distinfo Mon Jan 23 00:12:38 2017 (r432173)
+++ head/x11-drivers/xf86-video-glint/distinfo Mon Jan 23 00:15:48 2017 (r432174)
@@ -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
Modified: head/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
==============================================================================
--- head/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c Mon Jan 23 00:12:38 2017 (r432173)
+++ head/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c Mon Jan 23 00:15:48 2017 (r432174)
@@ -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) ||
Added: head/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c Mon Jan 23 00:15:48 2017 (r432174)
@@ -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);
More information about the svn-ports-all
mailing list