aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2017-01-23 00:52:13 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2017-01-23 00:52:13 +0000
commit45d5cfd662cd070e976ac676d56a3233d2f391be (patch)
tree27e19d4b0690a1ebc2f52047cb31b8e08dea823b /x11-drivers
parent336fd56813286df8fa78e0b56a2b112bd47c0368 (diff)
downloadports-45d5cfd662cd070e976ac676d56a3233d2f391be.tar.gz
ports-45d5cfd662cd070e976ac676d56a3233d2f391be.zip
Update to 1.3.8
PR: 216296 Submitted by: matthew@reztek.cz
Notes
Notes: svn path=/head/; revision=432183
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-trident/Makefile2
-rw-r--r--x11-drivers/xf86-video-trident/distinfo5
-rw-r--r--x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c15
-rw-r--r--x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c13
4 files changed, 32 insertions, 3 deletions
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index dff0680ecb3d..35cf223b0060 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-trident
-PORTVERSION= 1.3.7
+PORTVERSION= 1.3.8
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index 8e9f34afc40c..1175cb79cce7 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.7.tar.bz2) = ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae
-SIZE (xorg/driver/xf86-video-trident-1.3.7.tar.bz2) = 376898
+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
diff --git a/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c b/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c
new file mode 100644
index 000000000000..a371871244be
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c
@@ -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);
diff --git a/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
new file mode 100644
index 000000000000..08ff59985dcf
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
@@ -0,0 +1,13 @@
+# Correct a string that should be const
+#
+--- src/trident_driver.c.orig 2015-03-30 17:05:53 UTC
++++ src/trident_driver.c
+@@ -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;
+
+ /* Allocate the TRIDENTRec driverPrivate */