Attachment #179110 for bug #216295

View | Details | Raw Unified | Return to bug 216295
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	xf86-video-tdfx
PORTVERSION=	1.4.7
PORTREVISION=	1
CATEGORIES=	x11-drivers

MAINTAINER=	x11@FreeBSD.org

COMMENT=	X.Org tdfx display driver

USE_GL=		gl

XORG_CAT=	driver
USE_XORG=	xf86driproto glproto

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-drivers/xf86-video-tdfx/distinfo (-2 / +3 lines)
1	SHA256 (xorg/driver/xf86-video-tdfx-1.4.6.tar.bz2) = 3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37	1	TIMESTAMP = 1484715181
2	SIZE (xorg/driver/xf86-video-tdfx-1.4.6.tar.bz2) = 368300	2	SHA256 (xorg/driver/xf86-video-tdfx-1.4.7.tar.bz2) = 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42
		3	SIZE (xorg/driver/xf86-video-tdfx-1.4.7.tar.bz2) = 372249




# 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))) {




# 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);

Return to bug 216295

Lines 1-8 Link Here

(-)x11-drivers/xf86-video-tdfx/Makefile (-4 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-video-tdfx	3	PORTNAME= xf86-video-tdfx
4	PORTVERSION= 1.4.6	4	PORTVERSION= 1.4.7
5	PORTREVISION= 1
6	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
7		6
8	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
Lines 9-16 Link Here
9	COMMENT= X.Org tdfx display driver	8	COMMENT= X.Org tdfx display driver
10		9
11	USE_GL= gl	10	USE_GL= gl
12
13	XORG_CAT= driver	11	XORG_CAT= driver
14	USE_XORG= xf86driproto glproto
15		12
16	.include <bsd.port.mk>	13	.include <bsd.port.mk>

Line 0 Link Here

(-)x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__dri.c (+13 lines)
	1	# Correct type in a format string
	2	#
	3	--- src/tdfx_dri.c.orig 2015-02-22 21:25:54 UTC
	4	+++ src/tdfx_dri.c
	5	@@ -454,7 +454,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen
	6	xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap failed, disabling DRI.\n");
	7	return FALSE;
	8	}
	9	- xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n",
	10	+ xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n",
	11	pTDFXDRI->regs);
	12
	13	if (!(TDFXInitVisualConfigs(pScreen))) {

Line 0 Link Here

(-)x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c (+40 lines)
	1	# Correct types in a few format strings
	2	#
	3	--- src/tdfx_driver.c.orig 2015-02-22 21:25:54 UTC
	4	+++ src/tdfx_driver.c
	5	@@ -636,30 +636,30 @@ TDFXInitChips(ScrnInfoPtr pScrn)
	6	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
	7	"TDFXInitChips: numchips = %d\n", pTDFX->numChips);
	8	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
	9	- "TDFXInitChips: cfgbits = 0x%08lx, initbits = 0x%08lx\n",
	10	+ "TDFXInitChips: cfgbits = 0x%08x, initbits = 0x%08x\n",
	11	cfgbits, initbits);
	12	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
	13	- "TDFXInitChips: mem0base = 0x%08lx, mem1base = 0x%08lx\n",
	14	+ "TDFXInitChips: mem0base = 0x%08x, mem1base = 0x%08x\n",
	15	mem0base, mem1base);
	16
	17	mem0size = 32 * 1024 * 1024; /* Registers are always 32MB */
	18	mem1size = pScrn->videoRam * 1024 * 2; /* Linear mapping is 2x memory */
	19
	20	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
	21	- "TDFXInitChips: mem0size = 0x%08lx, mem1size = 0x%08lx\n",
	22	+ "TDFXInitChips: mem0size = 0x%08x, mem1size = 0x%08x\n",
	23	mem0size, mem1size);
	24
	25	mem0bits = TDFXSizeToCfg(mem0size);
	26	mem1bits = TDFXSizeToCfg(mem1size) << 4;
	27
	28	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
	29	- "TDFXInitChips: mem0bits = 0x%08lx, mem1bits = 0x%08lx\n",
	30	+ "TDFXInitChips: mem0bits = 0x%08x, mem1bits = 0x%08x\n",
	31	mem0bits, mem1bits);
	32
	33	cfgbits = (cfgbits & ~(0xFF)) \| mem0bits \| mem1bits;
	34
	35	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
	36	- "TDFXInitChips: cfgbits = 0x%08lx\n", cfgbits);
	37	+ "TDFXInitChips: cfgbits = 0x%08x\n", cfgbits);
	38
	39	for (i = 0; i < pTDFX->numChips; i++) {
	40	PCI_WRITE_LONG(initbits \| BIT(10), CFG_INIT_ENABLE, i);