pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-video-wsfb Fix build with modula...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9d81b127a17c
branches: trunk
changeset: 307748:9d81b127a17c
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sun May 13 03:45:07 2018 +0000
description:
Fix build with modular-xorg-server-1.20.0. Bump PKGREVISION
diffstat:
x11/xf86-video-wsfb/Makefile | 4 +-
x11/xf86-video-wsfb/distinfo | 4 +-
x11/xf86-video-wsfb/patches/patch-src_wsfb__driver.c | 81 +++++++++++++------
3 files changed, 57 insertions(+), 32 deletions(-)
diffs (truncated from 311 to 300 lines):
diff -r a9221794a340 -r 9d81b127a17c x11/xf86-video-wsfb/Makefile
--- a/x11/xf86-video-wsfb/Makefile Sun May 13 03:22:33 2018 +0000
+++ b/x11/xf86-video-wsfb/Makefile Sun May 13 03:45:07 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/05/13 03:45:07 ryoon Exp $
DISTNAME= xf86-video-wsfb-0.4.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff -r a9221794a340 -r 9d81b127a17c x11/xf86-video-wsfb/distinfo
--- a/x11/xf86-video-wsfb/distinfo Sun May 13 03:22:33 2018 +0000
+++ b/x11/xf86-video-wsfb/distinfo Sun May 13 03:45:07 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/05/13 03:45:07 ryoon Exp $
SHA1 (xf86-video-wsfb-0.4.0.tar.bz2) = fc04a2127fc5de3f5d13c56c3be781df34c26a90
RMD160 (xf86-video-wsfb-0.4.0.tar.bz2) = d35555d20ed5ae303846a1e72fa5e55049428edd
SHA512 (xf86-video-wsfb-0.4.0.tar.bz2) = 7a42ab3c29408ed934b21d3e6620c11d0a2765dc7aed0d7f9eebb6068665b32afcec934a413c30ccb655411ca59871c8f503b21377eb4c18f269493d205c5a8d
Size (xf86-video-wsfb-0.4.0.tar.bz2) = 264372 bytes
SHA1 (patch-src_compat-api.h) = 114cfc96361770c145f74c38abd9696943319253
-SHA1 (patch-src_wsfb__driver.c) = 1b846bfd8347c971412e8519afcb9a6a0e00c24d
+SHA1 (patch-src_wsfb__driver.c) = 3f2c9b1fddf67c68657e10dc8144cb7ccc640f6e
diff -r a9221794a340 -r 9d81b127a17c x11/xf86-video-wsfb/patches/patch-src_wsfb__driver.c
--- a/x11/xf86-video-wsfb/patches/patch-src_wsfb__driver.c Sun May 13 03:22:33 2018 +0000
+++ b/x11/xf86-video-wsfb/patches/patch-src_wsfb__driver.c Sun May 13 03:45:07 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_wsfb__driver.c,v 1.2 2015/04/02 22:16:49 tnn Exp $
+$NetBSD: patch-src_wsfb__driver.c,v 1.3 2018/05/13 03:45:07 ryoon Exp $
Add revision 1.15 from xsrc version:
date: 2013-01-31 12:18:01 +0100; author: macallan; state: Exp; lines: +145 -72;
@@ -9,6 +9,9 @@
fa9aabe95a65c4dd12008e16ad66d5c773a7993a
2993b33c466793c984b0c7cfeab06a3e333a29dd
+Replace LoaderGetOS with ifdef (fix build with modular-xorg-server-1.20.0)
+8069c6970c731c38e105f5dddd5ce83ba88b0773
+
--- src/wsfb_driver.c.orig 2012-01-01 15:25:08.000000000 +0000
+++ src/wsfb_driver.c
@@ -53,7 +53,6 @@
@@ -51,7 +54,29 @@
static void WsfbLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
static Bool WsfbSaveScreen(ScreenPtr, int);
static void WsfbSave(ScrnInfoPtr);
-@@ -231,7 +232,7 @@ WsfbSetup(pointer module, pointer opts,
+@@ -205,18 +206,11 @@ static pointer
+ WsfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+ {
+ static Bool setupDone = FALSE;
+- const char *osname;
+
+- /* Check that we're being loaded on a OpenBSD or NetBSD system. */
+- LoaderGetOS(&osname, NULL, NULL, NULL);
+- if (!osname || (strcmp(osname, "openbsd") != 0 &&
+- strcmp(osname, "netbsd") != 0)) {
+- if (errmaj)
+- *errmaj = LDR_BADOS;
+- if (errmin)
+- *errmin = 0;
++#if !defined(__NetBSD__) && !defined(__OpenBSD__)
+ return NULL;
+- }
++#endif
++
+ if (!setupDone) {
+ setupDone = TRUE;
+ xf86AddDriver(&WSFB, module, HaveDriverFuncs);
+@@ -231,7 +225,7 @@ WsfbSetup(pointer module, pointer opts,
/* Private data */
typedef struct {
int fd; /* File descriptor of open device. */
@@ -60,7 +85,7 @@
int linebytes; /* Number of bytes per row. */
unsigned char* fbstart;
unsigned char* fbmem;
-@@ -241,7 +242,7 @@ typedef struct {
+@@ -241,7 +235,7 @@ typedef struct {
void * shadow;
CloseScreenProcPtr CloseScreen;
CreateScreenResourcesProcPtr CreateScreenResources;
@@ -69,7 +94,7 @@
EntityInfoPtr pEnt;
struct wsdisplay_cmap saved_cmap;
-@@ -426,48 +427,96 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -426,48 +420,96 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
return FALSE;
}
@@ -190,7 +215,7 @@
free(fPtr->saved_cmap.red);
free(fPtr->saved_cmap.green);
return FALSE;
-@@ -475,18 +524,18 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -475,18 +517,18 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
}
/* Handle depth */
@@ -214,7 +239,7 @@
return FALSE;
}
xf86PrintDepthBpp(pScrn);
-@@ -496,17 +545,28 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -496,17 +538,28 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
pix24bpp = xf86GetBppFromDepth(pScrn, 24);
/* Color weight */
@@ -252,7 +277,7 @@
} else {
masks.red = 0;
masks.green = 0;
-@@ -535,7 +595,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -535,7 +588,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
pScrn->progClock = TRUE;
pScrn->rgbBits = 8;
pScrn->chipset = "wsfb";
@@ -261,7 +286,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Vidmem: %dk\n",
pScrn->videoRam/1024);
-@@ -550,10 +610,12 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -550,10 +603,12 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
fPtr->Options);
/* Use shadow framebuffer by default, on depth >= 8 */
@@ -276,7 +301,7 @@
if (xf86ReturnOptValBool(fPtr->Options,
OPTION_SHADOW_FB, FALSE)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-@@ -601,12 +663,12 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -601,12 +656,12 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
mode->status = MODE_OK;
mode->type = M_T_BUILTIN;
mode->Clock = 0;
@@ -291,7 +316,7 @@
mode->VSyncStart = 0;
mode->VSyncEnd = 0;
mode->VTotal = 0;
-@@ -617,8 +679,8 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -617,8 +672,8 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
"Ignoring mode specification from screen section\n");
}
pScrn->currentMode = pScrn->modes = mode;
@@ -302,7 +327,7 @@
pScrn->displayWidth = pScrn->virtualX;
/* Set the display resolution. */
-@@ -661,10 +723,22 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
+@@ -661,10 +716,22 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
return TRUE;
}
@@ -326,7 +351,7 @@
WsfbPtr fPtr = WSFBPTR(pScrn);
PixmapPtr pPixmap;
Bool ret;
-@@ -679,7 +753,7 @@ WsfbCreateScreenResources(ScreenPtr pScr
+@@ -679,7 +746,7 @@ WsfbCreateScreenResources(ScreenPtr pScr
pPixmap = pScreen->GetScreenPixmap(pScreen);
if (!shadowAdd(pScreen, pPixmap, fPtr->rotate ?
@@ -335,7 +360,7 @@
WsfbWindowLinear, fPtr->rotate, NULL)) {
return FALSE;
}
-@@ -702,7 +776,7 @@ WsfbShadowInit(ScreenPtr pScreen)
+@@ -702,7 +769,7 @@ WsfbShadowInit(ScreenPtr pScreen)
}
static Bool
@@ -344,7 +369,7 @@
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
WsfbPtr fPtr = WSFBPTR(pScrn);
-@@ -721,36 +795,39 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
+@@ -721,36 +788,39 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
pScrn->mask.red,pScrn->mask.green,pScrn->mask.blue,
pScrn->offset.red,pScrn->offset.green,pScrn->offset.blue);
#endif
@@ -396,7 +421,7 @@
return FALSE;
}
/* Switch to graphics mode - required before mmap. */
-@@ -868,7 +945,7 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
+@@ -868,7 +938,7 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
"RENDER extension initialisation failed.");
}
if (fPtr->shadowFB && !WsfbShadowInit(pScreen)) {
@@ -405,7 +430,7 @@
"shadow framebuffer initialization failed\n");
return FALSE;
}
-@@ -877,20 +954,19 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
+@@ -877,20 +947,19 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
if (!fPtr->rotate)
WsfbDGAInit(pScrn, pScreen);
else
@@ -429,7 +454,7 @@
xf86SetBackingStore(pScreen);
/* Software cursor. */
-@@ -907,10 +983,16 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
+@@ -907,10 +976,16 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
if (!miCreateDefColormap(pScreen))
return FALSE;
flags = CMAP_RELOAD_ON_MODE_SWITCH;
@@ -447,7 +472,7 @@
if(!xf86HandleColormaps(pScreen, ncolors, 8, WsfbLoadPalette,
NULL, flags))
return FALSE;
-@@ -937,9 +1019,9 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
+@@ -937,9 +1012,9 @@ WsfbScreenInit(int scrnIndex, ScreenPtr
}
static Bool
@@ -459,7 +484,7 @@
PixmapPtr pPixmap;
WsfbPtr fPtr = WSFBPTR(pScrn);
-@@ -971,30 +1053,34 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr
+@@ -971,30 +1046,34 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr
/* Unwrap CloseScreen. */
pScreen->CloseScreen = fPtr->CloseScreen;
TRACE_EXIT("WsfbCloseScreen");
@@ -502,7 +527,7 @@
WsfbPtr fPtr = WSFBPTR(pScrn);
int newX, newY;
-@@ -1026,13 +1112,13 @@ WsfbPointerMoved(int index, int x, int y
+@@ -1026,13 +1105,13 @@ WsfbPointerMoved(int index, int x, int y
}
/* Pass adjusted pointer coordinates to wrapped PointerMoved function. */
@@ -519,7 +544,7 @@
TRACE_ENTER("EnterVT");
pScrn->vtSema = TRUE;
-@@ -1041,20 +1127,20 @@ WsfbEnterVT(int scrnIndex, int flags)
+@@ -1041,20 +1120,20 @@ WsfbEnterVT(int scrnIndex, int flags)
}
static void
@@ -544,7 +569,7 @@
#endif
TRACE_ENTER("SwitchMode");
-@@ -1063,10 +1149,10 @@ WsfbSwitchMode(int scrnIndex, DisplayMod
+@@ -1063,10 +1142,10 @@ WsfbSwitchMode(int scrnIndex, DisplayMod
}
static int
@@ -557,7 +582,7 @@
#endif
TRACE_ENTER("ValidMode");
-@@ -1132,7 +1218,7 @@ WsfbLoadPalette(ScrnInfoPtr pScrn, int n
+@@ -1132,7 +1211,7 @@ WsfbLoadPalette(ScrnInfoPtr pScrn, int n
static Bool
WsfbSaveScreen(ScreenPtr pScreen, int mode)
{
@@ -566,7 +591,7 @@
WsfbPtr fPtr = WSFBPTR(pScrn);
int state;
-@@ -1159,11 +1245,12 @@ WsfbSave(ScrnInfoPtr pScrn)
+@@ -1159,11 +1238,12 @@ WsfbSave(ScrnInfoPtr pScrn)
TRACE_ENTER("WsfbSave");
@@ -581,7 +606,7 @@
if (ioctl(fPtr->fd, WSDISPLAYIO_GETCMAP,
&(fPtr->saved_cmap)) == -1) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -1181,7 +1268,7 @@ WsfbRestore(ScrnInfoPtr pScrn)
+@@ -1181,7 +1261,7 @@ WsfbRestore(ScrnInfoPtr pScrn)
TRACE_ENTER("WsfbRestore");
@@ -590,7 +615,7 @@
/* reset colormap for text mode */
if (ioctl(fPtr->fd, WSDISPLAYIO_PUTCMAP,
&(fPtr->saved_cmap)) == -1) {
-@@ -1240,9 +1327,9 @@ WsfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
+@@ -1240,9 +1320,9 @@ WsfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
frameY0 = pScrn->frameY0;
}
@@ -602,7 +627,7 @@
return TRUE;
}
-@@ -1250,7 +1337,7 @@ WsfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
+@@ -1250,7 +1330,7 @@ WsfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
static void
Home |
Main Index |
Thread Index |
Old Index