Attachment #179102 for bug #216287

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

Lines 1-7 Link Here

(-)x11-drivers/xf86-video-r128/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-video-r128	3	PORTNAME= xf86-video-r128
4	PORTVERSION= 6.10.1	4	PORTVERSION= 6.10.2
5	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
Lines 12-17 Link Here
12		12
13	USE_GL= gl	13	USE_GL= gl
14	XORG_CAT= driver	14	XORG_CAT= driver
15	USE_XORG= glproto xf86driproto xf86miscproto xineramaproto	15	USE_XORG= xf86miscproto
16		16
17	.include <bsd.port.mk>	17	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11-drivers/xf86-video-r128/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1484351416	1	TIMESTAMP = 1484717021
2	SHA256 (xorg/driver/xf86-video-r128-6.10.1.tar.bz2) = 5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea	2	SHA256 (xorg/driver/xf86-video-r128-6.10.2.tar.bz2) = 84da21517f3af7617fdf341e84ccb22444d6cdab1647e4808fa631528b9a77de
3	SIZE (xorg/driver/xf86-video-r128-6.10.1.tar.bz2) = 495306	3	SIZE (xorg/driver/xf86-video-r128-6.10.2.tar.bz2) = 504031




# Correct type in format strings
#
--- src/r128_dri.c.orig	2017-01-17 22:42:44 UTC
+++ src/r128_dri.c
@@ -500,7 +500,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[agp] %d kB allocated with handle 0x%08x\n",
+	       "[agp] %d kB allocated with handle 0x%08lx\n",
 	       info->agpSize*1024, info->agpMemHandle);
 
     if (drmAgpBind(info->drmFD, info->agpMemHandle, info->agpOffset) < 0) {
@@ -540,7 +540,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[agp] ring handle = 0x%08x\n", info->ringHandle);
+	       "[agp] ring handle = 0x%08lx\n", info->ringHandle);
 
     if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
 	       &info->ring) < 0) {
@@ -558,7 +558,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
- 	       "[agp] ring read ptr handle = 0x%08x\n",
+ 	       "[agp] ring read ptr handle = 0x%08lx\n",
 	       info->ringReadPtrHandle);
 
     if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
@@ -578,7 +578,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[agp] vertex/indirect buffers handle = 0x%08x\n",
+	       "[agp] vertex/indirect buffers handle = 0x%08lx\n",
 	       info->bufHandle);
 
     if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
@@ -598,7 +598,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[agp] AGP texture map handle = 0x%08x\n",
+	       "[agp] AGP texture map handle = 0x%08lx\n",
 	       info->agpTexHandle);
 
     if (drmMap(info->drmFD, info->agpTexHandle, info->agpTexMapSize,
@@ -660,7 +660,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[pci] %d kB allocated with handle 0x%08x\n",
+	       "[pci] %d kB allocated with handle 0x%08lx\n",
 	       info->agpSize*1024, info->pciMemHandle);
 
 				/* Initialize the CCE ring buffer data */
@@ -684,7 +684,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[pci] ring handle = 0x%08x\n", info->ringHandle);
+	       "[pci] ring handle = 0x%08lx\n", info->ringHandle);
 
     if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
 	       &info->ring) < 0) {
@@ -705,7 +705,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[pci] ring read ptr handle = 0x%08x\n",
+	       "[pci] ring read ptr handle = 0x%08lx\n",
 	       info->ringReadPtrHandle);
 
     if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
@@ -728,7 +728,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[pci] vertex/indirect buffers handle = 0x%08x\n",
+	       "[pci] vertex/indirect buffers handle = 0x%08lx\n",
 	       info->bufHandle);
 
     if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
@@ -829,7 +829,7 @@ static Bool R128DRIMapInit(R128InfoPtr i
 	return FALSE;
     }
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[drm] register handle = 0x%08x\n", info->registerHandle);
+	       "[drm] register handle = 0x%08lx\n", info->registerHandle);
 
     return TRUE;
 }

Return to bug 216287

Line 0 Link Here

(-)x11-drivers/xf86-video-r128/files/patch-src_r128__dri.c (+94 lines)
		1	# Correct type in format strings
		2	#
		3	--- src/r128_dri.c.orig 2017-01-17 22:42:44 UTC
		4	+++ src/r128_dri.c
		5	@@ -500,7 +500,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
		6	return FALSE;
		7	}
		8	xf86DrvMsg(pScreen->myNum, X_INFO,
		9	- "[agp] %d kB allocated with handle 0x%08x\n",
		10	+ "[agp] %d kB allocated with handle 0x%08lx\n",
		11	info->agpSize*1024, info->agpMemHandle);
		12
		13	if (drmAgpBind(info->drmFD, info->agpMemHandle, info->agpOffset) < 0) {
		14	@@ -540,7 +540,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
		15	return FALSE;
		16	}
		17	xf86DrvMsg(pScreen->myNum, X_INFO,
		18	- "[agp] ring handle = 0x%08x\n", info->ringHandle);
		19	+ "[agp] ring handle = 0x%08lx\n", info->ringHandle);
		20
		21	if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
		22	&info->ring) < 0) {
		23	@@ -558,7 +558,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
		24	return FALSE;
		25	}
		26	xf86DrvMsg(pScreen->myNum, X_INFO,
		27	- "[agp] ring read ptr handle = 0x%08x\n",
		28	+ "[agp] ring read ptr handle = 0x%08lx\n",
		29	info->ringReadPtrHandle);
		30
		31	if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
		32	@@ -578,7 +578,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
		33	return FALSE;
		34	}
		35	xf86DrvMsg(pScreen->myNum, X_INFO,
		36	- "[agp] vertex/indirect buffers handle = 0x%08x\n",
		37	+ "[agp] vertex/indirect buffers handle = 0x%08lx\n",
		38	info->bufHandle);
		39
		40	if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
		41	@@ -598,7 +598,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
		42	return FALSE;
		43	}
		44	xf86DrvMsg(pScreen->myNum, X_INFO,
		45	- "[agp] AGP texture map handle = 0x%08x\n",
		46	+ "[agp] AGP texture map handle = 0x%08lx\n",
		47	info->agpTexHandle);
		48
		49	if (drmMap(info->drmFD, info->agpTexHandle, info->agpTexMapSize,
		50	@@ -660,7 +660,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
		51	return FALSE;
		52	}
		53	xf86DrvMsg(pScreen->myNum, X_INFO,
		54	- "[pci] %d kB allocated with handle 0x%08x\n",
		55	+ "[pci] %d kB allocated with handle 0x%08lx\n",
		56	info->agpSize*1024, info->pciMemHandle);
		57
		58	/* Initialize the CCE ring buffer data */
		59	@@ -684,7 +684,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
		60	return FALSE;
		61	}
		62	xf86DrvMsg(pScreen->myNum, X_INFO,
		63	- "[pci] ring handle = 0x%08x\n", info->ringHandle);
		64	+ "[pci] ring handle = 0x%08lx\n", info->ringHandle);
65
66	if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
67	&info->ring) < 0) {
68	@@ -705,7 +705,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
69	return FALSE;
70	}
71	xf86DrvMsg(pScreen->myNum, X_INFO,
72	- "[pci] ring read ptr handle = 0x%08x\n",
73	+ "[pci] ring read ptr handle = 0x%08lx\n",
74	info->ringReadPtrHandle);
75
76	if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
77	@@ -728,7 +728,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
78	return FALSE;
79	}
80	xf86DrvMsg(pScreen->myNum, X_INFO,
81	- "[pci] vertex/indirect buffers handle = 0x%08x\n",
82	+ "[pci] vertex/indirect buffers handle = 0x%08lx\n",
83	info->bufHandle);
84
85	if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
86	@@ -829,7 +829,7 @@ static Bool R128DRIMapInit(R128InfoPtr i
87	return FALSE;
88	}
89	xf86DrvMsg(pScreen->myNum, X_INFO,
90	- "[drm] register handle = 0x%08x\n", info->registerHandle);
91	+ "[drm] register handle = 0x%08lx\n", info->registerHandle);
92
93	return TRUE;
94	}