From d53ab5e26a8895723926ea2c40b3a57ffcb220e8 Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 24 Jan 2007 13:34:40 +0000 Subject: Update to the modualar Xorg server to 1.2.0. Too many bugfixes and other improvements to list here. Hard to find the details as the accumulated ChangeLog is gone. --- x11/modular-xorg-server/Makefile | 14 +++------- x11/modular-xorg-server/PLIST | 15 ++--------- x11/modular-xorg-server/distinfo | 13 +++------- x11/modular-xorg-server/patches/patch-aa | 13 ---------- x11/modular-xorg-server/patches/patch-ae | 44 -------------------------------- 5 files changed, 10 insertions(+), 89 deletions(-) delete mode 100644 x11/modular-xorg-server/patches/patch-aa delete mode 100644 x11/modular-xorg-server/patches/patch-ae (limited to 'x11/modular-xorg-server') diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 1134596442b..4467f1252bc 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,16 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2007/01/22 23:55:34 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/24 13:34:40 joerg Exp $ -DISTNAME= xorg-server-1.1.1 +DISTNAME= xorg-server-1.2.0 PKGNAME= modular-${DISTNAME} -PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ EXTRACT_SUFX= .tar.bz2 -PATCHFILES= xorg-xserver-1.1.0-dbe-render.diff -PATCH_SITES= http://xorg.freedesktop.org/archive/X11R7.1/patches/ -PATCH_DIST_STRIP= -p1 - SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} PKG_DESTDIR_SUPPORT= user-destdir @@ -24,6 +19,8 @@ USE_TOOLS+= pkg-config USE_TOOLS+= gmake USE_TOOLS+= perl CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --enable-glx +CONFIGURE_ARGS+= --enable-dri BUILD_DEFS+= VARBASE @@ -31,9 +28,6 @@ DEPENDS+= xkbdata-[0-9]*:../../x11/xkbdata BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 -BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0 -BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 -BUILDLINK_API_DEPENDS.xkbui+= xkbui>=1.0.2 .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 7cdf11c27f5..837d45cd697 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2007/01/22 23:55:34 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/01/24 13:34:40 joerg Exp $ bin/X bin/Xnest bin/Xorg bin/Xvfb bin/cvt -bin/getconfig -bin/getconfig.pl bin/gtf bin/inb bin/inl @@ -73,7 +71,6 @@ include/xorg/dixstruct.h include/xorg/dri.h include/xorg/dristruct.h include/xorg/edid.h -include/xorg/elf.h include/xorg/exa.h include/xorg/exevents.h include/xorg/extension.h @@ -193,20 +190,16 @@ include/xorg/xvmcext.h lib/X11/Cards lib/X11/Options lib/X11/app-defaults/XOrgCfg -lib/X11/getconfig/cfg.sample -lib/X11/getconfig/xorg.cfg lib/pkgconfig/xorg-server.pc lib/xorg/modules/extensions/libdbe.la lib/xorg/modules/extensions/libdri.la lib/xorg/modules/extensions/libextmod.la lib/xorg/modules/extensions/librecord.la lib/xorg/modules/extensions/libxtrap.la -lib/xorg/modules/fonts/libbitmap.la lib/xorg/modules/fonts/libfreetype.la lib/xorg/modules/fonts/libtype1.la lib/xorg/modules/libafb.la lib/xorg/modules/libcfb.la -lib/xorg/modules/libcfb16.la lib/xorg/modules/libcfb32.la lib/xorg/modules/libddc.la lib/xorg/modules/libexa.la @@ -215,7 +208,6 @@ lib/xorg/modules/libi2c.la lib/xorg/modules/libint10.la lib/xorg/modules/libmfb.la lib/xorg/modules/libpcidata.la -lib/xorg/modules/librac.la lib/xorg/modules/libramdac.la lib/xorg/modules/libscanpci.la lib/xorg/modules/libshadow.la @@ -235,21 +227,19 @@ lib/xorg/modules/multimedia/tda8425_drv.la lib/xorg/modules/multimedia/tda9850_drv.la lib/xorg/modules/multimedia/tda9885_drv.la lib/xorg/modules/multimedia/uda1380_drv.la -lib/xorg/modules/${LOWER_OPSYS}/libdrm.la lib/xserver/SecurityPolicy man/man1/Xnest.1 man/man1/Xorg.1 man/man1/Xserver.1 man/man1/Xvfb.1 man/man1/cvt.1 -man/man1/getconfig.1 man/man1/gtf.1 man/man1/pcitweak.1 man/man1/scanpci.1 man/man1/xorgcfg.1 man/man1/xorgconfig.1 +man/man4/exa.4 man/man4/fbdevhw.4 -man/man5/getconfig.5 man/man5/xorg.conf.5 share/X11/xkb/compiled/README.compiled share/aclocal/xorg-server.m4 @@ -261,4 +251,3 @@ share/aclocal/xorg-server.m4 @dirrm lib/xorg/modules/extensions @dirrm lib/xorg/modules @dirrm lib/xorg -@dirrm lib/X11/getconfig diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 61b6c721dff..37f198fd838 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.3 2007/01/14 11:06:02 joerg Exp $ +$NetBSD: distinfo,v 1.4 2007/01/24 13:34:40 joerg Exp $ -SHA1 (xorg-server-1.1.1.tar.bz2) = eb29dd4fea9f184321cbb5512f68b674ada4daf7 -RMD160 (xorg-server-1.1.1.tar.bz2) = 17675c45b1e6ec8ed025f73efcf481c60ff42941 -Size (xorg-server-1.1.1.tar.bz2) = 6252103 bytes -SHA1 (xorg-xserver-1.1.0-dbe-render.diff) = 2c01ee26bac79d71c9925d2b8bbfbc6b73de9396 -RMD160 (xorg-xserver-1.1.0-dbe-render.diff) = 3e168d1161bb29d669a2bae475c312b1f20cf25b -Size (xorg-xserver-1.1.0-dbe-render.diff) = 5236 bytes -SHA1 (patch-aa) = bc460c6376ec76a7f6adbefb4c9b75a6b0e2a040 +SHA1 (xorg-server-1.2.0.tar.bz2) = 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 +RMD160 (xorg-server-1.2.0.tar.bz2) = 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 +Size (xorg-server-1.2.0.tar.bz2) = 6014596 bytes 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-aa b/x11/modular-xorg-server/patches/patch-aa deleted file mode 100644 index 7d0d670180a..00000000000 --- a/x11/modular-xorg-server/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $ - ---- xkb/maprules.c.orig 2006-11-06 21:19:20.000000000 +0000 -+++ xkb/maprules.c -@@ -1092,7 +1092,7 @@ int len,headingtype,extra_ndx = 0; - for ( ; GetInputLine(file,&line,False); line.num_line= 0) { - if (line.line[0]=='!') { - tok = strtok(&(line.line[1]), " \t"); -- if (_XkbStrCaseCmp(tolower(tok),"model") == 0) -+ if (_XkbStrCaseCmp(tok,"model") == 0) - headingtype = HEAD_MODEL; - else if (_XkbStrCaseCmp(tok,"layout") == 0) - headingtype = HEAD_LAYOUT; diff --git a/x11/modular-xorg-server/patches/patch-ae b/x11/modular-xorg-server/patches/patch-ae deleted file mode 100644 index b589e4d2af1..00000000000 --- a/x11/modular-xorg-server/patches/patch-ae +++ /dev/null @@ -1,44 +0,0 @@ -$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 - * -- cgit v1.2.3