diff options
author | tnn <tnn> | 2010-04-16 13:43:36 +0000 |
---|---|---|
committer | tnn <tnn> | 2010-04-16 13:43:36 +0000 |
commit | eb75ac80aa6e1742896b585aecede7a3d1e1f9f1 (patch) | |
tree | b9459ead11d455d52edaa517e4ffbb41c858274f /x11/libdrm/patches | |
parent | 3ef02e5809a329aaefb8c7b41e5a0f966155ed6a (diff) | |
download | pkgsrc-eb75ac80aa6e1742896b585aecede7a3d1e1f9f1.tar.gz |
Update to libdrm-2.4.20.
Many changes since 2.4.13, I won't pretend to understand them all.
This update is a prerequisite for eventually moving forward with MesaLib
and xorg-server updates.
Diffstat (limited to 'x11/libdrm/patches')
-rw-r--r-- | x11/libdrm/patches/patch-aa | 16 | ||||
-rw-r--r-- | x11/libdrm/patches/patch-ab | 8 | ||||
-rw-r--r-- | x11/libdrm/patches/patch-ac | 8 |
3 files changed, 8 insertions, 24 deletions
diff --git a/x11/libdrm/patches/patch-aa b/x11/libdrm/patches/patch-aa deleted file mode 100644 index 35ee59818ec..00000000000 --- a/x11/libdrm/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/07/16 06:41:17 bjs Exp $ - ---- shared-core/drm.h.orig 2008-07-01 03:55:17.000000000 -0400 -+++ shared-core/drm.h -@@ -92,7 +92,10 @@ - #ifdef __OpenBSD__ - #define DRM_MAJOR 81 - #endif --#if defined(__linux__) || defined(__NetBSD__) -+#if defined(__NetBSD__) -+#define DRM_MAJOR 180 -+#endif -+#if defined(__linux__) - #define DRM_MAJOR 226 - #endif - #define DRM_MAX_MINOR 15 diff --git a/x11/libdrm/patches/patch-ab b/x11/libdrm/patches/patch-ab index c9bc4bc0d1f..5becab0a760 100644 --- a/x11/libdrm/patches/patch-ab +++ b/x11/libdrm/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2008/07/16 06:41:17 bjs Exp $ +$NetBSD: patch-ab,v 1.5 2010/04/16 13:43:36 tnn Exp $ ---- libdrm/xf86drm.c.orig 2008-07-01 03:51:40.000000000 -0400 -+++ libdrm/xf86drm.c -@@ -62,7 +62,7 @@ +--- xf86drm.c.orig 2010-03-05 23:21:13.000000000 +0000 ++++ xf86drm.c +@@ -64,7 +64,7 @@ #endif #ifdef __NetBSD__ diff --git a/x11/libdrm/patches/patch-ac b/x11/libdrm/patches/patch-ac index bc429995226..cff1e4f65c7 100644 --- a/x11/libdrm/patches/patch-ac +++ b/x11/libdrm/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2008/07/16 06:41:17 bjs Exp $ +$NetBSD: patch-ac,v 1.3 2010/04/16 13:43:36 tnn Exp $ ---- libdrm/xf86drm.h.orig 2008-07-01 03:51:40.000000000 -0400 -+++ libdrm/xf86drm.h +--- xf86drm.h.orig 2010-03-05 23:21:13.000000000 +0000 ++++ xf86drm.h @@ -35,7 +35,11 @@ #define _XF86DRM_H_ @@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.2 2008/07/16 06:41:17 bjs Exp $ #include <stdint.h> #include <drm.h> -@@ -305,7 +309,12 @@ typedef struct _drmSetVersion { +@@ -333,7 +337,12 @@ typedef struct _drmSetVersion { #define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ #define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ |