--- x11-drivers/xf86-video-tdfx/Makefile (revision 431798) +++ x11-drivers/xf86-video-tdfx/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-tdfx -PORTVERSION= 1.4.6 -PORTREVISION= 1 +PORTVERSION= 1.4.7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -9,8 +8,6 @@ COMMENT= X.Org tdfx display driver USE_GL= gl - XORG_CAT= driver -USE_XORG= xf86driproto glproto .include --- x11-drivers/xf86-video-tdfx/distinfo (revision 431798) +++ x11-drivers/xf86-video-tdfx/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-tdfx-1.4.6.tar.bz2) = 3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37 -SIZE (xorg/driver/xf86-video-tdfx-1.4.6.tar.bz2) = 368300 +TIMESTAMP = 1484715181 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.7.tar.bz2) = 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42 +SIZE (xorg/driver/xf86-video-tdfx-1.4.7.tar.bz2) = 372249 --- x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__dri.c (nonexistent) +++ x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__dri.c (working copy) @@ -0,0 +1,13 @@ +# Correct type in a format string +# +--- src/tdfx_dri.c.orig 2015-02-22 21:25:54 UTC ++++ src/tdfx_dri.c +@@ -454,7 +454,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen + xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap failed, disabling DRI.\n"); + return FALSE; + } +- xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n", ++ xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n", + pTDFXDRI->regs); + + if (!(TDFXInitVisualConfigs(pScreen))) { --- x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c (nonexistent) +++ x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c (working copy) @@ -0,0 +1,40 @@ +# Correct types in a few format strings +# +--- src/tdfx_driver.c.orig 2015-02-22 21:25:54 UTC ++++ src/tdfx_driver.c +@@ -636,30 +636,30 @@ TDFXInitChips(ScrnInfoPtr pScrn) + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, + "TDFXInitChips: numchips = %d\n", pTDFX->numChips); + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, +- "TDFXInitChips: cfgbits = 0x%08lx, initbits = 0x%08lx\n", ++ "TDFXInitChips: cfgbits = 0x%08x, initbits = 0x%08x\n", + cfgbits, initbits); + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, +- "TDFXInitChips: mem0base = 0x%08lx, mem1base = 0x%08lx\n", ++ "TDFXInitChips: mem0base = 0x%08x, mem1base = 0x%08x\n", + mem0base, mem1base); + + mem0size = 32 * 1024 * 1024; /* Registers are always 32MB */ + mem1size = pScrn->videoRam * 1024 * 2; /* Linear mapping is 2x memory */ + + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, +- "TDFXInitChips: mem0size = 0x%08lx, mem1size = 0x%08lx\n", ++ "TDFXInitChips: mem0size = 0x%08x, mem1size = 0x%08x\n", + mem0size, mem1size); + + mem0bits = TDFXSizeToCfg(mem0size); + mem1bits = TDFXSizeToCfg(mem1size) << 4; + + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, +- "TDFXInitChips: mem0bits = 0x%08lx, mem1bits = 0x%08lx\n", ++ "TDFXInitChips: mem0bits = 0x%08x, mem1bits = 0x%08x\n", + mem0bits, mem1bits); + + cfgbits = (cfgbits & ~(0xFF)) | mem0bits | mem1bits; + + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, +- "TDFXInitChips: cfgbits = 0x%08lx\n", cfgbits); ++ "TDFXInitChips: cfgbits = 0x%08x\n", cfgbits); + + for (i = 0; i < pTDFX->numChips; i++) { + PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);