Attachment 203343 Details for Bug 236933 – fix

[patch] fix

libdrm.drmGetNodeTypeFromFd.diff (text/plain), 1.49 KB, created by Jan Beich on 2019-04-03 12:31:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2019-04-03 12:31:51 UTC

Size: 1.49 KB

patch

obsolete

>From 6f28536ee601f6d2bda21b8e693fbbf8b2cfcda0 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 3 Apr 2019 12:24:11 +0000
>Subject: [PATCH] graphics/libdrm: make drmGetNodeTypeFromFd actually work
>
>PR:		236933
>Approved by:	x11 (???)
>---
> graphics/libdrm/Makefile              | 1 +
> graphics/libdrm/files/patch-xf86drm.c | 6 ++++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
>index e09714cc4fd12..a211a970c7975 100644
>--- a/graphics/libdrm/Makefile
>+++ b/graphics/libdrm/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libdrm
> PORTVERSION=	2.4.96
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	graphics x11
> MASTER_SITES=	http://dri.freedesktop.org/libdrm/
>diff --git a/graphics/libdrm/files/patch-xf86drm.c b/graphics/libdrm/files/patch-xf86drm.c
>index 8e5135bf901bd..75e01f129a118 100644
>--- a/graphics/libdrm/files/patch-xf86drm.c
>+++ b/graphics/libdrm/files/patch-xf86drm.c
>@@ -309,7 +309,7 @@
>  }
>  
>  static bool drmNodeIsDRM(int maj, int min)
>-@@ -2777,13 +2792,26 @@ static bool drmNodeIsDRM(int maj, int min)
>+@@ -2777,13 +2792,28 @@ static bool drmNodeIsDRM(int maj, int min)
>               maj, min);
>      return stat(path, &sbuf) == 0;
>  #else
>@@ -328,7 +328,9 @@
> +        return -1;
> +    }
> +
>-+    int type = drmGetNodeType(name);
>++    char *token, *tmp = name;
>++    for (; tmp; token = strsep(&tmp, "/")) /* do nothing */;
>++    int type = drmGetNodeType(token);
> +    free(name);
> +    if (type < 0)
> +        errno = ENODEV;

Actions: View | Diff

Attachments on bug 236933: 203295 | 203343 | 203347