Attachment #203821 for bug #235430

Lines 2-8 Link Here

(-)b/graphics/libdrm/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libdrm	4	PORTNAME= libdrm
5	PORTVERSION= 2.4.96	5	PORTVERSION= 2.4.98
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= graphics x11	7	CATEGORIES= graphics x11
8	MASTER_SITES= http://dri.freedesktop.org/libdrm/	8	MASTER_SITES= http://dri.freedesktop.org/libdrm/

Lines 1-3 Link Here

(-)b/graphics/libdrm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539797646	1	TIMESTAMP = 1555689149
2	SHA256 (libdrm-2.4.96.tar.bz2) = 0d561acf7bb4cc59dc82415100e6c1a44860e8c380e00f9592923e3cd08db393	2	SHA256 (libdrm-2.4.98.tar.bz2) = 8be0edccaca3abde8b6bb1431b46354c7fab46e9b91cc6946ba65b51f56f1894
3	SIZE (libdrm-2.4.96.tar.bz2) = 829518	3	SIZE (libdrm-2.4.98.tar.bz2) = 833295




 #endif
 
 #ifdef __NetBSD__
@@ -177,7 +174,7 @@ drm_public void drmFree(void *pt)
 }
 
 /**
- * Call ioctl, restarting if it is interupted
+ * Call ioctl, restarting if it is interrupted
  */
 drm_public int
 drmIoctl(int fd, unsigned long request, void *arg)
@@ -220,6 +217,89 @@ drm_public drmHashEntry *drmGetEntry(int fd)
     return entry;
 }

 /**
  * Compare two busid strings
  *
@@ -287,7 +367,7 @@ static int drmMatchBusID(const char *id1, const char *
  *
  * \internal
  * Checks for failure. If failure was caused by signal call chown again.
- * If any other failure happened then it will output error mesage using
+ * If any other failure happened then it will output error message using
  * drmMsg() call.
  */
 #if !UDEV
@@ -324,8 +404,8 @@ static int chown_check_return(const char *path, uid_t 
 static int drmOpenDevice(dev_t dev, int minor, int type)
 {

         return DRM_BUS_VIRTIO;
 
     return -EINVAL;
-#elif defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     return DRM_BUS_PCI;
 #else

Return to bug 235430

Lines 41-55 Link Here

(-)b/graphics/libdrm/files/patch-xf86drm.c (-19 / +1 lines)
41	#endif	41	#endif
42		42
43	#ifdef __NetBSD__	43	#ifdef __NetBSD__
44	@@ -177,7 +174,7 @@ drm_public void drmFree(void *pt)
45	}
46
47	/**
48	- * Call ioctl, restarting if it is interupted
49	+ * Call ioctl, restarting if it is interrupted
50	*/
51	drm_public int
52	drmIoctl(int fd, unsigned long request, void *arg)
53	@@ -220,6 +217,89 @@ drm_public drmHashEntry *drmGetEntry(int fd)	44	@@ -220,6 +217,89 @@ drm_public drmHashEntry *drmGetEntry(int fd)
54	return entry;	45	return entry;
55	}	46	}
Lines 140-154 Link Here
140	/**	131	/**
141	* Compare two busid strings	132	* Compare two busid strings
142	*	133	*
143	@@ -287,7 +367,7 @@ static int drmMatchBusID(const char id1, const char
144	*
145	* \internal
146	* Checks for failure. If failure was caused by signal call chown again.
147	- * If any other failure happened then it will output error mesage using
148	+ * If any other failure happened then it will output error message using
149	* drmMsg() call.
150	*/
151	#if !UDEV
152	@@ -324,8 +404,8 @@ static int chown_check_return(const char *path, uid_t	134	@@ -324,8 +404,8 @@ static int chown_check_return(const char *path, uid_t
153	static int drmOpenDevice(dev_t dev, int minor, int type)	135	static int drmOpenDevice(dev_t dev, int minor, int type)
154	{	136	{
Lines 419-425 Link Here
419	return DRM_BUS_VIRTIO;	401	return DRM_BUS_VIRTIO;
420		402
421	return -EINVAL;	403	return -EINVAL;
422	-#elif defined(__OpenBSD__)	404	-#elif defined(__OpenBSD__) \|\| defined(__DragonFly__)
423	+#elif defined(__OpenBSD__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__DragonFly__)	405	+#elif defined(__OpenBSD__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__DragonFly__)
424	return DRM_BUS_PCI;	406	return DRM_BUS_PCI;
425	#else	407	#else