diff options
| author | bjs <bjs> | 2008-07-16 06:41:17 +0000 |
|---|---|---|
| committer | bjs <bjs> | 2008-07-16 06:41:17 +0000 |
| commit | b6dc955081fbfbcbe577dbc1c0ae8ca5a2256527 (patch) | |
| tree | 41030bbc131e0ec331aa0c736ee768da21b7ab03 /x11/libdrm/patches | |
| parent | 2cbcbf0e1db09dde86a5c0585e50a704836f5904 (diff) | |
| download | pkgsrc-b6dc955081fbfbcbe577dbc1c0ae8ca5a2256527.tar.gz | |
Update to libdrm-2.3.1. There is no up-to-date ChangeLog in the package
whatsoever, so I cannot include a list here (see GIT history if
you're curious).
NOTE: This version of libdrm no longer includes the TTM interface.
If any [xorg/mesa] packages are updated to versions explicitly requiring
libdrm-2.3.1, then BUILDLINK_API_DEPENDS for this package will
need to be changed. Also, the i915tex dri driver found in
graphics/MesaLib will not build with this version--but nor was it
supported on any platform except Linux. I have remove i915tex
from the MesaLib driver build; this should be enough to avoid problems.
Diffstat (limited to 'x11/libdrm/patches')
| -rw-r--r-- | x11/libdrm/patches/patch-aa | 6 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-ab | 14 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-ac | 10 |
3 files changed, 12 insertions, 18 deletions
diff --git a/x11/libdrm/patches/patch-aa b/x11/libdrm/patches/patch-aa index 4add3d483d5..35ee59818ec 100644 --- a/x11/libdrm/patches/patch-aa +++ b/x11/libdrm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2007/03/23 16:28:30 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2008/07/16 06:41:17 bjs Exp $ ---- shared-core/drm.h.orig 2007-03-19 22:59:31.000000000 +0100 +--- shared-core/drm.h.orig 2008-07-01 03:55:17.000000000 -0400 +++ shared-core/drm.h -@@ -114,7 +114,10 @@ +@@ -92,7 +92,10 @@ #ifdef __OpenBSD__ #define DRM_MAJOR 81 #endif diff --git a/x11/libdrm/patches/patch-ab b/x11/libdrm/patches/patch-ab index 24f0bc75ea1..c9bc4bc0d1f 100644 --- a/x11/libdrm/patches/patch-ab +++ b/x11/libdrm/patches/patch-ab @@ -1,14 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2008/06/03 10:47:04 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2008/07/16 06:41:17 bjs Exp $ ---- ./libdrm/xf86drm.c.orig 2006-11-08 23:54:38 +0200 -+++ ./libdrm/xf86drm.c 2008-02-14 10:14:55 +0200 -@@ -62,12 +62,12 @@ - - #include "xf86drm.h" - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - #define DRM_MAJOR 145 +--- libdrm/xf86drm.c.orig 2008-07-01 03:51:40.000000000 -0400 ++++ libdrm/xf86drm.c +@@ -62,7 +62,7 @@ #endif #ifdef __NetBSD__ diff --git a/x11/libdrm/patches/patch-ac b/x11/libdrm/patches/patch-ac index 58b61d9d73b..bc429995226 100644 --- a/x11/libdrm/patches/patch-ac +++ b/x11/libdrm/patches/patch-ac @@ -1,19 +1,19 @@ -$NetBSD: patch-ac,v 1.1 2008/05/06 06:20:25 bjs Exp $ +$NetBSD: patch-ac,v 1.2 2008/07/16 06:41:17 bjs Exp $ ---- libdrm/xf86drm.h.orig 2006-11-08 16:55:14.000000000 -0500 +--- libdrm/xf86drm.h.orig 2008-07-01 03:51:40.000000000 -0400 +++ libdrm/xf86drm.h -@@ -37,7 +37,11 @@ +@@ -35,7 +35,11 @@ #define _XF86DRM_H_ #include <stdarg.h> -+#if @ATOMIC_OPS_CHECK@ /* configured by pkgsrc */ ++#if @ATOMIC_OPS_CHECK@ +#include <sys/atomic.h> +#else #include <sys/types.h> +#endif + #include <stdint.h> #include <drm.h> - /* Defaults, if nothing set in xf86config */ @@ -305,7 +309,12 @@ typedef struct _drmSetVersion { #define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ #define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ |