[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Fix build with libdrm-2.3.0.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c09e11aeea8
branches:  trunk
changeset: 523861:3c09e11aeea8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 14 11:06:02 2007 +0000

description:
Fix build with libdrm-2.3.0.

diffstat:

 x11/modular-xorg-server/distinfo         |   3 +-
 x11/modular-xorg-server/patches/patch-ae |  44 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletions(-)

diffs (62 lines):

diff -r c03a1ecf3f52 -r 3c09e11aeea8 x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo  Sun Jan 14 11:04:27 2007 +0000
+++ b/x11/modular-xorg-server/distinfo  Sun Jan 14 11:06:02 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2007/01/10 11:31:35 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/01/14 11:06:02 joerg Exp $
 
 SHA1 (xorg-server-1.1.1.tar.bz2) = eb29dd4fea9f184321cbb5512f68b674ada4daf7
 RMD160 (xorg-server-1.1.1.tar.bz2) = 17675c45b1e6ec8ed025f73efcf481c60ff42941
@@ -10,3 +10,4 @@
 SHA1 (patch-ab) = be6748cac5db41bab46d02e2d8ab75bed6e11aa8
 SHA1 (patch-ac) = 3319535f0ab2f92e4c7f92af5266d7add7571630
 SHA1 (patch-ad) = 67a94598ac23c23688caba23b851aec317a9e7a3
+SHA1 (patch-ae) = 7b0eb7ca724ff436593a3e45ada927ce2e7e77e3
diff -r c03a1ecf3f52 -r 3c09e11aeea8 x11/modular-xorg-server/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-ae  Sun Jan 14 11:06:02 2007 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-ae,v 1.1 2007/01/14 11:06:02 joerg Exp $
+
+--- hw/xfree86/os-support/drm/xf86drm.c.orig   2007-01-14 11:59:30.000000000 +0100
++++ hw/xfree86/os-support/drm/xf86drm.c
+@@ -141,12 +141,6 @@ drmMsg(const char *format, ...)
+ 
+ static void *drmHashTable = NULL; /* Context switch callbacks */
+ 
+-typedef struct drmHashEntry {
+-    int      fd;
+-    void     (*f)(int, void *, void *);
+-    void     *tagTable;
+-} drmHashEntry;
+-
+ void *drmMalloc(int size)
+ {
+     void *pt;
+@@ -181,26 +175,6 @@ static unsigned long drmGetKeyFromFd(int
+     return st.st_rdev;
+ }
+ 
+-static drmHashEntry *drmGetEntry(int fd)
+-{
+-    unsigned long key = drmGetKeyFromFd(fd);
+-    void          *value;
+-    drmHashEntry  *entry;
+-
+-    if (!drmHashTable) drmHashTable = drmHashCreate();
+-
+-    if (drmHashLookup(drmHashTable, key, &value)) {
+-      entry           = drmMalloc(sizeof(*entry));
+-      entry->fd       = fd;
+-      entry->f        = NULL;
+-      entry->tagTable = drmHashCreate();
+-      drmHashInsert(drmHashTable, key, entry);
+-    } else {
+-      entry = value;
+-    }
+-    return entry;
+-}
+-
+ /**
+  * Compare two busid strings
+  *