diff options
author | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-11 14:17:58 +0000 |
---|---|---|
committer | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-11 14:17:58 +0000 |
commit | 3f87b5cb51a9164076426ff318d5d77c12b0ced3 (patch) | |
tree | f850017ca906c1f973d599485b77a7dceb60e2fc /x11-drivers/xf86-video-i128 | |
parent | ce75c0657853608ceeaeda9f2d28dc0d2c634129 (diff) | |
download | ports-3f87b5cb51a9164076426ff318d5d77c12b0ced3.tar.gz ports-3f87b5cb51a9164076426ff318d5d77c12b0ced3.zip |
Notes
Diffstat (limited to 'x11-drivers/xf86-video-i128')
-rw-r--r-- | x11-drivers/xf86-video-i128/Makefile | 2 | ||||
-rw-r--r-- | x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index dad6c5bf46f8..48943d79b717 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c b/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c index 6ac72488c9f9..78ed4a4a9037 100644 --- a/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c +++ b/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c @@ -1,6 +1,8 @@ +# two upstream clean-up commits plus a string const fix +# --- src/i128_driver.c.orig 2012-07-17 05:21:15 UTC +++ src/i128_driver.c -@@ -50,8 +50,6 @@ +@@ -50,12 +50,9 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" @@ -9,7 +11,20 @@ #include "micmap.h" #include "xf86DDC.h" -@@ -1557,7 +1555,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) +-#include "vbe.h" + + #include "xf86cmap.h" + #include "fb.h" +@@ -586,7 +583,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); + } else { + int from = X_DEFAULT; +- char *s = xf86GetOptValString(pI128->Options, OPTION_ACCELMETHOD); ++ const char *s = xf86GetOptValString(pI128->Options, OPTION_ACCELMETHOD); + pI128->NoAccel = FALSE; + if (!xf86NameCmp(s, "EXA")) { + pI128->exa = TRUE; +@@ -1557,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) return FALSE; } |