summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorapb <apb@pkgsrc.org>2009-03-14 09:46:55 +0000
committerapb <apb@pkgsrc.org>2009-03-14 09:46:55 +0000
commit68ee823dfac952411199bd264133a77e8fbb1f95 (patch)
treede6c442851237c630d6f1ac4de44aec35f128cca /x11
parent6b269bb1de9acefb035688176d30a48eea738ebe (diff)
downloadpkgsrc-68ee823dfac952411199bd264133a77e8fbb1f95.tar.gz
Modular-xorg-server-1.4.2nb5.
Apply the following patches from NetBSD xsrc/external/mit/xorg-server/dist; thanks to joerg for providing a list of changes to apply. 2009-02-19 20:02 macallan * hw/xfree86/xaa/: xaaFillRect.c (1.2), xaaInitAccel.c (1.2), xaalocal.h (1.2): Actually use scanline image writes to upload images if available 2009-02-09 09:49 plunky * hw/xfree86/os-support/bsd/bsd_mouse.c (1.5): add horizontal mouse-wheel functionality to USB and WSMOUSE drivers 2009-02-02 03:06 christos * hw/xfree86/os-support/: bsd/bsd_mouse.c (1.4), xf86OSmouse.h (1.2): add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to SetupMouse. 2009-01-19 00:54 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.3): fix ioctl. 2009-01-13 18:43 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.2): Set the mouse event protocol version. (untested, but head will be broken unless I add this).
Diffstat (limited to 'x11')
-rw-r--r--x11/modular-xorg-server/Makefile4
-rw-r--r--x11/modular-xorg-server/distinfo7
2 files changed, 8 insertions, 3 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 9cba8e4298a..f590b3a5db9 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2009/01/04 20:02:12 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2009/03/14 09:46:55 apb Exp $
#
DISTNAME= xorg-server-1.4.2
PKGNAME= modular-${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 12a71b817d4..188c76b6285 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2009/01/04 20:02:12 wiz Exp $
+$NetBSD: distinfo,v 1.31 2009/03/14 09:46:55 apb Exp $
SHA1 (Mesa-7.0.4-xorg-server_GL) = 6aed65e64c7a684a5d707334a4b4fe7711966380
RMD160 (Mesa-7.0.4-xorg-server_GL) = 2028532d79f5bba1d09ae787a1799fc4b206a5d7
@@ -18,7 +18,12 @@ SHA1 (patch-ac) = 0e7d01cbdd692b75256318a0309551f6e5d2f5ec
SHA1 (patch-ad) = 57f9b5413d0c48ac12343f9d75879a46bd334931
SHA1 (patch-ae) = 814f46c830384292683b38261386d113897b66d1
SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
+SHA1 (patch-ag) = b71dd3c33b244d766180d93a7bb90c5ef4ebe90b
SHA1 (patch-ah) = b92699ae5913459799b8b870664786b3583e292d
+SHA1 (patch-ai) = 936edba9ac60e7dd461c2c1d54e1b89c6bf16027
+SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
+SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
+SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
SHA1 (patch-sa) = 5586e998e2239b6851291b5f79b2e6009c78b174
SHA1 (patch-sb) = b769780b446e4f10bc99ccd3373d666daf44f863
SHA1 (patch-sc) = 33c4d4731e3732032f84946fc17e28d0cba389a6