pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Update to 1.6.1.901, first 1.6...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9ef6e849220c
branches: trunk
changeset: 394224:9ef6e849220c
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jun 07 11:23:46 2009 +0000
description:
Update to 1.6.1.901, first 1.6.2 prerelease.
Lots of changes since last pkgsrc version 1.4.x.
Based on patches provided by Hasso Tepper on pkgsrc-users.
Enable dri by default.
NOTE: You must install new versions of all dependencies, old ones
won't work!
diffstat:
x11/modular-xorg-server/Makefile | 23 +--
x11/modular-xorg-server/PLIST | 77 +++-----------
x11/modular-xorg-server/buildlink3.mk | 5 +-
x11/modular-xorg-server/distinfo | 38 ++-----
x11/modular-xorg-server/files/mesalib-patch-aq | 23 ----
x11/modular-xorg-server/files/modeline2c.awk | 97 -------------------
x11/modular-xorg-server/options.mk | 30 +-----
x11/modular-xorg-server/patches/patch-aa | 33 ------
x11/modular-xorg-server/patches/patch-ab | 11 +-
x11/modular-xorg-server/patches/patch-ac | 15 --
x11/modular-xorg-server/patches/patch-ad | 15 --
x11/modular-xorg-server/patches/patch-ae | 21 ----
x11/modular-xorg-server/patches/patch-ag | 127 -------------------------
x11/modular-xorg-server/patches/patch-ah | 16 +-
x11/modular-xorg-server/patches/patch-ai | 39 -------
x11/modular-xorg-server/patches/patch-am | 92 ------------------
x11/modular-xorg-server/patches/patch-ba | 22 ++++
x11/modular-xorg-server/patches/patch-sa | 14 +-
x11/modular-xorg-server/patches/patch-sb | 18 +-
x11/modular-xorg-server/patches/patch-sc | 12 +-
x11/modular-xorg-server/patches/patch-sd | 12 +-
x11/modular-xorg-server/patches/patch-xkb | 84 ----------------
22 files changed, 110 insertions(+), 714 deletions(-)
diffs (truncated from 1189 to 300 lines):
diff -r 0e3752cd41aa -r 9ef6e849220c x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile Sun Jun 07 11:06:26 2009 +0000
+++ b/x11/modular-xorg-server/Makefile Sun Jun 07 11:23:46 2009 +0000
@@ -1,17 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2009/03/26 20:02:45 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2009/06/07 11:23:46 wiz Exp $
#
-DISTNAME= xorg-server-1.4.2
+DISTNAME= xorg-server-1.6.1.901
PKGNAME= modular-${DISTNAME}
-PKGREVISION= 6
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
-PATCHFILES= xorg-server-1.4.2-20080917.patch.gz
-PATCHFILES+= ${XSERVER_DRI_PATCHFILES}
-PATCH_SITES= ${MASTER_SITE_LOCAL:=xorg-server-patchfiles/}
-
MAINTAINER= bjs%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular X11 server from modular X.org
@@ -54,7 +49,6 @@
CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/";
-CONFIGURE_ARGS+= --enable-dri
CONFIGURE_ARGS+= --enable-xorg
CONFIGURE_ARGS+= --disable-config-hal
@@ -79,25 +73,25 @@
BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0
BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.4.4
+BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5
BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.1
+BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1
BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3
BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
-post-extract: dri-post-extract
- ${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common
- ${RM} -f ${WRKSRC}/Mesa-${MESA_VERSION}/docs/README.MINGW32.orig
-
.include "options.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../x11/bigreqsproto/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
.include "../../x11/fixesproto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
@@ -109,6 +103,7 @@
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXfont/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86misc/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
diff -r 0e3752cd41aa -r 9ef6e849220c x11/modular-xorg-server/PLIST
--- a/x11/modular-xorg-server/PLIST Sun Jun 07 11:06:26 2009 +0000
+++ b/x11/modular-xorg-server/PLIST Sun Jun 07 11:23:46 2009 +0000
@@ -1,38 +1,18 @@
-@comment $NetBSD: PLIST,v 1.10 2008/10/28 05:08:52 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/07 11:23:46 wiz Exp $
bin/X
bin/Xnest
bin/Xorg
bin/Xvfb
bin/cvt
bin/gtf
-bin/inb
-bin/inl
-bin/inw
-bin/ioport
-bin/outb
-bin/outl
-bin/outw
-bin/pcitweak
-bin/scanpci
-bin/xorgconfig
include/xorg/BT.h
include/xorg/IBM.h
include/xorg/TI.h
include/xorg/XIstubs.h
-include/xorg/afb.h
-include/xorg/assyntax.h
-include/xorg/atKeynames.h
include/xorg/bstore.h
include/xorg/bstorestr.h
include/xorg/bt829.h
-include/xorg/cfb.h
-include/xorg/cfb16.h
-include/xorg/cfb32.h
include/xorg/cfb8_16.h
-include/xorg/cfb8_32.h
-include/xorg/cfbmap.h
-include/xorg/cfbmskbits.h
-include/xorg/cfbunmap.h
include/xorg/closestr.h
include/xorg/closure.h
include/xorg/colormap.h
@@ -45,13 +25,15 @@
include/xorg/dbestruct.h
include/xorg/dgaproc.h
include/xorg/dix.h
+include/xorg/dixaccess.h
include/xorg/dixevents.h
include/xorg/dixfont.h
include/xorg/dixfontstr.h
include/xorg/dixgrabs.h
include/xorg/dixstruct.h
-include/xorg/dri.h
-include/xorg/dristruct.h
+${PLIST.dri}include/xorg/dri.h
+include/xorg/dri2.h
+${PLIST.dri}include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/exa.h
include/xorg/exevents.h
@@ -61,21 +43,19 @@
include/xorg/fb.h
include/xorg/fbdevhw.h
include/xorg/fboverlay.h
-include/xorg/fbpseudocolor.h
include/xorg/fbrop.h
include/xorg/fi1236.h
include/xorg/fourcc.h
include/xorg/gc.h
include/xorg/gcstruct.h
+include/xorg/geext.h
+include/xorg/geint.h
include/xorg/globals.h
include/xorg/glyphstr.h
include/xorg/hotplug.h
include/xorg/i2c_def.h
include/xorg/input.h
include/xorg/inputstr.h
-include/xorg/mfb.h
-include/xorg/mfbmap.h
-include/xorg/mfbunmap.h
include/xorg/mi.h
include/xorg/mibank.h
include/xorg/mibstore.h
@@ -101,21 +81,26 @@
include/xorg/picturestr.h
include/xorg/pixmap.h
include/xorg/pixmapstr.h
+include/xorg/privates.h
include/xorg/property.h
include/xorg/propertyst.h
+include/xorg/ptrveloc.h
include/xorg/randrstr.h
include/xorg/region.h
include/xorg/regionstr.h
+include/xorg/registry.h
include/xorg/renderedge.h
include/xorg/resource.h
include/xorg/rgb.h
-include/xorg/sarea.h
+include/xorg/rrtransform.h
+${PLIST.dri}include/xorg/sarea.h
include/xorg/screenint.h
include/xorg/scrnintstr.h
include/xorg/selection.h
include/xorg/servermd.h
include/xorg/shadow.h
include/xorg/shadowfb.h
+include/xorg/shmint.h
include/xorg/site.h
include/xorg/swaprep.h
include/xorg/swapreq.h
@@ -134,15 +119,12 @@
include/xorg/xaaWrapper.h
include/xorg/xaalocal.h
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/xf86Modes.h
include/xorg/xf86Module.h
-include/xorg/xf86OSmouse.h
include/xorg/xf86Opt.h
include/xorg/xf86Optrec.h
include/xorg/xf86Parser.h
@@ -155,12 +137,9 @@
include/xorg/xf86RandR12.h
include/xorg/xf86Rename.h
include/xorg/xf86Resources.h
-include/xorg/xf86Version.h
include/xorg/xf86Xinput.h
include/xorg/xf86_OSlib.h
include/xorg/xf86_OSproc.h
-include/xorg/xf86_ansic.h
-include/xorg/xf86_libc.h
include/xorg/xf86cmap.h
include/xorg/xf86fbman.h
include/xorg/xf86i2c.h
@@ -171,42 +150,32 @@
include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
include/xorg/xisb.h
+include/xorg/xkbfile.h
+include/xorg/xkbrules.h
include/xorg/xkbsrv.h
+include/xorg/xkbstr.h
include/xorg/xorg-server.h
include/xorg/xorgVersion.h
+include/xorg/xserver-properties.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
-lib/X11/Cards
lib/X11/Options
lib/pkgconfig/xorg-server.pc
-${PLIST.dri}lib/xorg/modules/extensions/libGLcore.la
lib/xorg/modules/extensions/libdbe.la
-lib/xorg/modules/extensions/libdri.la
+${PLIST.dri}lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libdri2.la
lib/xorg/modules/extensions/libextmod.la
${PLIST.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
-lib/xorg/modules/fonts/libtype1.la
-lib/xorg/modules/libafb.la
-lib/xorg/modules/libcfb.la
-lib/xorg/modules/libcfb32.la
lib/xorg/modules/libexa.la
lib/xorg/modules/libfb.la
lib/xorg/modules/libint10.la
-lib/xorg/modules/libmfb.la
-lib/xorg/modules/libpcidata.la
-lib/xorg/modules/libscanpci.la
lib/xorg/modules/libshadow.la
lib/xorg/modules/libshadowfb.la
lib/xorg/modules/libvbe.la
lib/xorg/modules/libvgahw.la
lib/xorg/modules/libwfb.la
lib/xorg/modules/libxaa.la
-lib/xorg/modules/libxf1bpp.la
-lib/xorg/modules/libxf4bpp.la
lib/xorg/modules/libxf8_16bpp.la
-lib/xorg/modules/libxf8_32bpp.la
lib/xorg/modules/linux/libfbdevhw.la
lib/xorg/modules/multimedia/bt829_drv.la
lib/xorg/modules/multimedia/fi1236_drv.la
@@ -215,27 +184,21 @@
lib/xorg/modules/multimedia/tda9850_drv.la
lib/xorg/modules/multimedia/tda9885_drv.la
lib/xorg/modules/multimedia/uda1380_drv.la
-lib/xserver/SecurityPolicy
+lib/xorg/protocol.txt
man/man1/Xnest.1
man/man1/Xorg.1
man/man1/Xserver.1
man/man1/Xvfb.1
man/man1/cvt.1
man/man1/gtf.1
-man/man1/pcitweak.1
-man/man1/scanpci.1
-man/man1/xorgconfig.1
man/man4/exa.4
man/man4/fbdevhw.4
-man/man5/SecurityPolicy.5
man/man5/xorg.conf.5
share/aclocal/xorg-server.m4
-@dirrm lib/xserver
@dirrm lib/xorg/modules/multimedia
@dirrm lib/xorg/modules/linux
@exec ${MKDIR} %D/lib/xorg/modules/input
@dirrm lib/xorg/modules/input
-@dirrm lib/xorg/modules/fonts
@dirrm lib/xorg/modules/extensions
@exec ${MKDIR} %D/lib/xorg/modules/drivers
@dirrm lib/xorg/modules/drivers
diff -r 0e3752cd41aa -r 9ef6e849220c x11/modular-xorg-server/buildlink3.mk
--- a/x11/modular-xorg-server/buildlink3.mk Sun Jun 07 11:06:26 2009 +0000
+++ b/x11/modular-xorg-server/buildlink3.mk Sun Jun 07 11:23:46 2009 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/06/07 11:23:46 wiz Exp $
BUILDLINK_TREE+= modular-xorg-server
Home |
Main Index |
Thread Index |
Old Index