Attachment 203821 Details for Bug 235430 – v2

[patch] v2

libdrm-2.4.98.diff (text/plain), 2.86 KB, created by Jan Beich on 2019-04-20 10:13:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2019-04-20 10:13:48 UTC

Size: 2.86 KB

patch

obsolete

>From 23b8c8d0d87fe5d85e3fc524416ccb5007fb7a84 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 3 Feb 2019 21:16:27 +0000
>Subject: [PATCH] graphics/libdrm: update to 2.4.98
>
>Changes:	https://gitlab.freedesktop.org/mesa/drm/compare/libdrm-2.4.96...libdrm-2.4.98
>ABI:		https://abi-laboratory.pro/tracker/timeline/libdrm/
>PR:		235430
>Submitted by:	Greg V (based on)
>---
> graphics/libdrm/Makefile              |  2 +-
> graphics/libdrm/distinfo              |  6 +++---
> graphics/libdrm/files/patch-xf86drm.c | 20 +-------------------
> 3 files changed, 5 insertions(+), 23 deletions(-)
>
>diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
>index e09714cc4fd1..8b77252250ea 100644
>--- a/graphics/libdrm/Makefile
>+++ b/graphics/libdrm/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libdrm
>-PORTVERSION=	2.4.96
>+PORTVERSION=	2.4.98
> PORTEPOCH=	1
> CATEGORIES=	graphics x11
> MASTER_SITES=	http://dri.freedesktop.org/libdrm/
>diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
>index 91038e3426cc..0567fc824401 100644
>--- a/graphics/libdrm/distinfo
>+++ b/graphics/libdrm/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1539797646
>-SHA256 (libdrm-2.4.96.tar.bz2) = 0d561acf7bb4cc59dc82415100e6c1a44860e8c380e00f9592923e3cd08db393
>-SIZE (libdrm-2.4.96.tar.bz2) = 829518
>+TIMESTAMP = 1555689149
>+SHA256 (libdrm-2.4.98.tar.bz2) = 8be0edccaca3abde8b6bb1431b46354c7fab46e9b91cc6946ba65b51f56f1894
>+SIZE (libdrm-2.4.98.tar.bz2) = 833295
>diff --git a/graphics/libdrm/files/patch-xf86drm.c b/graphics/libdrm/files/patch-xf86drm.c
>index 8e5135bf901b..1d2cb3810464 100644
>--- a/graphics/libdrm/files/patch-xf86drm.c
>+++ b/graphics/libdrm/files/patch-xf86drm.c
>@@ -41,15 +41,6 @@
>  #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;
>  }
>@@ -140,15 +131,6 @@
>  /**
>   * 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)
>  {
>@@ -419,7 +401,7 @@
>          return DRM_BUS_VIRTIO;
>  
>      return -EINVAL;
>--#elif defined(__OpenBSD__)
>+-#elif defined(__OpenBSD__) || defined(__DragonFly__)
> +#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
>      return DRM_BUS_PCI;
>  #else

Actions: View | Diff

Attachments on bug 235430: 201643 | 203821