diff options
| author | joerg <joerg> | 2007-01-14 11:06:02 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-01-14 11:06:02 +0000 |
| commit | bf29a02f17f0d15f63bc2765e875c617db3ef44f (patch) | |
| tree | c74862898932f95d48f20801fef3ba92b3d35fc3 /x11 | |
| parent | 5d129142751b89c8e05b4973d4449aac6cbd442b (diff) | |
| download | pkgsrc-bf29a02f17f0d15f63bc2765e875c617db3ef44f.tar.gz | |
Fix build with libdrm-2.3.0.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 3 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-ae | 44 |
2 files changed, 46 insertions, 1 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 1417a96afc3..61b6c721dff 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -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-aa) = bc460c6376ec76a7f6adbefb4c9b75a6b0e2a040 SHA1 (patch-ab) = be6748cac5db41bab46d02e2d8ab75bed6e11aa8 SHA1 (patch-ac) = 3319535f0ab2f92e4c7f92af5266d7add7571630 SHA1 (patch-ad) = 67a94598ac23c23688caba23b851aec317a9e7a3 +SHA1 (patch-ae) = 7b0eb7ca724ff436593a3e45ada927ce2e7e77e3 diff --git a/x11/modular-xorg-server/patches/patch-ae b/x11/modular-xorg-server/patches/patch-ae new file mode 100644 index 00000000000..b589e4d2af1 --- /dev/null +++ b/x11/modular-xorg-server/patches/patch-ae @@ -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 + * |