summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/modular-xorg-server/Makefile9
-rw-r--r--x11/modular-xorg-server/PLIST21
-rw-r--r--x11/modular-xorg-server/buildlink3.mk4
-rw-r--r--x11/modular-xorg-server/distinfo11
-rw-r--r--x11/modular-xorg-server/patches/patch-ae15
-rw-r--r--x11/modular-xorg-server/patches/patch-ag38
6 files changed, 24 insertions, 74 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 304e76b4c6b..71c6485a5aa 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2007/04/17 19:07:49 dillo Exp $
+# $NetBSD: Makefile,v 1.12 2007/08/05 23:30:19 joerg Exp $
-DISTNAME= xorg-server-1.2.0
-PKGREVISION= 2
+DISTNAME= xorg-server-1.3.0.0
PKGNAME= modular-${DISTNAME}
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
@@ -46,10 +45,10 @@ CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q}
#BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1
post-extract:
${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL
-PLIST_SUBST+= GLX=""
+PLIST_SUBST+= USE_DRI=""
.else
CONFIGURE_ARGS+= --disable-glx
-PLIST_SUBST+= GLX="@comment "
+PLIST_SUBST+= USE_DRI"@comment "
.endif
BUILD_DEFS+= VARBASE
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index 3c6bd684487..188a785c818 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/26 17:51:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/08/05 23:30:19 joerg Exp $
bin/X
bin/Xnest
bin/Xorg
@@ -154,18 +154,25 @@ include/xorg/xaarop.h
include/xorg/xf1bpp.h
include/xorg/xf4bpp.h
include/xorg/xf86.h
+include/xorg/xf86Crtc.h
include/xorg/xf86Cursor.h
include/xorg/xf86DDC.h
+include/xorg/xf86Keymap.h
+include/xorg/xf86Modes.h
include/xorg/xf86Module.h
include/xorg/xf86OSKbd.h
include/xorg/xf86OSmouse.h
include/xorg/xf86Opt.h
+include/xorg/xf86Optrec.h
+include/xorg/xf86Parser.h
include/xorg/xf86Pci.h
include/xorg/xf86PciInfo.h
include/xorg/xf86Priv.h
include/xorg/xf86Privstr.h
include/xorg/xf86RAC.h
include/xorg/xf86RamDac.h
+include/xorg/xf86RandR12.h
+include/xorg/xf86Rename.h
include/xorg/xf86Resources.h
include/xorg/xf86Version.h
include/xorg/xf86Xinput.h
@@ -191,11 +198,11 @@ lib/X11/Cards
lib/X11/Options
lib/X11/app-defaults/XOrgCfg
lib/pkgconfig/xorg-server.pc
-${GLX}lib/xorg/modules/extensions/libGLcore.la
+${USE_DRI}lib/xorg/modules/extensions/libGLcore.la
lib/xorg/modules/extensions/libdbe.la
lib/xorg/modules/extensions/libdri.la
lib/xorg/modules/extensions/libextmod.la
-${GLX}lib/xorg/modules/extensions/libglx.la
+${USE_DRI}lib/xorg/modules/extensions/libglx.la
lib/xorg/modules/extensions/librecord.la
lib/xorg/modules/extensions/libxtrap.la
lib/xorg/modules/fonts/libfreetype.la
@@ -203,14 +210,11 @@ lib/xorg/modules/fonts/libtype1.la
lib/xorg/modules/libafb.la
lib/xorg/modules/libcfb.la
lib/xorg/modules/libcfb32.la
-lib/xorg/modules/libddc.la
lib/xorg/modules/libexa.la
lib/xorg/modules/libfb.la
-lib/xorg/modules/libi2c.la
lib/xorg/modules/libint10.la
lib/xorg/modules/libmfb.la
lib/xorg/modules/libpcidata.la
-lib/xorg/modules/libramdac.la
lib/xorg/modules/libscanpci.la
lib/xorg/modules/libshadow.la
lib/xorg/modules/libshadowfb.la
@@ -245,11 +249,14 @@ man/man4/fbdevhw.4
man/man5/xorg.conf.5
share/X11/xkb/compiled/README.compiled
share/aclocal/xorg-server.m4
+@dirrm share/X11/xkb/compiled
+@dirrm share/X11/xkb
+@dirrm share/X11
@dirrm lib/xserver
-@dirrm lib/xorg/modules/${LOWER_OPSYS}
@dirrm lib/xorg/modules/multimedia
@dirrm lib/xorg/modules/linux
@dirrm lib/xorg/modules/fonts
@dirrm lib/xorg/modules/extensions
@dirrm lib/xorg/modules
@dirrm lib/xorg
+@dirrm include/xorg
diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
index 74c9892b0e4..2acfd360671 100644
--- a/x11/modular-xorg-server/buildlink3.mk
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/08/05 23:30:19 joerg Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MODULAR_XORG_SERVER_BUILDLINK3_MK:= ${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= modular-xorg-server
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.1.1
+BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.2.99
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 59c99ab44ab..8895a704539 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/04/03 20:25:44 drochner Exp $
+$NetBSD: distinfo,v 1.10 2007/08/05 23:30:20 joerg Exp $
-SHA1 (MesaLib-6.5.2.tar.bz2) = ba860bb6ee57c02202342dfd5927464a068ea18f
-RMD160 (MesaLib-6.5.2.tar.bz2) = 9a92d69110c066ae6734bcaafb78f222ac2df6d3
-Size (MesaLib-6.5.2.tar.bz2) = 3295166 bytes
-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 (xorg-server-1.3.0.0.tar.bz2) = 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c
+RMD160 (xorg-server-1.3.0.0.tar.bz2) = 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1
+Size (xorg-server-1.3.0.0.tar.bz2) = 5968263 bytes
SHA1 (patch-aa) = f72780165c9ecd3e9ab31d03c1b2d777290d09e2
SHA1 (patch-ab) = 115905eba320f294c68783bb704359d824460469
SHA1 (patch-ad) = 752235269f10daade0bf60665cccde39d1583064
diff --git a/x11/modular-xorg-server/patches/patch-ae b/x11/modular-xorg-server/patches/patch-ae
deleted file mode 100644
index 94df99e7b1d..00000000000
--- a/x11/modular-xorg-server/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/02/26 17:51:16 drochner Exp $
-
---- randr/randr.c.orig 2007-02-26 18:21:23.000000000 +0100
-+++ randr/randr.c
-@@ -472,8 +472,8 @@ ProcRRQueryVersion (ClientPtr client)
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-- rep.majorVersion = RANDR_MAJOR;
-- rep.minorVersion = RANDR_MINOR;
-+ rep.majorVersion = 1;
-+ rep.minorVersion = 1;
- if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
diff --git a/x11/modular-xorg-server/patches/patch-ag b/x11/modular-xorg-server/patches/patch-ag
deleted file mode 100644
index 4dce9e17bd9..00000000000
--- a/x11/modular-xorg-server/patches/patch-ag
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/04/03 20:25:44 drochner Exp $
-
---- Xext/xcmisc.c.orig 2007-04-03 18:03:01.000000000 +0200
-+++ Xext/xcmisc.c
-@@ -42,6 +42,12 @@ from The Open Group.
- #include <X11/extensions/xcmiscstr.h>
- #include "modinit.h"
-
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- #if 0
- static unsigned char XCMiscCode;
- #endif
-@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
-
- REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
-
-- pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
-+ if (stuff->count > UINT32_MAX / sizeof(XID))
-+ return BadAlloc;
-+
-+ pids = (XID *)Xalloc(stuff->count * sizeof(XID));
- if (!pids)
- {
- return BadAlloc;
-@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
- client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
- WriteSwappedDataToClient(client, count * sizeof(XID), pids);
- }
-- DEALLOCATE_LOCAL(pids);
-+ Xfree(pids);
- return(client->noClientException);
- }
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 02:29:14 +0000