diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
| commit | d4f0d0048a8755106a4b0445221a19761e746984 (patch) | |
| tree | c87184c5bfeaf942c827c5f706186ce9786a2588 /x11-servers | |
| parent | e82affd309fc2d8e5ea19b2e003f1296920bd825 (diff) | |
| download | ports-d4f0d0048a8755106a4b0445221a19761e746984.tar.gz ports-d4f0d0048a8755106a4b0445221a19761e746984.zip | |
Notes
Diffstat (limited to 'x11-servers')
105 files changed, 1156 insertions, 3671 deletions
diff --git a/x11-servers/Makefile b/x11-servers/Makefile index 300213c09739..f738afdd03b5 100644 --- a/x11-servers/Makefile +++ b/x11-servers/Makefile @@ -15,7 +15,6 @@ SUBDIR += x2vnc SUBDIR += x2x SUBDIR += xorg-dmx - SUBDIR += xorg-fontserver SUBDIR += xorg-nestserver SUBDIR += xorg-printserver SUBDIR += xorg-server diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index 0db2afc8f7e5..f33cfb621af0 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= FontServer PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 8782a9c7e091..804011d15195 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= NestServer PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index cdd1f4f68a6b..4c87db7060af 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= PrintServer PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index dc2fc573b7f1..bb61988dbde6 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index 8fd6a015f035..ef300eec9412 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= VirtualFramebufferServer PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile index 56b4ab15cf4d..5ad3a785162c 100644 --- a/x11-servers/Xfstt/Makefile +++ b/x11-servers/Xfstt/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfstt PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://download.berlios.de/xfstt/ diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile index 9cfc0fbfded4..a56537c835a9 100644 --- a/x11-servers/driglide/Makefile +++ b/x11-servers/driglide/Makefile @@ -7,7 +7,7 @@ PORTNAME= driglide PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= anholt/driglide/ diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile index 87fda45aee9f..ac3ae9917682 100644 --- a/x11-servers/mga_hal/Makefile +++ b/x11-servers/mga_hal/Makefile @@ -7,6 +7,7 @@ PORTNAME= mga_hal PORTVERSION= 4.4.0 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= ftp://ftp.matrox.com/pub/mga/archive/linux/%SUBDIR%/:i386,amd64 MASTER_SITE_SUBDIR= 2006/:i386 2006/64bit/:amd64 diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile index f5fab0f2353f..7a39ce27f533 100644 --- a/x11-servers/synaptics/Makefile +++ b/x11-servers/synaptics/Makefile @@ -7,7 +7,7 @@ PORTNAME= synaptics PORTVERSION= 0.14.6 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ @@ -31,10 +31,15 @@ X11VERSION!= ${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \ .if ${X_WINDOW_SYSTEM:L} == xorg -MASTER_SITES+= ${MASTER_SITE_XORG:C/$/:x11/} -MASTER_SITE_SUBDIR= X11R${X11VERSION}/src/:x11 -DIST_SUBDIR= xorg -X_DISTFILES= X11R${X11VERSION}-src3.tar.gz +MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \ + http://xorg.freedesktop.org/releases/individual/xserver/:x11 +DIST_SUBDIR= xorg/xserver +X_DISTFILES= xorg-server-${X11VERSION}.tar.bz2 +PLIST_SUB+= XORG="" XFREE86="@comment " + +post-patch: + @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \ + ${WRKSRC}/Makefile .elif ${X_WINDOW_SYSTEM:L} == xfree86-4 @@ -42,6 +47,7 @@ MASTER_SITES+= ${MASTER_SITE_XFREE:C/$/:x11/} MASTER_SITE_SUBDIR= ${X11VERSION}/:x11 DIST_SUBDIR= xc X_DISTFILES= XFree86-${X11VERSION}-src-3.tgz +PLIST_SUB+= XORG="@comment " XFREE86="" .else @@ -62,6 +68,11 @@ post-extract: ${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf - .endfor +.if ${X_WINDOW_SYSTEM:L} == xorg +pre-install: + ${MKDIR} ${X11BASE}/lib/xorg/modules/input/ +.endif + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo index c2b2b6e25022..a4b8415f3a1e 100644 --- a/x11-servers/synaptics/distinfo +++ b/x11-servers/synaptics/distinfo @@ -1,9 +1,9 @@ -MD5 (xorg/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af -SHA256 (xorg/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 -SIZE (xorg/synaptics-0.14.6.tar.bz2) = 126833 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af +SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 +SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833 +MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 +SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 +SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 MD5 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833 diff --git a/x11-servers/synaptics/pkg-plist b/x11-servers/synaptics/pkg-plist index 9eb476975db3..46e202c29d17 100644 --- a/x11-servers/synaptics/pkg-plist +++ b/x11-servers/synaptics/pkg-plist @@ -1,3 +1,7 @@ bin/synclient @comment bin/syndaemon -lib/modules/input/synaptics_drv.o +%%XORG%%lib/xorg/modules/input/synaptics_drv.so +%%XORG%%@dirrmtry lib/xorg/modules/input +%%XORG%%@dirrmtry lib/xorg/modules +%%XORG%%@dirrmtry lib/xorg +%%XFREE86%%lib/modules/input/synaptics_drv.o diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile index 754a02378c04..7819adc010b9 100644 --- a/x11-servers/x2vnc/Makefile +++ b/x11-servers/x2vnc/Makefile @@ -7,6 +7,7 @@ PORTNAME= x2vnc PORTVERSION= 1.72 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://fredrik.hubbe.net/x2vnc/ DISTNAME= ${PORTNAME}-1.7.2 diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile index 0004d4036024..3a45fde7a482 100644 --- a/x11-servers/x2x/Makefile +++ b/x11-servers/x2x/Makefile @@ -7,7 +7,7 @@ PORTNAME= x2x PORTVERSION= 1.27 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= http://gatekeeper.dec.com/pub/DEC/SRC/x2x/ DISTNAME= ${PORTNAME}-${PORTVERSION} diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index 050c4221077a..fb4a3751d88f 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -6,35 +6,33 @@ # PORTNAME= xorg-dmx -PORTVERSION= 6.9.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src -DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ - X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Distributed Multihead X from X.Org CONFLICTS= XFree86-dmx-[0-9]* -EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} +XORG_CAT= xserver -USE_XLIB= yes +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ + damageproto xcmiscproto xextproto xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto xf86dgaproto videoproto \ + compositeproto trapproto recordproto resourceproto \ + xineramaproto evieproto xkbfile xfont fontenc xkbui \ + xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ + xau dmx xtst xres + +CONFIGURE_ARGS= --disable-xprint --disable-xvfb --disable-xorg --disable-xnest \ + --enable-dmx --localstatedir=/var -XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver/hw/dmx +MAN1= Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1 -MAN1= Xdmx.1 -PLIST_FILES= bin/Xdmx +do-install: + cd ${WRKSRC}/hw/dmx; ${MAKE} install -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo index 177370c87899..b208692af414 100644 --- a/x11-servers/xorg-dmx/distinfo +++ b/x11-servers/xorg-dmx/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150 -SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c -SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 +SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 +SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 diff --git a/x11-servers/xorg-dmx/files/patch-dmx.c b/x11-servers/xorg-dmx/files/patch-dmx.c deleted file mode 100644 index d29155b81c81..000000000000 --- a/x11-servers/xorg-dmx/files/patch-dmx.c +++ /dev/null @@ -1,15 +0,0 @@ ---- programs/Xserver/Xext/dmx.c.orig Mon Jan 16 07:43:55 2006 -+++ programs/Xserver/Xext/dmx.c Mon Jan 16 07:44:29 2006 -@@ -57,10 +57,10 @@ - #include "opaque.h" - - #include "dmxextension.h" --#include <X11/extensions/dmxproto.h> -+#include "dmxproto.h" - - #define _DMX_SERVER_ --#include <X11/extensions/dmxext.h> -+#include "dmxext.h" - - #ifdef PANORAMIX - #include "panoramiX.h" diff --git a/x11-servers/xorg-dmx/files/patch-dmxextension.c b/x11-servers/xorg-dmx/files/patch-dmxextension.c deleted file mode 100644 index 0664e3005004..000000000000 --- a/x11-servers/xorg-dmx/files/patch-dmxextension.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/dmx/dmxextension.c.orig Mon Jan 16 07:48:33 2006 -+++ programs/Xserver/hw/dmx/dmxextension.c Mon Jan 16 07:51:33 2006 -@@ -62,7 +62,7 @@ - - #include "windowstr.h" - #include "inputstr.h" /* For DeviceIntRec */ --#include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */ -+#include "dmxproto.h" /* For DMX_BAD_* */ - #include "cursorstr.h" - - /* The default font is declared in dix/globals.c, but is not included in diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist new file mode 100644 index 000000000000..93ae1cd4ba07 --- /dev/null +++ b/x11-servers/xorg-dmx/pkg-plist @@ -0,0 +1,12 @@ +bin/Xdmx +bin/dmxaddinput +bin/dmxaddscreen +bin/dmxreconfig +bin/dmxresize +bin/dmxrminput +bin/dmxrmscreen +bin/dmxtodmx +bin/dmxwininfo +bin/vdltodmx +bin/xdmx +bin/xdmxconfig diff --git a/x11-servers/xorg-dmx/scripts/configure b/x11-servers/xorg-dmx/scripts/configure deleted file mode 100644 index 84870dc79b20..000000000000 --- a/x11-servers/xorg-dmx/scripts/configure +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildLibraries NO" >> $LOCALDEF -echo "#define XprtServer NO" >> $LOCALDEF -echo "#define BuildXprint NO" >> $LOCALDEF -echo "#define XnestServer NO" >> $LOCALDEF -echo "#define XdmxServer YES" >> $LOCALDEF -echo "#define XorgServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define BuildXF86DRI NO" >> $LOCALDEF -echo "#define InstallSecurityConfig NO" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 7509d18268b0..7cbd05677367 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,34 +6,34 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 6.9.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src -DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ - X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Nesting X server from X.Org CONFLICTS= XFree86-NestServer-* -EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} +XORG_CAT= xserver -USE_XLIB= yes +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ + damageproto xcmiscproto xextproto xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto xf86dgaproto videoproto \ + compositeproto trapproto recordproto resourceproto \ + xineramaproto evieproto xkbfile xfont fontenc xkbui \ + xxf86misc xxf86vm xaw7 xmu xpm xext -XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver/hw/xnest +CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg --disable-xprint \ + --localstatedir=/var +PLIST_FILES= bin/Xnest MAN1= Xnest.1 -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include <bsd.port.post.mk> +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/ + +.include <bsd.port.mk> diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index 177370c87899..b208692af414 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150 -SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c -SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 +SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 +SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 diff --git a/x11-servers/xorg-nestserver/pkg-plist b/x11-servers/xorg-nestserver/pkg-plist deleted file mode 100644 index eff754d76af6..000000000000 --- a/x11-servers/xorg-nestserver/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/Xnest diff --git a/x11-servers/xorg-nestserver/scripts/configure b/x11-servers/xorg-nestserver/scripts/configure deleted file mode 100644 index f1867eda5fad..000000000000 --- a/x11-servers/xorg-nestserver/scripts/configure +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define XprtServer NO" >> $LOCALDEF -echo "#define BuildXprint NO" >> $LOCALDEF -echo "#define XnestServer YES" >> $LOCALDEF -echo "#define XorgServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define BuildXF86DRI NO" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -echo "#define InstallSecurityConfig NO" >> $LOCALDEF - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile index 4f3c6d6416d9..ad79d66c09c3 100644 --- a/x11-servers/xorg-printserver/Makefile +++ b/x11-servers/xorg-printserver/Makefile @@ -6,37 +6,34 @@ # PORTNAME= xorg-printserver -PORTVERSION= 6.9.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src -DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ - X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X Print server from X.Org CONFLICTS= XFree86-PrintServer-* -EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} +XORG_CAT= xserver -USE_XLIB= yes +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -XBUILD_DIRS= lib/font programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver +USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ + damageproto xcmiscproto xextproto xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto xf86dgaproto videoproto \ + compositeproto trapproto recordproto resourceproto \ + xineramaproto evieproto xkbfile xfont fontenc xkbui \ + xxf86misc xxf86vm xaw7 xmu xpm xext -# Ensure that we pick up imake's makedepend instead of devel/makedepend -MAKE_ENV+= PATH=${X11BASE}/bin:${PATH} +CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg --disable-xnest \ + --localstatedir=/var MAN1= Xprt.1 -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include <bsd.port.post.mk> +do-install: + cd ${WRKSRC}/hw/xprint; ${MAKE} install + +.include <bsd.port.mk> diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo index 177370c87899..b208692af414 100644 --- a/x11-servers/xorg-printserver/distinfo +++ b/x11-servers/xorg-printserver/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150 -SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c -SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 +SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 +SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 diff --git a/x11-servers/xorg-printserver/files/patch-Imakefile b/x11-servers/xorg-printserver/files/patch-Imakefile deleted file mode 100644 index 8015a8b765d5..000000000000 --- a/x11-servers/xorg-printserver/files/patch-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xprint/etc/init.d/Imakefile.orig Thu Sep 15 00:57:36 2005 -+++ programs/Xserver/Xprint/etc/init.d/Imakefile Thu Sep 15 00:59:01 2005 -@@ -33,7 +33,7 @@ - MakeScriptFromCpp(xprint, -DDEF_XPCUSTOMGLUE=$(XPCUSTOMGLUE) $(OS_DEFINES)) - - #if defined(FreeBSDArchitecture) --InstallNamedProg(xprint,xprint,$(PROJECTROOT)/etc/rc.d) -+InstallNamedProg(xprint,xprint.sh.sample,$(PROJECTROOT)/etc/rc.d) - #else - XCOMM Solaris, Linux, etc. - InstallNamedProg(xprint,xprint,$(ETCDIR)/init.d) diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist index db513f54d616..3fc4b3cae640 100644 --- a/x11-servers/xorg-printserver/pkg-plist +++ b/x11-servers/xorg-printserver/pkg-plist @@ -1,11 +1,13 @@ bin/Xprt -etc/rc.d/xprint.sh.sample +etc/X11/Xsession.d/92xprint-xpserverlist lib/X11/xserver/C/print/Xprinters +lib/X11/xserver/C/print/Xprinters.ghostscript lib/X11/xserver/C/print/attributes/document lib/X11/xserver/C/print/attributes/job lib/X11/xserver/C/print/attributes/printer lib/X11/xserver/C/print/ddx-config/raster/pcl lib/X11/xserver/C/print/ddx-config/raster/postscript +lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf @@ -36,7 +38,9 @@ lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/fonts.dir lib/X11/xserver/C/print/models/CANONC3200-PS/model-config +lib/X11/xserver/C/print/models/GSdefault/model-config lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf @@ -115,6 +119,7 @@ lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/fonts.dir lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf @@ -164,6 +169,8 @@ lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf lib/X11/xserver/C/print/models/HPLJ4family/model-config +lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config +lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf @@ -181,7 +188,6 @@ lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf -lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf @@ -194,8 +200,8 @@ lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/fonts.dir lib/X11/xserver/C/print/models/PSdefault/model-config -lib/X11/xserver/C/print/models/PSspooldir/fonts lib/X11/xserver/C/print/models/PSspooldir/model-config lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf @@ -211,14 +217,12 @@ lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/fonts.dir lib/X11/xserver/C/print/models/SPSPARC2/model-config lib/X11/xserver/POSIX lib/X11/xserver/README -lib/X11/xserver/af lib/X11/xserver/af_ZA lib/X11/xserver/af_ZA.iso88591 -lib/X11/xserver/af_ZA.utf8 -lib/X11/xserver/afrikaans lib/X11/xserver/ar lib/X11/xserver/ar_AE lib/X11/xserver/ar_AE.iso88596 @@ -406,12 +410,7 @@ lib/X11/xserver/en_US.UTF-8 lib/X11/xserver/en_US.iso88591 lib/X11/xserver/en_US.iso885915 lib/X11/xserver/en_US.utf8 -lib/X11/xserver/en_US/print/Xprinters lib/X11/xserver/en_US/print/attributes/document -lib/X11/xserver/en_US/print/attributes/job -lib/X11/xserver/en_US/print/attributes/printer -lib/X11/xserver/en_US/print/ddx-config -lib/X11/xserver/en_US/print/models lib/X11/xserver/en_ZA lib/X11/xserver/en_ZA.iso88591 lib/X11/xserver/en_ZA.utf8 @@ -633,9 +632,6 @@ lib/X11/xserver/korean lib/X11/xserver/korean.euc lib/X11/xserver/kw_GB lib/X11/xserver/kw_GB.iso88591 -lib/X11/xserver/ky_KG -lib/X11/xserver/ky_KG.UTF-8 -lib/X11/xserver/ky_KG.utf8 lib/X11/xserver/lithuanian lib/X11/xserver/lt lib/X11/xserver/lt.ISO8859-13 @@ -662,7 +658,6 @@ lib/X11/xserver/mt_MT lib/X11/xserver/mt_MT.iso88593 lib/X11/xserver/nb_NO lib/X11/xserver/nb_NO.ISO-8859-1 -lib/X11/xserver/ndebele lib/X11/xserver/nl lib/X11/xserver/nl.ISO8859-1 lib/X11/xserver/nl.ISO8859-15 @@ -690,14 +685,6 @@ lib/X11/xserver/no_NO.ISO8859-1@nynorsk lib/X11/xserver/no_NO.iso88591 lib/X11/xserver/no_NO.utf8 lib/X11/xserver/norwegian -lib/X11/xserver/nr -lib/X11/xserver/nr_ZA -lib/X11/xserver/nr_ZA.iso88591 -lib/X11/xserver/nr_ZA.utf8 -lib/X11/xserver/nso -lib/X11/xserver/nso_ZA -lib/X11/xserver/nso_ZA.iso885915 -lib/X11/xserver/nso_ZA.utf8 lib/X11/xserver/oc_FR lib/X11/xserver/oc_FR.iso88591 lib/X11/xserver/pa_IN.UTF-8 @@ -732,7 +719,6 @@ lib/X11/xserver/pt_PT@euro lib/X11/xserver/ro_RO lib/X11/xserver/ro_RO.ISO8859-2 lib/X11/xserver/ro_RO.iso88592 -lib/X11/xserver/ro_RO.utf8 lib/X11/xserver/romanian lib/X11/xserver/ru lib/X11/xserver/ru.ISO8859-5 @@ -753,9 +739,6 @@ lib/X11/xserver/ru_UA.koi8u lib/X11/xserver/russian lib/X11/xserver/se_NO lib/X11/xserver/se_NO.utf8 -lib/X11/xserver/sepedi -lib/X11/xserver/sesotho -lib/X11/xserver/setswana lib/X11/xserver/sh lib/X11/xserver/sh.ISO8859-2 lib/X11/xserver/sh_BA.ISO8859-2@bosnia @@ -766,7 +749,6 @@ lib/X11/xserver/si lib/X11/xserver/si_LK lib/X11/xserver/si_LK.UTF8 lib/X11/xserver/sinhala -lib/X11/xserver/siswati lib/X11/xserver/sk lib/X11/xserver/sk.ISO8859-2 lib/X11/xserver/sk_SK @@ -793,14 +775,6 @@ lib/X11/xserver/sr_YU.iso88592 lib/X11/xserver/sr_YU.iso88595@cyrillic lib/X11/xserver/sr_YU.utf8 lib/X11/xserver/sr_YU@cyrillic -lib/X11/xserver/ss -lib/X11/xserver/ss_ZA -lib/X11/xserver/ss_ZA.iso88591 -lib/X11/xserver/ss_ZA.utf8 -lib/X11/xserver/st -lib/X11/xserver/st_ZA -lib/X11/xserver/st_ZA.iso88591 -lib/X11/xserver/st_ZA.utf8 lib/X11/xserver/su lib/X11/xserver/su.ISO8859-1 lib/X11/xserver/sv @@ -836,22 +810,12 @@ lib/X11/xserver/th_TH.utf8 lib/X11/xserver/thai lib/X11/xserver/tl_PH lib/X11/xserver/tl_PH.iso88591 -lib/X11/xserver/tn -lib/X11/xserver/tn_ZA -lib/X11/xserver/tn_ZA.iso885915 -lib/X11/xserver/tn_ZA.utf8 lib/X11/xserver/tr lib/X11/xserver/tr.ISO8859-9 -lib/X11/xserver/tr_TR lib/X11/xserver/tr_TR.ISO8859-9 lib/X11/xserver/tr_TR.UTF-8 lib/X11/xserver/tr_TR.iso88599 lib/X11/xserver/tr_TR.utf8 -lib/X11/xserver/ts -lib/X11/xserver/ts_ZA -lib/X11/xserver/ts_ZA.iso88591 -lib/X11/xserver/ts_ZA.utf8 -lib/X11/xserver/tsonga lib/X11/xserver/turkish lib/X11/xserver/uk_UA lib/X11/xserver/uk_UA.koi8u @@ -860,10 +824,6 @@ lib/X11/xserver/ur_PK lib/X11/xserver/ur_PK.utf8 lib/X11/xserver/uz_UZ lib/X11/xserver/uz_UZ.iso88591 -lib/X11/xserver/ve -lib/X11/xserver/ve_ZA -lib/X11/xserver/ve_ZA.utf8 -lib/X11/xserver/venda lib/X11/xserver/vi_VN lib/X11/xserver/vi_VN.tcvn lib/X11/xserver/vi_VN.utf8 @@ -871,11 +831,6 @@ lib/X11/xserver/wa_BE lib/X11/xserver/wa_BE.iso88591 lib/X11/xserver/wa_BE.iso885915@euro lib/X11/xserver/wa_BE@euro -lib/X11/xserver/xh -lib/X11/xserver/xh_ZA -lib/X11/xserver/xh_ZA.iso88591 -lib/X11/xserver/xh_ZA.utf8 -lib/X11/xserver/xhosa lib/X11/xserver/yi_US lib/X11/xserver/yi_US.cp1255 lib/X11/xserver/zh @@ -890,7 +845,6 @@ lib/X11/xserver/zh_CN.GB18030 lib/X11/xserver/zh_CN.GB18030@pinyin lib/X11/xserver/zh_CN.GB18030@radical lib/X11/xserver/zh_CN.GB18030@stroke -lib/X11/xserver/zh_CN.GBK lib/X11/xserver/zh_CN.GBK@pinyin lib/X11/xserver/zh_CN.GBK@radical lib/X11/xserver/zh_CN.GBK@stroke @@ -930,31 +884,36 @@ lib/X11/xserver/zh_TW.UTF-8@zhuyin lib/X11/xserver/zh_TW.big5 lib/X11/xserver/zh_TW.euctw lib/X11/xserver/zh_TW.utf8 -lib/X11/xserver/zu -lib/X11/xserver/zu_ZA -lib/X11/xserver/zu_ZA.iso88591 -lib/X11/xserver/zu_ZA.utf8 -lib/X11/xserver/zulu -@dirrm lib/X11/xserver/C/print/attributes -@dirrm lib/X11/xserver/C/print/ddx-config/raster -@dirrm lib/X11/xserver/C/print/ddx-config -@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts -@dirrm lib/X11/xserver/C/print/models/PSdefault +lib/X11/xserver/ro_RO.utf8 +lib/X11/xserver/zh_CN.GBK +lib/X11/xserver/tr_TR +@dirrm lib/X11/xserver/en_US/print/attributes +@dirrm lib/X11/xserver/en_US/print +@dirrm lib/X11/xserver/en_US/print +@dirrm lib/X11/xserver/en_US @dirrm lib/X11/xserver/C/print/models/SPSPARC2/fonts @dirrm lib/X11/xserver/C/print/models/SPSPARC2 +@dirrm lib/X11/xserver/C/print/models/SPSPARC2 +@dirrm lib/X11/xserver/C/print/models/PSspooldir +@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts +@dirrm lib/X11/xserver/C/print/models/PSdefault +@dirrm lib/X11/xserver/C/print/models/PS2PDFspooldir-GS +@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts +@dirrm lib/X11/xserver/C/print/models/HPLJ4family @dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts @dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS -@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts -@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS -@dirrm lib/X11/xserver/C/print/models/PSspooldir @dirrm lib/X11/xserver/C/print/models/HPDJ1600C/fonts @dirrm lib/X11/xserver/C/print/models/HPDJ1600C -@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts -@dirrm lib/X11/xserver/C/print/models/HPLJ4family +@dirrm lib/X11/xserver/C/print/models/GSdefault +@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts +@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS +@dirrm lib/X11/xserver/C/print/models/CANONBJ10E-GS @dirrm lib/X11/xserver/C/print/models +@dirrm lib/X11/xserver/C/print/ddx-config/raster +@dirrm lib/X11/xserver/C/print/ddx-config +@dirrm lib/X11/xserver/C/print/attributes @dirrm lib/X11/xserver/C/print @dirrm lib/X11/xserver/C -@dirrm lib/X11/xserver/en_US/print/attributes -@dirrm lib/X11/xserver/en_US/print -@dirrm lib/X11/xserver/en_US -@dirrmtry lib/X11/xserver +@dirrm lib/X11/xserver +@dirrmtry etc/X11/Xsession.d +@dirrm etc/X11 diff --git a/x11-servers/xorg-printserver/scripts/configure b/x11-servers/xorg-printserver/scripts/configure deleted file mode 100644 index 16aed24afb92..000000000000 --- a/x11-servers/xorg-printserver/scripts/configure +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define XprtServer YES" >> $LOCALDEF -echo "#define XnestServer NO" >> $LOCALDEF -echo "#define XorgServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define BuildXF86DRI NO" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -echo "#define InstallSecurityConfig NO" >> $LOCALDEF - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index 38907d90fe68..6f53725843cb 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -6,91 +6,67 @@ # PORTNAME= xorg-server -PORTVERSION= 6.8.99.903 +PORTVERSION= 1.2.99.903 PORTREVISION= 1 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= http://xorg.freedesktop.org/snapshots/ -DISTNAME= xorg-x11-${PORTVERSION} +MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \ + ${MASTER_SITE_SOURCEFORGE:S/$/:mesa/} +MASTER_SITE_SUBDIR=mesa3d/:mesa +DISTFILES= xorg-server-${PORTVERSION}.tar.bz2:fdo \ + MesaLib-6.5.2.tar.bz2:mesa MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org X server development snapshot and related programs +COMMENT= X.Org X server and related programs -USE_BZIP2= yes -.if !defined(WITH_MODULAR) -USE_XLIB= yes -.else -LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ - ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - GL.1:${PORTSDIR}/x11/libGL -BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \ - ${LIB_PC_DEPENDS} -RUN_DEPENDS= ${LIB_PC_DEPENDS} +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +RUN_DEPENDS= ${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config + +CONFLICTS= XFree86-Server-* + +XORG_CAT= xserver + +USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ + xmu xt xpm xext randrproto renderproto fixesproto damageproto \ + xcmiscproto xextproto xproto xtrans xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto inputproto xf86dgaproto \ + videoproto compositeproto trapproto recordproto xineramaproto \ + evieproto xfont fontenc xkbui + +USE_PERL5_BUILD=yes +CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-6.5.2 \ + --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ + --localstatedir=/var + +.if !defined(WITHOUT_AIGLX) +CONFIGURE_ARGS+= --enable-aiglx=yes .endif -CONFLICTS= XFree86-Server-* xorg-server-6.[79].* xorg-server-6.8.[012]* +.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO +CONFIGURE_ARGS+=--enable-install-setuid +.endif -SCRIPTS_ENV= WITH_DEBUG="${WITH_DEBUG}" MAN1= Xorg.1 \ - getconfig.1 \ + Xserver.1 \ + cvt.1 \ gtf.1 \ - kbd_mode.1 \ pcitweak.1 \ xorgcfg.1 \ xorgconfig.1 -MAN4= citron.4x \ - dmc.4x \ - dynapro.4x \ - elographics.4x \ - fbdevhw.4x \ - fpit.4x \ - glint.4x \ - js_x.4x \ - kbd.4x \ - keyboard.4x \ - mga.4x \ - microtouch.4x \ - mouse.4x \ - mutouch.4x \ - palmax.4x \ - penmount.4x \ - r128.4x \ - radeon.4x \ - tdfx.4x \ - tek4957.4x \ - vga.4x \ - void.4x \ - wacom.4x -MAN5= getconfig.5 \ - xorg.conf.5 - -XBUILD_DIRS= lib/font programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver -LATEST_LINK= ${PORTNAME}-snap +MAN4= exa.4 \ + fbdevhw.4 +MAN5= xorg.conf.5 NOT_FOR_ARCHS= ia64 -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif - .if ${ARCH} == alpha PLIST_SUB+= ALPHA_NA="@comment " .else PLIST_SUB+= ALPHA_NA="" .endif -.if ${ARCH} == ia64 -PLIST_SUB+= IA64_NA="@comment " -.else -PLIST_SUB+= IA64_NA="" -.endif - .if ${ARCH} == powerpc PLIST_SUB+= PPC_NA="@comment " MAN4+= nv.4x @@ -99,84 +75,20 @@ PLIST_SUB+= PPC_NA="" .endif .if ${ARCH} == sparc64 -BROKEN= Does not compile on sparc64 PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64_NA="@comment " -MAN4+= apm.4x \ - chips.4x \ - cirrus.4x \ - i128.4x \ - i740.4x \ - i810.4x \ - imstt.4x \ - neomagic.4x \ - newport.4x \ - nv.4x \ - rendition.4x \ - s3virge.4x \ - savage.4x \ - siliconmotion.4x \ - sunbw2.4x \ - suncg14.4x \ - suncg3.4x \ - suncg6.4x \ - sunffb.4x \ - sunleo.4x \ - suntcx.4x \ - trident.4x \ - vmware.4x .else PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" .endif -.if ${ARCH} != powerpc && ${ARCH} != sparc64 -MAN4+= cirrus.4x \ - nv.4x \ - rendition.4x \ - s3virge.4x \ - savage.4x \ - siliconmotion.4x -.endif - -.if ${ARCH} != powerpc && ${ARCH} != alpha -MAN4+= vesa.4x -.endif - -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -MAN1+= scanpci.1 -MAN4+= i740.4x \ - imstt.4x \ - newport.4x \ - nsc.4x \ - via.4x -.else -PLIST_SUB+= I386="@comment " -.endif - .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= AMD64_I386="" -MAN4+= apm.4x \ - chips.4x \ - cyrix.4x \ - i128.4x \ - i810.4x \ - neomagic.4x \ - sis.4x \ - trident.4x \ - tseng.4x \ - vmware.4x +MAN1+= scanpci.1 .else PLIST_SUB+= AMD64_I386="@comment " .endif -pre-everything:: - @${ECHO_MSG} "This X Server installs with development DRI DDX drivers. These drivers are" - @${ECHO_MSG} "considered insecure by their authors and may allow privilege escalation by" - @${ECHO_MSG} "local X clients with DRI privileges." - @${ECHO_MSG} "" - .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO pre-everything:: @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" @@ -185,10 +97,6 @@ pre-everything:: @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" @${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf." - -SCRIPTS_ENV+= SUID_XSERVER=YES -.else -SCRIPTS_ENV+= SUID_XSERVER=NO .endif .include <bsd.port.post.mk> diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc deleted file mode 100644 index 97d8db3bd96e..000000000000 --- a/x11-servers/xorg-server-snap/Makefile.inc +++ /dev/null @@ -1,94 +0,0 @@ -# Include before bsd.port.pre.mk for XFree86-4 ports which share -# XFree86-4-libraries's patches. -# The purpose of this file is to reduce the duplicated code among the XFree86-4 -# ports which each do only part of a standard XFree86 build. -# -# XBUILD_DIRS is the group of directories under ${WRKSRC} that will -# be built in. -# XINCLUDE_DIRS is the group of directories under ${WRKSRC} that need -# to be Makefilesed or included in besides XBUILD_DIRS -# XINSTALL_DIRS is the group of directories which will have -# their install targets run. -# XMAN_DIRS is the group of directories which will have -# their install.man targets run. - -DIST_SUBDIR?= xorg -WRKSRC?= ${WRKDIR}/xc -USE_X_PREFIX?= no -PREFIX?= ${X11BASE} -MTREE_FILE= /etc/mtree/BSD.x11-4.dist -MTREE_FILE= ${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* - -USE_IMAKE= YES -.if defined(XMAN_DIRS) -XFREE86_HTML_MAN?= yes -.else -XFREE86_HTML_MAN?= no -.endif -SCRIPTS_ENV+= CC="${CC}" \ - CXX="${CXX}" \ - CFLAGS="${CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" - -XINSTALL_DIRS?= ${XBUILD_DIRS} -_XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} - -CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl - -SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-atimobility \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-pc98kbd \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-radeon_driver.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c - -.if !target(do-configure) -do-configure: - @cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf - @cp ${X11BASE}/lib/X11/config/date.def ${WRKSRC}/config/cf - @cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${WRKSRC}/config/imake/imake \ - -DTOPDIR=${WRKSRC} -DCURDIR=$${dir} -I${WRKSRC}/config/cf; \ - done - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles; \ - done - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} includes; \ - done - @for dir in include ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} depend; \ - done -.endif - -.if !target(do-build) -do-build: - @for dir in ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} all; \ - done -.endif - -.if !target(do-install) -do-install: - @for dir in ${XINSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install; \ - done - @for dir in ${XMAN_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ - done -.endif - diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo index 84dded21b063..800ab34af858 100644 --- a/x11-servers/xorg-server-snap/distinfo +++ b/x11-servers/xorg-server-snap/distinfo @@ -1,3 +1,6 @@ -MD5 (xorg/xorg-x11-6.8.99.903.tar.bz2) = c4d8be6e2149906d99bb96f84ae972b4 -SHA256 (xorg/xorg-x11-6.8.99.903.tar.bz2) = 0d95e3301564cce9a391105bb86b8ac6dc562d23b9c7b932364478f6c685be0b -SIZE (xorg/xorg-x11-6.8.99.903.tar.bz2) = 45768494 +MD5 (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = b7c61148bf5827f6a220696381bfba15 +SHA256 (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = 0fe2986a8c6659bb2b7ff9b458000be053e14667db9ee3c288db0502c6e00770 +SIZE (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = 5968830 +MD5 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = e4d894181f1859651658b3704633e10d +SHA256 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f +SIZE (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 3295166 diff --git a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist deleted file mode 100644 index 5af20966bffa..000000000000 --- a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist +++ /dev/null @@ -1,524 +0,0 @@ -# $FreeBSD$ -# -# Please see the file src/etc/mtree/README before making changes to this file. -# - -/set type=dir uname=root gname=wheel mode=0755 -. - bin - .. - etc - rc.d - .. - .. - include - X11 - PEX5 - .. - Xft - .. - bitmaps - .. - pixmaps - .. - .. - bitmaps - .. - freetype2 - freetype - cache - .. - config - .. - internal - .. - .. - .. - .. - info - .. - lib - X11 - XF86Setup - pics - .. - scripts - .. - tcllib - .. - .. - app-defaults - .. - etc - .. - fonts - local - .. - .. - lbxproxy - .. - xserver - .. - .. - aout - .. - modules - codeconv - .. - dri - .. - .. - .. - libdata - pkgconfig - .. - .. - libexec - .. - man -/set uname=man - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. - catl - .. - catn - .. - ja uname=root - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. - catl - .. - catn - .. -/set uname=root - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - manl - .. - mann - .. - .. - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - manl - .. - mann - .. - .. - share - aclocal - .. - doc - ja - .. - .. - examples - .. - locale - af - LC_MESSAGES - .. - .. - am - LC_MESSAGES - .. - .. - ar - LC_MESSAGES - .. - .. - az - LC_MESSAGES - .. - .. - be - LC_MESSAGES - .. - .. - bg - LC_MESSAGES - .. - .. - bn - LC_MESSAGES - .. - .. - bs - LC_MESSAGES - .. - .. - ca - LC_MESSAGES - .. - .. - cs - LC_MESSAGES - .. - .. - cy - LC_MESSAGES - .. - .. - da - LC_MESSAGES - .. - .. - de - LC_MESSAGES - .. - .. - de_AT - LC_MESSAGES - .. - .. - el - LC_MESSAGES - .. - .. - en - LC_MESSAGES - .. - .. - en_AU - LC_MESSAGES - .. - .. - en_CA - LC_MESSAGES - .. - .. - en_GB - LC_MESSAGES - .. - .. - eo - LC_MESSAGES - .. - .. - es - LC_MESSAGES - .. - .. - es_ES - LC_MESSAGES - .. - .. - es_MX - LC_MESSAGES - .. - .. - et - LC_MESSAGES - .. - .. - eu - LC_MESSAGES - .. - .. - fa - LC_MESSAGES - .. - .. - fa_IR - LC_MESSAGES - .. - .. - fi - LC_MESSAGES - .. - .. - fr - LC_MESSAGES - .. - .. - fr_FR - LC_MESSAGES - .. - .. - ga - LC_MESSAGES - .. - .. - gl - LC_MESSAGES - .. - .. - gu - LC_MESSAGES - .. - .. - he - LC_MESSAGES - .. - .. - hi - LC_MESSAGES - .. - .. - hr - LC_MESSAGES - .. - .. - hu - LC_MESSAGES - .. - .. - id - LC_MESSAGES - .. - .. - is - LC_MESSAGES - .. - .. - it - LC_MESSAGES - .. - .. - ja - LC_MESSAGES - .. - .. - ka - LC_MESSAGES - .. - .. - kn - LC_MESSAGES - .. - .. - ko - LC_MESSAGES - .. - .. - li - LC_MESSAGES - .. - .. - lt - LC_MESSAGES - .. - .. - lv - LC_MESSAGES - .. - .. - mk - LC_MESSAGES - .. - .. - ml - LC_MESSAGES - .. - .. - mn - LC_MESSAGES - .. - .. - ms - LC_MESSAGES - .. - .. - mt - LC_MESSAGES - .. - .. - nb - LC_MESSAGES - .. - .. - ne - LC_MESSAGES - .. - .. - nl - LC_MESSAGES - .. - .. - nn - LC_MESSAGES - .. - .. - no - LC_MESSAGES - .. - .. - or - LC_MESSAGES - .. - .. - pa - LC_MESSAGES - .. - .. - pl - LC_MESSAGES - .. - .. - pt - LC_MESSAGES - .. - .. - pt_BR - LC_MESSAGES - .. - .. - pt_PT - LC_MESSAGES - .. - .. - ro - LC_MESSAGES - .. - .. - ru - LC_MESSAGES - .. - .. - sk - LC_MESSAGES - .. - .. - sl - LC_MESSAGES - .. - .. - sq - LC_MESSAGES - .. - .. - sr - LC_MESSAGES - .. - .. - sr@Latn - LC_MESSAGES - .. - .. - sv - LC_MESSAGES - .. - .. - ta - LC_MESSAGES - .. - .. - tg - LC_MESSAGES - .. - .. - th - LC_MESSAGES - .. - .. - tk - LC_MESSAGES - .. - .. - tr - LC_MESSAGES - .. - .. - uk - LC_MESSAGES - .. - .. - uz - LC_MESSAGES - .. - .. - wa - LC_MESSAGES - .. - .. - vi - LC_MESSAGES - .. - .. - zh - LC_MESSAGES - .. - .. - zh_CN - LC_MESSAGES - .. - .. - zh_CN.GB2312 - LC_MESSAGES - .. - .. - zh_TW - LC_MESSAGES - .. - .. - zh_TW.Big5 - LC_MESSAGES - .. - .. - .. - .. -.. diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf deleted file mode 100644 index e7c983833b5a..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf +++ /dev/null @@ -1,90 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Tue May 3 21:14:57 2005 -+++ config/cf/FreeBSD.cf Mon May 9 15:21:48 2005 -@@ -78,6 +78,7 @@ - #define HasIssetugid YES - #define HasPoll YES - #endif -+#define BuildHtmlManPages NO - - #if OSMajorVersion >= 4 - #define HasGetIfAddrs YES -@@ -116,15 +117,14 @@ - # endif - # if (OSRelVersion < 500043) - # define NeedUIThrStubs YES --# endif --# if (OSRelVersion >= 502102) --# define ThreadsLibraries -lpthread --# elif (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r -+# define BuildThreadStubLibrary YES -+# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) -+# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) - # else --# define ThreadsLibraries -pthread -+# define BuildThreadStubLibrary NO - # endif --# define SystemMTDefines -D_THREAD_SAFE -+# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - #endif - - /* This fixes linking C programs against libGLU on FreeBSD 3.x */ -@@ -172,12 +172,14 @@ - #endif - #endif - --#ifndef CcCmd --#define CcCmd cc --#endif --#ifndef CplusplusCmd --#define CplusplusCmd c++ -+#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) -+#define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+#define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX -+#else -+#define CcCmd FreeBSDCC -+#define CplusplusCmd FreeBSDCXX - #endif -+ - #define CppCmd /usr/bin/cpp - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional -@@ -338,7 +340,7 @@ - #ifndef LibraryRpathLoadFlags - # if UseRpath - # if UseElfFormat --# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) -+# define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH) - # else - # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) - # endif -@@ -446,7 +448,6 @@ - #ifdef PpcArchitecture - #define XF86INT10_BUILD X86INT10_STUB - #endif -- - #define StandardDefines -DCSRG_BASED - - #if OSMajorVersion > 1 -@@ -467,18 +468,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.rules b/x11-servers/xorg-server-snap/files/patch-Imake.rules deleted file mode 100644 index deea1cb886a6..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Imake.rules +++ /dev/null @@ -1,67 +0,0 @@ ---- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002 -+++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003 -@@ -1406,7 +1406,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef RmanDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanDependency() /**/ - #else - #define RmanDependency() @@\ -@@ -1421,7 +1421,7 @@ - #endif /* RmanDependency */ - - #ifndef RmanCmdDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanCmdDependency /**/ - #else - #define RmanCmdDependency ProgramTargetName($(RMAN)) -@@ -1874,7 +1874,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef DependDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define DependDependency() /**/ - #else - #define DependDependency() @@\ -@@ -1969,7 +1969,7 @@ - * within the source tree. - */ - #ifndef ImakeDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define ImakeDependency(target) /**/ - #else - #define ImakeDependency(target) @@\ -@@ -2066,11 +2066,18 @@ - * ProjectUnsharedLibReferences - variables for unshared libraries - */ - #ifndef ProjectUnsharedLibReferences -+#if defined(UseInstalledLibraries) -+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ -+Concat3(DEP,varname,LIB) = @@\ -+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -+LintLibReferences(varname,libname,libsource) -+#else - #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ - Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ - Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ - LintLibReferences(varname,libname,libsource) - #endif -+#endif - - /* - * ProjectUnsharedFontLibReferences - unshared font libraries -@@ -3126,6 +3133,9 @@ - - #ifdef UseInstalled - #define ImakeSubCmdHelper $(IMAKE_CMD) -+#elif defined(UseInstalledPrograms) -+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.tmpl b/x11-servers/xorg-server-snap/files/patch-Imake.tmpl deleted file mode 100644 index 526e2e5de8a8..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Imake.tmpl +++ /dev/null @@ -1,75 +0,0 @@ ---- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002 -+++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003 -@@ -237,7 +237,8 @@ - - #ifndef RmanCmd - #if BuildRman --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RmanCmd rman - #else - #define RmanCmd $(TOP)/config/util/rman -@@ -1348,7 +1349,8 @@ - #define LoaderLibPrefix /**/ - #endif - #ifndef ImakeCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define ImakeCmd imake - #else - #define ImakeCmd $(IMAKESRC)/imake -@@ -1359,19 +1361,22 @@ - #endif - #ifndef DependCmd - #if UseGccMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd gccmakedep - #else - #define DependCmd $(DEPENDSRC)/gccmakedep - #endif - #elif UseCCMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd ccmakedep - #else - #define DependCmd $(DEPENDSRC)/ccmakedep - #endif - #else --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd makedepend - #else - #define DependCmd $(DEPENDSRC)/makedepend -@@ -1398,21 +1403,23 @@ - #ifndef ExportListCmd - # ifndef ExportListGenSource - # define ExportListCmd /**/ --# elif !defined(UseInstalled) -+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define ExportListCmd $(CONFIGSRC)/util/exportlistgen - # else - # define ExportListCmd exportlistgen - # endif - #endif - #ifndef MkdirHierCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define MkdirHierCmd mkdirhier - #else - #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh - #endif - #endif - #ifndef RevPathCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RevPathCmd revpath - #else - #define RevPathCmd $(CONFIGSRC)/util/revpath diff --git a/x11-servers/xorg-server-snap/files/patch-Library.tmpl b/x11-servers/xorg-server-snap/files/patch-Library.tmpl deleted file mode 100644 index e94aae3bfc60..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Library.tmpl +++ /dev/null @@ -1,21 +0,0 @@ ---- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 -+++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 -@@ -389,7 +389,7 @@ - */ - - #ifndef MakeStringsDependency --# ifndef UseInstalled -+# if !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define MakeStringsDependency @@\ - MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ - NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -399,7 +399,8 @@ - @@\ - includes:: HostProgramTargetName($(MAKESTRS)) - # else --# define MakeStringsDependency /**/ -+# define MakeStringsDependency @@\ -+MAKESTRS = makestrs - # endif - #endif - diff --git a/x11-servers/xorg-server-snap/files/patch-X11.rules b/x11-servers/xorg-server-snap/files/patch-X11.rules deleted file mode 100644 index 052e960127fc..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-X11.rules +++ /dev/null @@ -1,17 +0,0 @@ ---- config/cf/X11.rules.orig Sun May 30 12:49:38 2004 -+++ config/cf/X11.rules Sun May 30 12:50:02 2004 -@@ -23,6 +23,14 @@ - # define UseInstalledX11 YES - #endif - -+#ifndef UseInstalledPrograms -+# define UseInstalledPrograms NO -+#endif -+ -+#ifndef UseInstalledClients -+# define UseInstalledClients NO -+#endif -+ - #ifndef ImportX11 - # ifdef UseImports - # define ImportX11 YES diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl deleted file mode 100644 index c27d14d8e1ec..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-X11.tmpl +++ /dev/null @@ -1,79 +0,0 @@ ---- X11.tmpl.orig Fri Sep 3 09:18:18 2004 -+++ config/cf/X11.tmpl Wed Dec 29 13:42:37 2004 -@@ -616,7 +616,7 @@ - #define BuildXft1Library BuildRenderLibrary - #endif - #ifndef UseFontconfig --#define UseFontconfig BuildXftLibrary -+#define UseFontconfig (BuildXftLibrary || BuildXft1Library) - #endif - #ifndef BuildFontconfigLibrary - #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -773,6 +773,9 @@ - #ifndef ThreadedProject - #define ThreadedProject ThreadedX - #endif -+#ifndef BuildThreadStubLibrary -+#define BuildThreadStubLibrary NO -+#endif - #ifndef NeedUIThrStubs - #define NeedUIThrStubs NO - #endif -@@ -1606,7 +1609,7 @@ - #endif - - #ifndef PsWrap --# ifndef UseInstalled -+# if !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define PsWrap $(PSWRAPSRC)/pswrap - # else - # define PsWrap pswrap -@@ -1683,7 +1686,7 @@ - - INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ - --#if UseInstalledX11 -+#if UseInstalledX11 || UseInstalledClients - RGB = $(XBINDIR)/rgb - FONTC = $(XBINDIR)/bdftopcf - MKFONTSCALE = $(XBINDIR)/mkfontscale -@@ -1843,6 +1846,39 @@ - DEPXLIBONLY = $(DEPXONLYLIB) - XLIBONLY = $(XONLYLIB) - LINTXONLYLIB = $(LINTXONLY) -+ -+#if BuildThreadStubLibrary -+#ifndef SharedLibXThrStub -+#define SharedLibXThrStub YES -+#endif -+#ifndef NormalLibXThrStub -+#define NormalLibXThrStub NO -+#endif -+#ifndef DebugLibXThrStub -+#define DebugLibXThrStub NO -+#endif -+#ifndef ProfileLibXThrStub -+#define ProfileLibXThrStub NO -+#endif -+ XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub -+#if SharedLibXThrStub -+#ifndef SharedXThrStubRev -+#define SharedXThrStubRev 6.1 -+#endif -+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev) -+#else -+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) -+#endif -+#else -+#undef SharedLibXThrStub -+#define SharedLibXThrStub NO -+#undef NormalLibXThrStub -+#define NormalLibXThrStub NO -+#undef DebugLibXThrStub -+#define DebugLibXThrStub NO -+#undef ProfileLibXThrStub -+#define ProfileLibXThrStub NO -+#endif - - #if BuildScreenSaverLibrary - #ifndef SharedLibXss diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile deleted file mode 100644 index 5dab87bd4828..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile +++ /dev/null @@ -1,8 +0,0 @@ ---- programs/Xserver/Imakefile.orig Sat May 29 14:12:45 2004 -+++ programs/Xserver/Imakefile Sat May 29 14:12:16 2004 -@@ -1095,5 +1095,3 @@ - - DEFAULTFONTPATH = DefaultFontPath - EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" -- --InstallManPage(Xserver,$(MANDIR)) diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c new file mode 100644 index 000000000000..5894dbb727bc --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c @@ -0,0 +1,14 @@ +Index: programs/Xserver/Xext/xvmc.c +diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c +--- Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005 ++++ Xext/xvmc.c Thu Jan 26 14:22:20 2006 +@@ -24,8 +24,8 @@ + + #ifdef HAS_XVMCSHM + #ifndef Lynx +-#include <sys/ipc.h> + #include <sys/types.h> ++#include <sys/ipc.h> + #include <sys/shm.h> + #else + #include <ipc.h> diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c new file mode 100644 index 000000000000..59aad379ae11 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c @@ -0,0 +1,11 @@ +--- hw/xfree86/common/xf86Config.c.orig Fri Jun 23 12:32:32 2006 ++++ hw/xfree86/common/xf86Config.c Fri Jun 23 12:32:46 2006 +@@ -1042,7 +1042,7 @@ + else + xf86Info.estimateSizesAggressively = 0; + +- xf86Info.aiglx = TRUE; ++ xf86Info.aiglx = FALSE; + xf86Info.aiglxFrom = X_DEFAULT; + if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) { + xf86Info.aiglx = value; diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c new file mode 100644 index 000000000000..933742b00170 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c @@ -0,0 +1,12 @@ +Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c +diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c +--- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005 ++++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006 +@@ -35,6 +35,7 @@ + #include "xf86Priv.h" + + #include <errno.h> ++#include <sys/types.h> + #include <sys/mman.h> + + #ifdef HAS_MTRR_SUPPORT diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c new file mode 100644 index 000000000000..e9fb876333cc --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c @@ -0,0 +1,12 @@ +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c +--- os/xprintf.c.orig Sun Jul 3 17:53:52 2005 ++++ os/xprintf.c Thu Jan 26 12:47:37 2006 +@@ -39,7 +39,7 @@ + # ifdef __va_copy + # define va_copy __va_copy + # else +-# error "no working va_copy was found" ++# define va_copy(dest, src) ((dest) = (src)) + # endif + #endif + diff --git a/x11-servers/xorg-server-snap/files/patch-at_scancode.c b/x11-servers/xorg-server-snap/files/patch-at_scancode.c new file mode 100644 index 000000000000..68ffceb41e86 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-at_scancode.c @@ -0,0 +1,31 @@ +--- hw/xfree86/os-support/shared/at_scancode.c.orig Sun Jul 3 09:01:35 2005 ++++ hw/xfree86/os-support/shared/at_scancode.c Sat Oct 7 21:27:29 2006 +@@ -84,6 +84,10 @@ + case KEY_Prefix0: + pKbd->scanPrefix = 0; + switch (*scanCode) { ++ case 0x1e: *scanCode = KEY_AudioRaise;break; ++ case 0x1f: *scanCode = KEY_AudioLower;break; ++ case 0x20: *scanCode = KEY_Power; break; ++ case 0x25: *scanCode = KEY_Mute; break; + case KEY_KP_7: *scanCode = KEY_Home; break; /* curs home */ + case KEY_KP_8: *scanCode = KEY_Up; break; /* curs up */ + case KEY_KP_9: *scanCode = KEY_PgUp; break; /* curs pgup */ +@@ -104,6 +108,17 @@ + case 0x5b: *scanCode = KEY_LMeta; break; + case 0x5c: *scanCode = KEY_RMeta; break; + case 0x5d: *scanCode = KEY_Menu; break; ++ case 0x5e: *scanCode = KEY_L1; break; /* stop */ ++ case 0x5f: *scanCode = KEY_L2; break; /* again */ ++ case 0x60: *scanCode = KEY_L3; break; /* props */ ++ case 0x61: *scanCode = KEY_L4; break; /* undo */ ++ case 0x62: *scanCode = KEY_L5; break; /* front */ ++ case 0x63: *scanCode = KEY_L6; break; /* copy */ ++ case 0x64: *scanCode = KEY_L7; break; /* open */ ++ case 0x65: *scanCode = KEY_L8; break; /* paste */ ++ case 0x66: *scanCode = KEY_L9; break; /* find */ ++ case 0x67: *scanCode = KEY_L10; break; /* cut */ ++ case 0x68: *scanCode = KEY_Help; break; + case KEY_F3: *scanCode = KEY_F13; break; + case KEY_F4: *scanCode = KEY_F14; break; + case KEY_F5: *scanCode = KEY_F15; break; diff --git a/x11-servers/xorg-server-snap/files/patch-bsdResource.c b/x11-servers/xorg-server-snap/files/patch-bsdResource.c new file mode 100644 index 000000000000..44388bb0a393 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-bsdResource.c @@ -0,0 +1,68 @@ +--- hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 ++++ hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 +@@ -18,7 +18,7 @@ + + #ifdef INCLUDE_XF86_NO_DOMAIN + +-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) ++#if defined(__alpha__) || defined(__amd64__) + + resPtr + xf86BusAccWindowsFromOS(void) +@@ -112,7 +112,7 @@ + return ret; + } + +-#elif defined(__powerpc__) ++#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) + + resPtr + xf86BusAccWindowsFromOS(void) +@@ -123,7 +123,11 @@ + RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); + ret = xf86AddResToList(ret, &range, -1); + ++#if defined(__sparc__) || defined(__sparc64__) ++ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); ++#else + RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); ++#endif + ret = xf86AddResToList(ret, &range, -1); + return ret; + } +@@ -137,7 +141,11 @@ + RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); + ret = xf86AddResToList(ret, &range, -1); + ++#if defined(__sparc__) || defined(__sparc64__) ++ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); ++#else + RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); ++#endif + ret = xf86AddResToList(ret, &range, -1); + return ret; + } +@@ -153,7 +161,11 @@ + RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); + ret = xf86AddResToList(ret, &range, -1); + ++#if defined(__sparc__) || defined(__sparc64__) ++ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); ++#else + RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); ++#endif + ret = xf86AddResToList(ret, &range, -1); + return ret; + } +@@ -175,7 +187,11 @@ + ret = xf86AddResToList(ret, &range, -1); + RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); + ret = xf86AddResToList(ret, &range, -1); ++#if defined(__sparc__) || defined(__sparc64__) ++ RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock); ++#else + RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock); ++#endif + ret = xf86AddResToList(ret, &range, -1); + + return ret; diff --git a/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c b/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c new file mode 100644 index 000000000000..a7d8cb3fdd48 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c @@ -0,0 +1,32 @@ +--- hw/xfree86/os-support/bsd/bsd_kbd.c.orig Mon Oct 3 18:46:14 2005 ++++ hw/xfree86/os-support/bsd/bsd_kbd.c Fri Sep 29 23:26:17 2006 +@@ -75,6 +75,17 @@ + KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; + int real_leds = 0; + ++#if defined (SYSCONS_SUPPORT) ++ if (pKbd->sunKbd) { ++ if (leds & 0x08) real_leds |= XLED1; ++ if (leds & 0x04) real_leds |= XLED4; ++ if (leds & 0x02) real_leds |= XLED3; ++ if (leds & 0x01) real_leds |= XLED2; ++ leds = real_leds; ++ real_leds = 0; ++ } ++#endif ++ + #ifdef LED_CAP + if (leds & XLED1) real_leds |= LED_CAP; + #endif +@@ -83,7 +94,11 @@ + #endif + #ifdef LED_SCR + if (leds & XLED3) real_leds |= LED_SCR; ++#ifdef LED_COMP ++ if (leds & XLED4) real_leds |= LED_COMP; ++#else + if (leds & XLED4) real_leds |= LED_SCR; ++#endif + #endif + + switch (pKbd->consType) { diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c deleted file mode 100644 index 68e18f831ec7..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c +++ /dev/null @@ -1,231 +0,0 @@ ---- lib/font/FreeType/ftfuncs.c.orig 2005-10-23 19:32:05.000000000 +0100 -+++ lib/font/FreeType/ftfuncs.c 2006-06-01 23:21:34.000000000 +0100 -@@ -54,10 +54,7 @@ - #include FT_TYPE1_TABLES_H - #include FT_XFREE86_H - #include FT_BBOX_H --#include FT_INTERNAL_TRUETYPE_TYPES_H - #include FT_TRUETYPE_TAGS_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_STREAM_H - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. -@@ -123,6 +120,46 @@ - }; - - -+/* read 2-byte value from a SFNT table */ -+static FT_UShort -+sfnt_get_ushort( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[2]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) ); -+ result = (FT_UShort)( (buff[0] << 8) | buff[1] ); -+ -+ return result; -+} -+ -+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o))) -+ -+ -+#if 0 -+static FT_ULong -+sfnt_get_ulong( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[4]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ); -+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) | -+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3]; -+ -+ return result; -+} -+#endif -+ -+ -+ -+ - static int ftypeInitP = 0; /* is the engine initialised? */ - FT_Library ftypeLibrary; - -@@ -211,6 +248,10 @@ - if(maxp && maxp->maxContours == 0) - face->bitmap = 1; - } -+ -+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face, -+ TTAG_hhea, 34 ); -+ - /* Insert face in hashtable and return it */ - face->next = faceTable[bucket]; - faceTable[bucket] = face; -@@ -462,6 +503,29 @@ - } - - if( FT_IS_SFNT( face->face ) ) { -+#if 1 -+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y; -+ FT_UInt nn; -+ -+ instance->strike_index=0xFFFFU; -+ -+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5); -+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5); -+ -+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64; -+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64; -+ -+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ ) -+ { -+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn]; -+ -+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem ) -+ { -+ instance->strike_index = nn; -+ break; -+ } -+ } -+#else - /* See Set_Char_Sizes() in ttdriver.c */ - FT_Error err; - TT_Face tt_face; -@@ -486,6 +550,7 @@ - sfnt = (SFNT_Service)tt_face->sfnt; - err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index); - if ( err ) instance->strike_index=0xFFFFU; -+#endif - } - - /* maintain a linked list of instances */ -@@ -803,31 +868,36 @@ - * parse the htmx field in TrueType font. - */ - --/* from src/truetype/ttgload.c */ - static void --tt_get_metrics( TT_HoriHeader* header, -+tt_get_metrics( FT_Face face, - FT_UInt idx, -+ FT_UInt num_hmetrics, - FT_Short* bearing, - FT_UShort* advance ) --/* Copyright 1996-2001, 2002 by */ --/* David Turner, Robert Wilhelm, and Werner Lemberg. */ - { -- TT_LongMetrics longs_m; -- FT_UShort k = header->number_Of_HMetrics; -+ /* read the metrics directly from the horizontal header, we -+ * parse the SFNT table directly through the standard FreeType API. -+ * this works with any version of the library and doesn't need to -+ * peek at its internals. Maybe a bit less -+ */ -+ FT_UInt count = num_hmetrics; - -- if ( k == 0 ) { -- *bearing = *advance = 0; -- return; -+ if ( count == 0 ) -+ { -+ *advance = 0; -+ *bearing = 0; - } -+ else if ( idx < count ) -+ { -+ FT_ULong offset = idx*4; - -- if ( idx < (FT_UInt)k ) { -- longs_m = (TT_LongMetrics )header->long_metrics + idx; -- *bearing = longs_m->bearing; -- *advance = longs_m->advance; -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 ); - } -- else { -- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k]; -- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance; -+ else -+ { -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 ); - } - } - -@@ -835,6 +905,7 @@ - ft_get_very_lazy_bbox( FT_UInt index, - FT_Face face, - FT_Size size, -+ FT_UInt num_hmetrics, - double slant, - FT_Matrix *matrix, - FT_BBox *bbox, -@@ -842,14 +913,13 @@ - FT_Long *vertAdvance) - { - if ( FT_IS_SFNT( face ) ) { -- TT_Face ttface = (TT_Face)face; - FT_Size_Metrics *smetrics = &size->metrics; - FT_Short leftBearing = 0; - FT_UShort advance = 0; - FT_Vector p0, p1, p2, p3; - - /* horizontal */ -- tt_get_metrics(&ttface->horizontal, index, -+ tt_get_metrics( face, num_hmetrics, index, - &leftBearing, &advance); - - #if 0 -@@ -910,7 +980,27 @@ - FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return, - int *sbitchk_incomplete_but_exist ) - { --#if (FREETYPE_VERSION >= 2001008) -+#if 1 -+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0) -+ { -+ FT_Error error; -+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index]; -+ -+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 ); -+ if ( !error ) -+ { -+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY ); -+ if ( !error ) -+ { -+ if ( metrics_return != NULL ) -+ *metrics_return = ft_face->glyph->metrics; -+ -+ return 0; -+ } -+ } -+ } -+ return -1; -+#elif (FREETYPE_VERSION >= 2001008) - SFNT_Service sfnt; - TT_Face face; - FT_Error error; -@@ -1043,6 +1133,7 @@ - if( bitmap_metrics == NULL ) { - if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) { - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -@@ -1221,6 +1312,7 @@ - if( is_outline == 1 ){ - if( correct ){ - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h deleted file mode 100644 index 925263c0009e..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100 -+++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100 -@@ -47,6 +47,7 @@ - char *filename; - FT_Face face; - int bitmap; -+ FT_UInt num_hmetrics; - struct _FTInstance *instances; - struct _FTInstance *active_instance; - struct _FTFace *next; /* link to next face in bucket */ diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c deleted file mode 100644 index df7c97dce67a..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100 -+++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100 -@@ -35,7 +35,6 @@ - #endif - #include <ft2build.h> - #include FT_CONFIG_CONFIG_H --#include FT_INTERNAL_DEBUG_H - #include FT_SYSTEM_H - #include FT_ERRORS_H - #include FT_TYPES_H diff --git a/x11-servers/xorg-server-snap/files/patch-os-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-Imakefile deleted file mode 100644 index bbedacae7a94..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-os-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/os/Imakefile.orig Wed Mar 23 11:58:45 2005 -+++ programs/Xserver/os/Imakefile Sun Apr 17 08:32:03 2005 -@@ -131,7 +131,8 @@ - $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) - INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \ -- -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes -+ -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes \ -+ -I$(INCROOT)/X11 - DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \ - $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \ - DependDefines diff --git a/x11-servers/xorg-server-snap/files/patch-render.c b/x11-servers/xorg-server-snap/files/patch-render.c new file mode 100644 index 000000000000..17f8b144b1a7 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-render.c @@ -0,0 +1,11 @@ +--- render/render.c.orig Mon May 29 09:43:15 2006 ++++ render/render.c Mon May 29 09:45:02 2006 +@@ -1340,7 +1340,7 @@ + { + if (buffer + sizeof (GlyphSet) < end) + { +- memcpy(&gs, buffer, sizeof(GlyphSet)); ++ gs = *(CARD32 *) buffer; + glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, + gs, + GlyphSetType, diff --git a/x11-servers/xorg-server-snap/files/patch-servermd.h b/x11-servers/xorg-server-snap/files/patch-servermd.h new file mode 100644 index 000000000000..5bbb1e4d8ab5 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-servermd.h @@ -0,0 +1,11 @@ +--- include/servermd.h.orig Sun Jan 8 14:05:55 2006 ++++ include/servermd.h Sun Jan 8 14:06:22 2006 +@@ -216,7 +216,7 @@ + defined(__sparc__) || defined(__mc68000__) + + #if defined(__sparc) || defined(__sparc__) +-# if !defined(sparc) ++# if !defined(sparc) && !defined(__FreeBSD__) + # define sparc 1 + # endif + #endif diff --git a/x11-servers/xorg-server-snap/files/patch-sparc64kbd b/x11-servers/xorg-server-snap/files/patch-sparc64kbd deleted file mode 100644 index d4854adf9cac..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-sparc64kbd +++ /dev/null @@ -1,22 +0,0 @@ ---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig Wed Feb 23 23:28:28 2005 -+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c Thu Feb 24 00:12:20 2005 -@@ -571,6 +571,19 @@ - } - } - -+#if defined(__sparc__) && defined(__FreeBSD__) -+ /* -+ * Taken from xf86Events.c: -+ * I really don't know what's wrong here, but passing the real -+ * scanCode offsets by one from XKB's point of view. -+ * -+ * (ecd@skynet.be, 980405) -+ */ -+ if (pKbd->sunKbd) { -+ scanCode--; -+ } -+#endif -+ - #ifndef TERMINATE_FALLBACK - #define TERMINATE_FALLBACK 1 - #endif diff --git a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl b/x11-servers/xorg-server-snap/files/patch-xf86.tmpl deleted file mode 100644 index 3bf0b443d5f8..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl +++ /dev/null @@ -1,12 +0,0 @@ ---- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002 -+++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003 -@@ -19,6 +19,9 @@ - #ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+#elif UseInstalledPrograms -+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Events.c b/x11-servers/xorg-server-snap/files/patch-xf86Events.c index bdd5bc51c819..2d88773233b8 100644 --- a/x11-servers/xorg-server-snap/files/patch-xf86Events.c +++ b/x11-servers/xorg-server-snap/files/patch-xf86Events.c @@ -1,5 +1,5 @@ ---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 -+++ programs/Xserver/hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004 +--- hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 ++++ hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004 @@ -448,7 +448,7 @@ #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT) static Bool first_time = TRUE; diff --git a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile deleted file mode 100644 index 5728d915fb48..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 -@@ -25,6 +25,8 @@ - SNPRINTFOBJS = snprintf.o - #endif - -+XAWLIB = -lXaw -+ - SRCS =\ - accessx.c\ - card-cfg.c\ diff --git a/x11-servers/xorg-server-snap/files/patch-xf86sym.c b/x11-servers/xorg-server-snap/files/patch-xf86sym.c deleted file mode 100644 index 1372be144354..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86sym.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig Fri May 7 18:51:51 2004 -+++ programs/Xserver/hw/xfree86/loader/xf86sym.c Fri May 7 18:52:02 2004 -@@ -63,7 +63,6 @@ - #include "xf86.h" - #include "xf86Resources.h" - #include "xf86_OSproc.h" --#include "xf86Parser.h" - #include "xf86Config.h" - #ifdef XINPUT - # include "xf86Xinput.h" diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp index e21fac8d8484..04e217b8d9fe 100644 --- a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp +++ b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp @@ -1,5 +1,5 @@ ---- programs/Xserver/hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004 -+++ programs/Xserver/hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004 +--- hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004 ++++ hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004 @@ -624,3 +624,11 @@ InputDevice "Keyboard1" "CoreKeyboard" EndSection diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist index 4e743e9bada4..f2dd3ba937e0 100644 --- a/x11-servers/xorg-server-snap/pkg-plist +++ b/x11-servers/xorg-server-snap/pkg-plist @@ -1,20 +1,16 @@ bin/X bin/Xorg -bin/getconfig -bin/getconfig.pl +bin/cvt bin/gtf %%SPARC64_NA%%%%PPC_NA%%bin/inb %%SPARC64_NA%%%%PPC_NA%%bin/inl %%SPARC64_NA%%%%PPC_NA%%bin/inw %%SPARC64_NA%%%%PPC_NA%%bin/ioport -bin/kbd_mode -bin/mmapr -bin/mmapw %%SPARC64_NA%%%%PPC_NA%%bin/outb %%SPARC64_NA%%%%PPC_NA%%bin/outl %%SPARC64_NA%%%%PPC_NA%%bin/outw bin/pcitweak -%%I386%%bin/scanpci +%%AMD64_I386%%bin/scanpci bin/xorgcfg bin/xorgconfig include/X11/bitmaps/card.xbm @@ -34,179 +30,257 @@ include/X11/pixmaps/computer.xpm include/X11/pixmaps/keyboard.xpm include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm +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 +include/xorg/colormapst.h +include/xorg/compiler.h +include/xorg/cursor.h +include/xorg/cursorstr.h +include/xorg/damage.h +include/xorg/damagestr.h +include/xorg/dbestruct.h +include/xorg/dgaproc.h +include/xorg/dix.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 +include/xorg/edid.h +include/xorg/exa.h +include/xorg/exevents.h +include/xorg/extension.h +include/xorg/extinit.h +include/xorg/extnsionst.h +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/globals.h +include/xorg/glyphstr.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 +include/xorg/micmap.h +include/xorg/micoord.h +include/xorg/mifillarc.h +include/xorg/mifpoly.h +include/xorg/migc.h +include/xorg/miline.h +include/xorg/mipict.h +include/xorg/mipointer.h +include/xorg/mipointrst.h +include/xorg/misc.h +include/xorg/miscstruct.h +include/xorg/mispans.h +include/xorg/mistruct.h +include/xorg/miwideline.h +include/xorg/mizerarc.h +include/xorg/msp3430.h +include/xorg/opaque.h +include/xorg/os.h +include/xorg/picture.h +include/xorg/picturestr.h +include/xorg/pixmap.h +include/xorg/pixmapstr.h +include/xorg/property.h +include/xorg/propertyst.h +include/xorg/randrstr.h +include/xorg/region.h +include/xorg/regionstr.h +include/xorg/renderedge.h +include/xorg/resource.h +include/xorg/rgb.h +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/site.h +include/xorg/swaprep.h +include/xorg/swapreq.h +include/xorg/tda8425.h +include/xorg/tda9850.h +include/xorg/tda9885.h +include/xorg/uda1380.h +include/xorg/validate.h +include/xorg/vbe.h +include/xorg/vbeModes.h +include/xorg/vdif.h +include/xorg/vgaHW.h +include/xorg/window.h +include/xorg/windowstr.h +include/xorg/xaa.h +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/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/xf86RandR12.h +include/xorg/xf86Rename.h +include/xorg/xf86RamDac.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 +include/xorg/xf86int10.h +include/xorg/xf86sbusBus.h +include/xorg/xf86str.h +include/xorg/xf86xv.h +include/xorg/xf86xvmc.h +include/xorg/xf86xvpriv.h +include/xorg/xisb.h +include/xorg/xorg-server.h +include/xorg/xorgVersion.h +include/xorg/xvdix.h +include/xorg/xvmcext.h lib/X11/Cards lib/X11/Options -lib/X11/app-defaults/XOrgCfg -lib/X11/doc/BUILD -lib/X11/doc/BugReport -lib/X11/doc/DESIGN -lib/X11/doc/Install -lib/X11/doc/LICENSE -lib/X11/doc/OS2.Notes -lib/X11/doc/README -lib/X11/doc/README.DECtga -lib/X11/doc/README.Darwin -lib/X11/doc/README.I128 -lib/X11/doc/README.LynxOS -lib/X11/doc/README.NetBSD -lib/X11/doc/README.OpenBSD -lib/X11/doc/README.SCO -lib/X11/doc/README.SiS -lib/X11/doc/README.Solaris -lib/X11/doc/README.XKB-Config -lib/X11/doc/README.XKB-Enhancing -lib/X11/doc/README.apm -lib/X11/doc/README.ati -lib/X11/doc/README.chips -lib/X11/doc/README.cyrix -lib/X11/doc/README.dps -lib/X11/doc/README.fonts -lib/X11/doc/README.i740 -lib/X11/doc/README.i810 -lib/X11/doc/README.mouse -lib/X11/doc/README.newport -lib/X11/doc/README.r128 -lib/X11/doc/README.rapidaccess -lib/X11/doc/README.rendition -lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES -lib/X11/doc/Versions -lib/X11/doc/VideoBoard98 -lib/X11/etc/Xinstall.sh -lib/X11/etc/xmodmap.std -lib/X11/getconfig/cfg.sample -lib/X11/getconfig/xorg.cfg -lib/X11/xorg.conf.eg -lib/X11/xserver/SecurityPolicy -%%ALPHA_NA%%lib/modules/drivers/apm_drv.so -%%ALPHA_NA%%lib/modules/drivers/ark_drv.so -lib/modules/drivers/ati_drv.so -lib/modules/drivers/atimisc_drv.so -%%ALPHA_NA%%lib/modules/drivers/chips_drv.so -%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so -%%PPC_NA%%lib/modules/drivers/cirrus_drv.so -%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so -%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so -lib/modules/drivers/dummy_drv.so -lib/modules/drivers/glint_drv.so -%%ALPHA_NA%%lib/modules/drivers/i128_drv.so -%%I386%%lib/modules/drivers/i740_drv.so -%%SPARC64%%lib/modules/drivers/i740_drv.so -%%ALPHA_NA%%lib/modules/drivers/i810_drv.so -%%I386%%lib/modules/drivers/imstt_drv.so -%%SPARC64%%lib/modules/drivers/imstt_drv.so -lib/modules/drivers/mga_drv.so -%%ALPHA_NA%%lib/modules/drivers/neomagic_drv.so -%%I386%%lib/modules/drivers/newport_drv.so -%%SPARC64%%lib/modules/drivers/newport_drv.so -%%I386%%lib/modules/drivers/nsc_drv.so -lib/modules/drivers/nv_drv.so -lib/modules/drivers/r128_drv.so -lib/modules/drivers/radeon_drv.so -%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so -lib/modules/drivers/riva128.so -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so -%%IA64_NA%%lib/modules/drivers/s3virge_drv.so -%%IA64_NA%%lib/modules/drivers/savage_drv.so -%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so -%%AMD64_I386%%lib/modules/drivers/sis_drv.so -%%SPARC64%%lib/modules/drivers/sunbw2_drv.so -%%SPARC64%%lib/modules/drivers/suncg14_drv.so -%%SPARC64%%lib/modules/drivers/suncg3_drv.so -%%SPARC64%%lib/modules/drivers/suncg6_drv.so -%%SPARC64%%lib/modules/drivers/sunffb_drv.so -%%SPARC64%%lib/modules/drivers/sunleo_drv.so -%%SPARC64%%lib/modules/drivers/suntcx_drv.so -lib/modules/drivers/tdfx_drv.so -%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so -%%ALPHA_NA%%lib/modules/drivers/trident_drv.so -%%AMD64_I386%%lib/modules/drivers/tseng_drv.so -%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so -lib/modules/drivers/vga_drv.so -%%I386%%lib/modules/drivers/via_drv.so -%%ALPHA_NA%%lib/modules/drivers/vmware_drv.so -lib/modules/extensions/libGLcore.so -lib/modules/extensions/libdbe.so -lib/modules/extensions/libdri.so -lib/modules/extensions/libextmod.so -lib/modules/extensions/libglx.so -lib/modules/extensions/librecord.so -lib/modules/extensions/libxtrap.so -lib/modules/fonts/libbitmap.so -lib/modules/fonts/libfreetype.so -lib/modules/fonts/libtype1.so -lib/modules/freebsd/libdrm.so -lib/modules/input/acecad_drv.so -lib/modules/input/calcomp_drv.so -lib/modules/input/citron_drv.so -lib/modules/input/digitaledge_drv.so -lib/modules/input/dmc_drv.so -lib/modules/input/dynapro_drv.so -lib/modules/input/elographics_drv.so -lib/modules/input/fpit_drv.so -lib/modules/input/hyperpen_drv.so -lib/modules/input/js_x_drv.so -lib/modules/input/kbd_drv.so -lib/modules/input/keyboard_drv.so -lib/modules/input/magellan_drv.so -lib/modules/input/microtouch_drv.so -lib/modules/input/mouse_drv.so -lib/modules/input/mutouch_drv.so -lib/modules/input/palmax_drv.so -lib/modules/input/penmount_drv.so -lib/modules/input/spaceorb_drv.so -lib/modules/input/summa_drv.so -lib/modules/input/tek4957_drv.so -lib/modules/input/void_drv.so -lib/modules/input/wacom_drv.so -%%ALPHA_NA%%lib/modules/libafb.so -lib/modules/libcfb.so -lib/modules/libcfb16.so -%%SPARC64%%lib/modules/libcfb24.so -lib/modules/libcfb32.so -lib/modules/libddc.so -lib/modules/libexa.so -lib/modules/libfb.so -lib/modules/libi2c.so -lib/modules/libint10.so -lib/modules/liblayer.so -lib/modules/libmfb.so -lib/modules/libpcidata.so -lib/modules/librac.so -lib/modules/libramdac.so -lib/modules/libscanpci.so -lib/modules/libshadow.so -lib/modules/libshadowfb.so -lib/modules/libvbe.so -lib/modules/libvgahw.so -lib/modules/libxaa.so -lib/modules/libxf1bpp.so -lib/modules/libxf4bpp.so -lib/modules/libxf8_16bpp.so -lib/modules/libxf8_32bpp.so -%%SPARC64%%lib/modules/libxf8_32wid.so -lib/modules/multimedia/bt829_drv.so -lib/modules/multimedia/fi1236_drv.so -lib/modules/multimedia/msp3430_drv.so -lib/modules/multimedia/tda8425_drv.so -lib/modules/multimedia/tda9850_drv.so -lib/modules/multimedia/tda9885_drv.so -lib/modules/multimedia/theatre200_drv.so -lib/modules/multimedia/theatre_detect_drv.so -lib/modules/multimedia/theatre_drv.so -lib/modules/multimedia/uda1380_drv.so -%%PPC_NA%%lib/modules/v10002d.uc -%%PPC_NA%%lib/modules/v20002d.uc -@dirrm lib/modules/multimedia -@dirrm lib/modules/internal -@dirrm lib/modules/input -@dirrm lib/modules/freebsd -@dirrm lib/modules/fonts -@dirrm lib/modules/extensions -@dirrm lib/modules/drivers -@dirrm lib/X11/getconfig +lib/xorg/modules/extensions/libGLcore.la +lib/xorg/modules/extensions/libGLcore.so +lib/xorg/modules/extensions/libdbe.la +lib/xorg/modules/extensions/libdbe.so +lib/xorg/modules/extensions/libdri.la +lib/xorg/modules/extensions/libdri.so +lib/xorg/modules/extensions/libextmod.la +lib/xorg/modules/extensions/libextmod.so +lib/xorg/modules/extensions/libglx.la +lib/xorg/modules/extensions/libglx.so +lib/xorg/modules/extensions/librecord.la +lib/xorg/modules/extensions/librecord.so +lib/xorg/modules/extensions/libxtrap.la +lib/xorg/modules/extensions/libxtrap.so +lib/xorg/modules/fonts/libfreetype.la +lib/xorg/modules/fonts/libfreetype.so +lib/xorg/modules/fonts/libtype1.la +lib/xorg/modules/fonts/libtype1.so +%%ALPHA_NA%%lib/xorg/modules/libafb.la +%%ALPHA_NA%%lib/xorg/modules/libafb.so +lib/xorg/modules/libcfb.la +lib/xorg/modules/libcfb.so +lib/xorg/modules/libcfb32.la +lib/xorg/modules/libcfb32.so +lib/xorg/modules/libexa.la +lib/xorg/modules/libexa.so +lib/xorg/modules/libfb.la +lib/xorg/modules/libfb.so +lib/xorg/modules/libint10.la +lib/xorg/modules/libint10.so +lib/xorg/modules/libmfb.la +lib/xorg/modules/libmfb.so +lib/xorg/modules/libpcidata.la +lib/xorg/modules/libpcidata.so +lib/xorg/modules/libscanpci.la +lib/xorg/modules/libscanpci.so +lib/xorg/modules/libshadow.la +lib/xorg/modules/libshadow.so +lib/xorg/modules/libshadowfb.la +lib/xorg/modules/libshadowfb.so +lib/xorg/modules/libvbe.la +lib/xorg/modules/libvbe.so +lib/xorg/modules/libvgahw.la +lib/xorg/modules/libvgahw.so +lib/xorg/modules/libxaa.la +lib/xorg/modules/libxaa.so +lib/xorg/modules/libxf1bpp.la +lib/xorg/modules/libxf1bpp.so +lib/xorg/modules/libxf4bpp.la +lib/xorg/modules/libxf4bpp.so +lib/xorg/modules/libxf8_16bpp.la +lib/xorg/modules/libxf8_16bpp.so +lib/xorg/modules/libxf8_32bpp.la +lib/xorg/modules/libxf8_32bpp.so +lib/xorg/modules/linux/libfbdevhw.la +lib/xorg/modules/linux/libfbdevhw.so +lib/xorg/modules/multimedia/bt829_drv.la +lib/xorg/modules/multimedia/bt829_drv.so +lib/xorg/modules/multimedia/fi1236_drv.la +lib/xorg/modules/multimedia/fi1236_drv.so +lib/xorg/modules/multimedia/msp3430_drv.la +lib/xorg/modules/multimedia/msp3430_drv.so +lib/xorg/modules/multimedia/tda8425_drv.la +lib/xorg/modules/multimedia/tda8425_drv.so +lib/xorg/modules/multimedia/tda9850_drv.la +lib/xorg/modules/multimedia/tda9850_drv.so +lib/xorg/modules/multimedia/tda9885_drv.la +lib/xorg/modules/multimedia/tda9885_drv.so +lib/xorg/modules/multimedia/uda1380_drv.la +lib/xorg/modules/multimedia/uda1380_drv.so +lib/xserver/SecurityPolicy +libdata/pkgconfig/xorg-server.pc +share/X11/app-defaults/XOrgCfg +share/X11/xkb/compiled/README.compiled +share/aclocal/xorg-server.m4 +@dirrm include/xorg +@dirrm lib/xorg/modules/fonts +@dirrm lib/xorg/modules/extensions +@dirrm lib/xorg/modules/linux +@dirrm lib/xorg/modules/multimedia +@dirrm lib/xorg/modules +@dirrm lib/xorg +@dirrm lib/xserver +@dirrmtry include/X11/bitmaps @dirrmtry include/X11/pixmaps @dirrmtry lib/X11/doc @dirrmtry lib/X11/etc @dirrmtry lib/X11/xserver -@dirrmtry lib/modules +@dirrmtry lib/xorg/modules +@dirrmtry lib/xorg +@dirrmtry share/X11/app-defaults diff --git a/x11-servers/xorg-server-snap/scripts/configure b/x11-servers/xorg-server-snap/scripts/configure deleted file mode 100644 index e210b56ac0be..000000000000 --- a/x11-servers/xorg-server-snap/scripts/configure +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF -echo "#define JoystickSupport NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define XnestServer NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF -echo "#define XprtServer NO" >> $LOCALDEF -echo "#define LibInstall NO" >> $LOCALDEF -echo "#define ForceNormalLib NO" >> $LOCALDEF -echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildXprint NO" >> $LOCALDEF -echo "#define BuildLibraries NO" >> $LOCALDEF -echo "#define LibInstallBuild YES" >> $LOCALDEF -echo "#define ModInstall YES" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildGLXLibrary YES" >> $LOCALDEF -echo "#define BuildDevelDRIDrivers YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF -echo "#define DriverManDir \$(MANSOURCEPATH)4" >> $LOCALDEF -echo "#define DriverManSuffix 4x" >> $LOCALDEF -echo "#define MiscManDir \$(MANSOURCEPATH)7" >> $LOCALDEF -echo "#define MiscManSuffix 7x" >> $LOCALDEF - -if [ X$WITH_DEBUG != X ]; then - export CFLAGS="-g $CFLAGS" - echo "#define InstPgmFlags" >> $LOCALDEF - echo "#define MakeDllModules YES" >> $LOCALDEF -fi - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen diff --git a/x11-servers/xorg-server-snap/scripts/configure.gen b/x11-servers/xorg-server-snap/scripts/configure.gen deleted file mode 100644 index ee7e1d88add8..000000000000 --- a/x11-servers/xorg-server-snap/scripts/configure.gen +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script takes some of the system's imake configuration files and munges -# them to be used in the X.Org build, and allows port configuration located in -# $LOCALDEF to be included in the generated host.def - -SYSSITE=$PREFIX/lib/X11/config/xf86site.def -BUILDSITE=$WRKDIR/xc/config/cf/xorgsite.def -SYSHOST=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -BUILDHOST=$WRKDIR/xc/config/cf/host.def - -# Append system xf86site.def to build's xorgsite.def. -rm -f $BUILDSITE -cp -f $SYSSITE $BUILDSITE - -# Use system host.def as initial config file, setting ProjectRoot appropriately. -rm -f $BUILDHOST -grep -v '#define.*ProjectRoot' $SYSHOST >> $BUILDHOST -echo "#define ProjectRoot $PREFIX" >> $BUILDHOST - -# Add in defines that all ports will want. -echo "#define NothingOutsideProjectRoot YES" >> $BUILDHOST -echo "#define FreeBSDCC ${CC}" >> $BUILDHOST -echo "#define FreeBSDCXX ${CXX}" >> $BUILDHOST -echo "#define FreeBSDPTHREAD_LIBS ${PTHREAD_LIBS}" >> $BUILDHOST -echo "#define FreeBSDPTHREAD_CFLAGS ${PTHREAD_CFLAGS}" >> $BUILDHOST -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $BUILDHOST - -cat ${LOCALDEF} >> ${BUILDHOST} diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 4dab8f178c32..ed0461620aa5 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -6,96 +6,67 @@ # PORTNAME= xorg-server -PORTVERSION= 6.9.0 -PORTREVISION= 6 +PORTVERSION= 1.2.0 +PORTREVISION= 2 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src -DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ - X11R${PORTVERSION}-src3.tar.gz - -PATCHFILES= x11r6.9.0-dbe-render.diff -PATCH_SITES= ${MASTER_SITE_XORG} -PATCH_SITE_SUBDIR= X11R${PORTVERSION}/patches -PATCH_DIST_ARGS= -d ${PATCH_WRKSRC}/programs/Xserver --quiet +MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \ + ${MASTER_SITE_SOURCEFORGE:S/$/:mesa/} +MASTER_SITE_SUBDIR=mesa3d/:mesa +DISTFILES= xorg-server-${PORTVERSION}.tar.bz2:fdo \ + MesaLib-6.5.2.tar.bz2:mesa MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs -.if !defined(WITH_MODULAR) -USE_XLIB= yes -.else -LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ - ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - GL.1:${PORTSDIR}/x11/libGL -BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \ - ${LIB_PC_DEPENDS} -RUN_DEPENDS= ${LIB_PC_DEPENDS} -.endif +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +RUN_DEPENDS= ${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config CONFLICTS= XFree86-Server-* -SCRIPTS_ENV= WITH_DEBUG="${WITH_DEBUG}" +XORG_CAT= xserver + +USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ + xmu xt xpm xext randrproto renderproto fixesproto damageproto \ + xcmiscproto xextproto xproto xtrans xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto inputproto xf86dgaproto \ + videoproto compositeproto trapproto recordproto xineramaproto \ + evieproto xfont fontenc xkbui + +USE_PERL5_BUILD=yes +CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-6.5.2 \ + --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ + --localstatedir=/var + +.if !defined(WITHOUT_AIGLX) +CONFIGURE_ARGS+= --enable-aiglx=yes +.endif + +.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO +CONFIGURE_ARGS+=--enable-install-setuid +.endif + MAN1= Xorg.1 \ - getconfig.1 \ + Xserver.1 \ + cvt.1 \ gtf.1 \ - kbd_mode.1 \ pcitweak.1 \ xorgcfg.1 \ xorgconfig.1 -MAN4= citron.4x \ - dmc.4x \ - dynapro.4x \ - elographics.4x \ - fbdevhw.4x \ - fpit.4x \ - glint.4x \ - js_x.4x \ - kbd.4x \ - keyboard.4x \ - mga.4x \ - microtouch.4x \ - mouse.4x \ - mutouch.4x \ - palmax.4x \ - penmount.4x \ - r128.4x \ - radeon.4x \ - tdfx.4x \ - tek4957.4x \ - vga.4x \ - void.4x \ - wacom.4x -MAN5= getconfig.5 \ - xorg.conf.5 - -XBUILD_DIRS= lib/font programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver +MAN4= exa.4 \ + fbdevhw.4 +MAN5= xorg.conf.5 NOT_FOR_ARCHS= ia64 -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif - .if ${ARCH} == alpha PLIST_SUB+= ALPHA_NA="@comment " .else PLIST_SUB+= ALPHA_NA="" .endif -.if ${ARCH} == ia64 -PLIST_SUB+= IA64_NA="@comment " -.else -PLIST_SUB+= IA64_NA="" -.endif - .if ${ARCH} == powerpc PLIST_SUB+= PPC_NA="@comment " MAN4+= nv.4x @@ -106,53 +77,14 @@ PLIST_SUB+= PPC_NA="" .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64_NA="@comment " -MAN4+= sunbw2.4x \ - suncg14.4x \ - suncg3.4x \ - suncg6.4x \ - sunffb.4x \ - sunleo.4x \ - suntcx.4x .else PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" .endif -.if ${ARCH} != powerpc && ${ARCH} != sparc64 -MAN4+= cirrus.4x \ - nv.4x \ - rendition.4x \ - s3virge.4x \ - savage.4x \ - siliconmotion.4x -.endif - -.if ${ARCH} != powerpc && ${ARCH} != alpha -MAN4+= vesa.4x -.endif - -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -MAN1+= scanpci.1 -MAN4+= i740.4x \ - nsc.4x \ - via.4x -.else -PLIST_SUB+= I386="@comment " -.endif - .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= AMD64_I386="" -MAN4+= apm.4x \ - chips.4x \ - cyrix.4x \ - i128.4x \ - i810.4x \ - neomagic.4x \ - sis.4x \ - trident.4x \ - tseng.4x \ - vmware.4x +MAN1+= scanpci.1 .else PLIST_SUB+= AMD64_I386="@comment " .endif @@ -165,10 +97,6 @@ pre-everything:: @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" @${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf." - -SCRIPTS_ENV+= SUID_XSERVER=YES -.else -SCRIPTS_ENV+= SUID_XSERVER=NO .endif .include <bsd.port.post.mk> diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 104c50c4afbf..6b9286e9c814 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -16,7 +16,7 @@ DIST_SUBDIR?= xorg WRKSRC?= ${WRKDIR}/xc USE_X_PREFIX?= no PREFIX?= ${X11BASE} -MTREE_FILE= /etc/mtree/BSD.x11-4.dist +MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* USE_IMAKE= YES @@ -48,7 +48,6 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-mitri.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 8aa64eb535b0..428c09bca0cf 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,9 +1,6 @@ -MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150 -SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c -SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 -MD5 (xorg/x11r6.9.0-dbe-render.diff) = 992f91012c2e2f4c8abdbe8bcdf7b0c4 -SHA256 (xorg/x11r6.9.0-dbe-render.diff) = c41ed0c07151bd597bc6869e6de5b369d029d3bfcc9c9401e1e6a097356843a4 -SIZE (xorg/x11r6.9.0-dbe-render.diff) = 5158 +MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 +SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 +SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 +MD5 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = e4d894181f1859651658b3704633e10d +SHA256 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f +SIZE (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 3295166 diff --git a/x11-servers/xorg-server/files/patch-945GM.patch b/x11-servers/xorg-server/files/patch-945GM.patch deleted file mode 100644 index a0fd8f94dca1..000000000000 --- a/x11-servers/xorg-server/files/patch-945GM.patch +++ /dev/null @@ -1,335 +0,0 @@ -# -# Add support to Intel 945GM -# ---- programs/Xserver/hw/xfree86/drivers/i810/common.h.orig Mon Jul 17 11:41:34 2006 -+++ programs/Xserver/hw/xfree86/drivers/i810/common.h Mon Jul 17 11:43:00 2006 -@@ -322,6 +322,11 @@ - #define PCI_CHIP_I945_G_BRIDGE 0x2770 - #endif - -+#ifndef PCI_CHIP_I945_GM -+#define PCI_CHIP_I945_GM 0x27A2 -+#define PCI_CHIP_I945_GM_BRIDGE 0x27A0 -+#endif -+ - #define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 || \ - pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \ - pI810->PciInfo->chipType == PCI_CHIP_I810_E) -@@ -335,6 +340,7 @@ - #define IS_I915G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_G || pI810->PciInfo->chipType == PCI_CHIP_E7221_G) - #define IS_I915GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_GM) - #define IS_I945G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_G) -+#define IS_I945GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_GM) - - #define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810)) - ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Mon Jul 17 11:41:34 2006 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Mon Jul 17 11:44:09 2006 -@@ -136,6 +136,7 @@ - {PCI_CHIP_E7221_G, "E7221 (i915)"}, - {PCI_CHIP_I915_GM, "915GM"}, - {PCI_CHIP_I945_G, "945G"}, -+ {PCI_CHIP_I945_GM, "945GM"}, - {-1, NULL} - }; - -@@ -154,6 +155,7 @@ - {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA}, - {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA}, - {PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA}, -+ {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA}, - {-1, -1, RES_UNDEFINED } - }; - -@@ -569,6 +571,7 @@ - case PCI_CHIP_E7221_G: - case PCI_CHIP_I915_GM: - case PCI_CHIP_I945_G: -+ case PCI_CHIP_I945_GM: - xf86SetEntitySharable(usedChips[i]); - - /* Allocate an entity private if necessary */ ---- programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c.orig Mon Jul 17 11:41:34 2006 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c Mon Jul 17 11:46:20 2006 -@@ -86,7 +86,7 @@ - - DPRINTF(PFX, "I830InitHWCursor\n"); - /* Initialise the HW cursor registers, leaving the cursor hidden. */ -- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) { -+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - temp = INREG(CURSOR_A_CONTROL); - temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE | MCURSOR_MEM_TYPE_LOCAL | - MCURSOR_PIPE_SELECT); -@@ -308,7 +308,7 @@ - } - - /* have to upload the base for the new position */ -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - if (pI830->CursorIsARGB) - OUTREG(CURSOR_A_BASE, pI830->CursorMemARGB->Physical); - else -@@ -339,7 +339,7 @@ - pI830->CursorMemARGB->Physical, pI830->CursorMemARGB->Start); - - pI830->cursorOn = TRUE; -- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) { -+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - temp = INREG(CURSOR_A_CONTROL); - temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT); - if (pI830->CursorIsARGB) -@@ -387,7 +387,7 @@ - DPRINTF(PFX, "I830HideCursor\n"); - - pI830->cursorOn = FALSE; -- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) { -+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - temp = INREG(CURSOR_A_CONTROL); - temp &= ~CURSOR_MODE; - temp |= CURSOR_MODE_DISABLE; ---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c.orig Mon Jul 17 11:41:34 2006 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c Mon Jul 17 11:49:23 2006 -@@ -196,6 +196,7 @@ - {PCI_CHIP_E7221_G, "E7221 (i915)"}, - {PCI_CHIP_I915_GM, "915GM"}, - {PCI_CHIP_I945_G, "945G"}, -+ {PCI_CHIP_I945_GM, "945GM"}, - {-1, NULL} - }; - -@@ -208,6 +209,7 @@ - {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA}, - {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA}, - {PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA}, -+ {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA}, - {-1, -1, RES_UNDEFINED} - }; - -@@ -1323,7 +1325,7 @@ - * The GTT varying according the the FbMapSize and the popup is 4KB */ - range = (pI830->FbMapSize / (1024*1024)) + 4; - -- if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - switch (gmch_ctrl & I830_GMCH_GMS_MASK) { - case I855_GMCH_GMS_STOLEN_1M: - memsize = MB(1) - KB(range); -@@ -1341,11 +1343,11 @@ - memsize = MB(32) - KB(range); - break; - case I915G_GMCH_GMS_STOLEN_48M: -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - memsize = MB(48) - KB(range); - break; - case I915G_GMCH_GMS_STOLEN_64M: -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - memsize = MB(64) - KB(range); - break; - } -@@ -2090,6 +2092,9 @@ - case PCI_CHIP_I945_G: - chipname = "945G"; - break; -+ case PCI_CHIP_I945_GM: -+ chipname = "945GM"; -+ break; - default: - chipname = "unknown chipset"; - break; -@@ -2127,7 +2132,7 @@ - pI830->LinearAddr = pI830->pEnt->device->MemBase; - from = X_CONFIG; - } else { -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - pI830->LinearAddr = pI830->PciInfo->memBase[2] & 0xF0000000; - from = X_PROBED; - } else if (pI830->PciInfo->memBase[1] != 0) { -@@ -2149,7 +2154,7 @@ - pI830->MMIOAddr = pI830->pEnt->device->IOBase; - from = X_CONFIG; - } else { -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - pI830->MMIOAddr = pI830->PciInfo->memBase[0] & 0xFFF80000; - from = X_PROBED; - } else if (pI830->PciInfo->memBase[1]) { -@@ -2194,7 +2199,7 @@ - pI830->FbMapSize = 0x4000000; /* 64MB - has this been tested ?? */ - } - } else { -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - if (pI830->PciInfo->memBase[2] & 0x08000000) - pI830->FbMapSize = 0x8000000; /* 128MB aperture */ - else -@@ -2227,7 +2232,7 @@ - if (pI830->PciInfo->chipType == PCI_CHIP_E7221_G) - pI830->availablePipes = 1; - else -- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) -+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - pI830->availablePipes = 2; - else - pI830->availablePipes = 1; -@@ -2872,7 +2877,7 @@ - } - - /* Check if the HW cursor needs physical address. */ -- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) -+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - pI830->CursorNeedsPhysical = TRUE; - else - pI830->CursorNeedsPhysical = FALSE; ---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c.orig Mon Jul 17 11:41:34 2006 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c Mon Jul 17 11:51:02 2006 -@@ -1239,7 +1239,7 @@ - - i830Reg->Fence[nr] = 0; - -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - fence_mask = ~I915G_FENCE_START_MASK; - else - fence_mask = ~I830_FENCE_START_MASK; -@@ -1247,7 +1247,7 @@ - if (start & fence_mask) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, - "SetFence: %d: start (0x%08x) is not %s aligned\n", -- nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) ? "1MB" : "512k"); -+ nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) ? "1MB" : "512k"); - return; - } - -@@ -1267,7 +1267,7 @@ - - val = (start | FENCE_X_MAJOR | FENCE_VALID); - -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - switch (size) { - case MB(1): - val |= I915G_FENCE_SIZE_1M; -@@ -1328,7 +1328,7 @@ - } - } - -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - fence_pitch = pitch / 512; - else - fence_pitch = pitch / 128; ---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig Mon Jul 17 11:41:34 2006 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c Mon Jul 17 11:52:36 2006 -@@ -617,7 +617,7 @@ - adapt->nAttributes = NUM_ATTRIBUTES; - if (pI830->Clone) - adapt->nAttributes += CLONE_ATTRIBUTES; -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) - adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */ - adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes); - /* Now copy the attributes */ -@@ -628,7 +628,7 @@ - memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES); - att+=CLONE_ATTRIBUTES; - } -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES); - att+=GAMMA_ATTRIBUTES; - } -@@ -688,7 +688,7 @@ - if (pI830->Clone) - xvPipe = MAKE_ATOM("XV_PIPE"); - -- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) { -+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) { - xvGamma0 = MAKE_ATOM("XV_GAMMA0"); - xvGamma1 = MAKE_ATOM("XV_GAMMA1"); - xvGamma2 = MAKE_ATOM("XV_GAMMA2"); -@@ -806,7 +806,7 @@ - overlay->OCONFIG |= OVERLAY_PIPE_B; - if (pPriv->overlayOK) - OVERLAY_UPDATE; -- } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - /* Avoid video anomalies, so set gamma registers when overlay is off */ - /* We also clamp the values if they are outside the ranges */ - if (!*pI830->overlayOn) { -@@ -815,35 +815,35 @@ - pPriv->gamma1 = pPriv->gamma0 + 0x7d; - } else - return BadRequest; -- } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - if (!*pI830->overlayOn) { - pPriv->gamma1 = value; - if (pPriv->gamma1 - pPriv->gamma0 > 0x7d) - pPriv->gamma0 = pPriv->gamma1 - 0x7d; - } else - return BadRequest; -- } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - if (!*pI830->overlayOn) { - pPriv->gamma2 = value; - if (pPriv->gamma3 - pPriv->gamma2 > 0x7d) - pPriv->gamma3 = pPriv->gamma2 + 0x7d; - } else - return BadRequest; -- } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - if (!*pI830->overlayOn) { - pPriv->gamma3 = value; - if (pPriv->gamma3 - pPriv->gamma2 > 0x7d) - pPriv->gamma2 = pPriv->gamma3 - 0x7d; - } else - return BadRequest; -- } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - if (!*pI830->overlayOn) { - pPriv->gamma4 = value; - if (pPriv->gamma5 - pPriv->gamma4 > 0x7d) - pPriv->gamma5 = pPriv->gamma4 + 0x7d; - } else - return BadRequest; -- } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - if (!*pI830->overlayOn) { - pPriv->gamma5 = value; - if (pPriv->gamma5 - pPriv->gamma4 > 0x7d) -@@ -875,7 +875,7 @@ - attribute == xvGamma2 || - attribute == xvGamma3 || - attribute == xvGamma4 || -- attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - I830UpdateGamma(pScrn); - } - -@@ -895,17 +895,17 @@ - *value = pPriv->contrast; - } else if (pI830->Clone && attribute == xvPipe) { - *value = pPriv->pipe; -- } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - *value = pPriv->gamma0; -- } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - *value = pPriv->gamma1; -- } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - *value = pPriv->gamma2; -- } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - *value = pPriv->gamma3; -- } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - *value = pPriv->gamma4; -- } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) { -+ } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) { - *value = pPriv->gamma5; - } else if (attribute == xvColorKey) { - *value = pPriv->colorKey; diff --git a/x11-servers/xorg-server/files/patch-CVE-2006-0745 b/x11-servers/xorg-server/files/patch-CVE-2006-0745 deleted file mode 100644 index afb7d4de763d..000000000000 --- a/x11-servers/xorg-server/files/patch-CVE-2006-0745 +++ /dev/null @@ -1,20 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2006-03-17 23:30:10.000000000 +0200 -+++ programs/Xserver/hw/xfree86/common/xf86Init.c 2006-03-17 23:29:35.000000000 +0200 -@@ -1376,7 +1376,7 @@ - } - - /* First the options that are only allowed for root */ -- if (getuid() == 0 || geteuid != 0) -+ if (getuid() == 0 || geteuid() != 0) - { - if (!strcmp(argv[i], "-modulepath")) - { -@@ -1679,7 +1679,7 @@ - } - if (!strcmp(argv[i], "-configure")) - { -- if (getuid() != 0 && geteuid == 0) { -+ if (getuid() != 0 && geteuid() == 0) { - ErrorF("The '-configure' option can only be used by root.\n"); - exit(1); - } diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf deleted file mode 100644 index 9a208d778fa3..000000000000 --- a/x11-servers/xorg-server/files/patch-FreeBSD.cf +++ /dev/null @@ -1,93 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Sun Aug 15 10:03:36 2004 -+++ config/cf/FreeBSD.cf Sun Feb 6 03:56:59 2005 -@@ -78,6 +78,7 @@ - #define HasIssetugid YES - #define HasPoll YES - #endif -+#define BuildHtmlManPages NO - - #if OSMajorVersion >= 4 - #define HasGetIfAddrs YES -@@ -116,15 +117,14 @@ - # endif - # if (OSRelVersion < 500043) - # define NeedUIThrStubs YES --# endif --# if (OSRelVersion >= 502102) --# define ThreadsLibraries -lpthread --# elif (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r -+# define BuildThreadStubLibrary YES -+# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) -+# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) - # else --# define ThreadsLibraries -pthread -+# define BuildThreadStubLibrary NO - # endif --# define SystemMTDefines -D_THREAD_SAFE -+# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - #endif - - /* This fixes linking C programs against libGLU on FreeBSD 3.x */ -@@ -172,12 +172,14 @@ - #endif - #endif - --#ifndef CcCmd --#define CcCmd cc --#endif --#ifndef CplusplusCmd --#define CplusplusCmd c++ -+#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) -+#define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+#define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX -+#else -+#define CcCmd FreeBSDCC -+#define CplusplusCmd FreeBSDCXX - #endif -+ - #define CppCmd /usr/bin/cpp - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional -@@ -338,7 +340,7 @@ - #ifndef LibraryRpathLoadFlags - # if UseRpath - # if UseElfFormat --# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) -+# define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH) - # else - # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) - # endif -@@ -442,7 +444,9 @@ - #define AsVISOption -Av9a - #define AsOutputArchSize 64 - #endif -- -+#ifdef PpcArchitecture -+#define XF86INT10_BUILD X86INT10_STUB -+#endif - #define StandardDefines -DCSRG_BASED - - #if OSMajorVersion > 1 -@@ -463,18 +467,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11-servers/xorg-server/files/patch-Imake.rules b/x11-servers/xorg-server/files/patch-Imake.rules deleted file mode 100644 index deea1cb886a6..000000000000 --- a/x11-servers/xorg-server/files/patch-Imake.rules +++ /dev/null @@ -1,67 +0,0 @@ ---- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002 -+++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003 -@@ -1406,7 +1406,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef RmanDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanDependency() /**/ - #else - #define RmanDependency() @@\ -@@ -1421,7 +1421,7 @@ - #endif /* RmanDependency */ - - #ifndef RmanCmdDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanCmdDependency /**/ - #else - #define RmanCmdDependency ProgramTargetName($(RMAN)) -@@ -1874,7 +1874,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef DependDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define DependDependency() /**/ - #else - #define DependDependency() @@\ -@@ -1969,7 +1969,7 @@ - * within the source tree. - */ - #ifndef ImakeDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define ImakeDependency(target) /**/ - #else - #define ImakeDependency(target) @@\ -@@ -2066,11 +2066,18 @@ - * ProjectUnsharedLibReferences - variables for unshared libraries - */ - #ifndef ProjectUnsharedLibReferences -+#if defined(UseInstalledLibraries) -+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ -+Concat3(DEP,varname,LIB) = @@\ -+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -+LintLibReferences(varname,libname,libsource) -+#else - #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ - Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ - Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ - LintLibReferences(varname,libname,libsource) - #endif -+#endif - - /* - * ProjectUnsharedFontLibReferences - unshared font libraries -@@ -3126,6 +3133,9 @@ - - #ifdef UseInstalled - #define ImakeSubCmdHelper $(IMAKE_CMD) -+#elif defined(UseInstalledPrograms) -+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11-servers/xorg-server/files/patch-Imake.tmpl b/x11-servers/xorg-server/files/patch-Imake.tmpl deleted file mode 100644 index 526e2e5de8a8..000000000000 --- a/x11-servers/xorg-server/files/patch-Imake.tmpl +++ /dev/null @@ -1,75 +0,0 @@ ---- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002 -+++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003 -@@ -237,7 +237,8 @@ - - #ifndef RmanCmd - #if BuildRman --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RmanCmd rman - #else - #define RmanCmd $(TOP)/config/util/rman -@@ -1348,7 +1349,8 @@ - #define LoaderLibPrefix /**/ - #endif - #ifndef ImakeCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define ImakeCmd imake - #else - #define ImakeCmd $(IMAKESRC)/imake -@@ -1359,19 +1361,22 @@ - #endif - #ifndef DependCmd - #if UseGccMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd gccmakedep - #else - #define DependCmd $(DEPENDSRC)/gccmakedep - #endif - #elif UseCCMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd ccmakedep - #else - #define DependCmd $(DEPENDSRC)/ccmakedep - #endif - #else --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd makedepend - #else - #define DependCmd $(DEPENDSRC)/makedepend -@@ -1398,21 +1403,23 @@ - #ifndef ExportListCmd - # ifndef ExportListGenSource - # define ExportListCmd /**/ --# elif !defined(UseInstalled) -+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define ExportListCmd $(CONFIGSRC)/util/exportlistgen - # else - # define ExportListCmd exportlistgen - # endif - #endif - #ifndef MkdirHierCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define MkdirHierCmd mkdirhier - #else - #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh - #endif - #endif - #ifndef RevPathCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RevPathCmd revpath - #else - #define RevPathCmd $(CONFIGSRC)/util/revpath diff --git a/x11-servers/xorg-server/files/patch-Library.tmpl b/x11-servers/xorg-server/files/patch-Library.tmpl deleted file mode 100644 index e94aae3bfc60..000000000000 --- a/x11-servers/xorg-server/files/patch-Library.tmpl +++ /dev/null @@ -1,21 +0,0 @@ ---- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 -+++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 -@@ -389,7 +389,7 @@ - */ - - #ifndef MakeStringsDependency --# ifndef UseInstalled -+# if !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define MakeStringsDependency @@\ - MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ - NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -399,7 +399,8 @@ - @@\ - includes:: HostProgramTargetName($(MAKESTRS)) - # else --# define MakeStringsDependency /**/ -+# define MakeStringsDependency @@\ -+MAKESTRS = makestrs - # endif - #endif - diff --git a/x11-servers/xorg-server/files/patch-X11.rules b/x11-servers/xorg-server/files/patch-X11.rules deleted file mode 100644 index 052e960127fc..000000000000 --- a/x11-servers/xorg-server/files/patch-X11.rules +++ /dev/null @@ -1,17 +0,0 @@ ---- config/cf/X11.rules.orig Sun May 30 12:49:38 2004 -+++ config/cf/X11.rules Sun May 30 12:50:02 2004 -@@ -23,6 +23,14 @@ - # define UseInstalledX11 YES - #endif - -+#ifndef UseInstalledPrograms -+# define UseInstalledPrograms NO -+#endif -+ -+#ifndef UseInstalledClients -+# define UseInstalledClients NO -+#endif -+ - #ifndef ImportX11 - # ifdef UseImports - # define ImportX11 YES diff --git a/x11-servers/xorg-server/files/patch-X11.tmpl b/x11-servers/xorg-server/files/patch-X11.tmpl deleted file mode 100644 index c27d14d8e1ec..000000000000 --- a/x11-servers/xorg-server/files/patch-X11.tmpl +++ /dev/null @@ -1,79 +0,0 @@ ---- X11.tmpl.orig Fri Sep 3 09:18:18 2004 -+++ config/cf/X11.tmpl Wed Dec 29 13:42:37 2004 -@@ -616,7 +616,7 @@ - #define BuildXft1Library BuildRenderLibrary - #endif - #ifndef UseFontconfig --#define UseFontconfig BuildXftLibrary -+#define UseFontconfig (BuildXftLibrary || BuildXft1Library) - #endif - #ifndef BuildFontconfigLibrary - #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -773,6 +773,9 @@ - #ifndef ThreadedProject - #define ThreadedProject ThreadedX - #endif -+#ifndef BuildThreadStubLibrary -+#define BuildThreadStubLibrary NO -+#endif - #ifndef NeedUIThrStubs - #define NeedUIThrStubs NO - #endif -@@ -1606,7 +1609,7 @@ - #endif - - #ifndef PsWrap --# ifndef UseInstalled -+# if !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define PsWrap $(PSWRAPSRC)/pswrap - # else - # define PsWrap pswrap -@@ -1683,7 +1686,7 @@ - - INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ - --#if UseInstalledX11 -+#if UseInstalledX11 || UseInstalledClients - RGB = $(XBINDIR)/rgb - FONTC = $(XBINDIR)/bdftopcf - MKFONTSCALE = $(XBINDIR)/mkfontscale -@@ -1843,6 +1846,39 @@ - DEPXLIBONLY = $(DEPXONLYLIB) - XLIBONLY = $(XONLYLIB) - LINTXONLYLIB = $(LINTXONLY) -+ -+#if BuildThreadStubLibrary -+#ifndef SharedLibXThrStub -+#define SharedLibXThrStub YES -+#endif -+#ifndef NormalLibXThrStub -+#define NormalLibXThrStub NO -+#endif -+#ifndef DebugLibXThrStub -+#define DebugLibXThrStub NO -+#endif -+#ifndef ProfileLibXThrStub -+#define ProfileLibXThrStub NO -+#endif -+ XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub -+#if SharedLibXThrStub -+#ifndef SharedXThrStubRev -+#define SharedXThrStubRev 6.1 -+#endif -+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev) -+#else -+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) -+#endif -+#else -+#undef SharedLibXThrStub -+#define SharedLibXThrStub NO -+#undef NormalLibXThrStub -+#define NormalLibXThrStub NO -+#undef DebugLibXThrStub -+#define DebugLibXThrStub NO -+#undef ProfileLibXThrStub -+#define ProfileLibXThrStub NO -+#endif - - #if BuildScreenSaverLibrary - #ifndef SharedLibXss diff --git a/x11-servers/xorg-server/files/patch-Xext_xcmisc.c b/x11-servers/xorg-server/files/patch-Xext_xcmisc.c new file mode 100644 index 000000000000..c3637ac038d2 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xext_xcmisc.c @@ -0,0 +1,38 @@ +diff --git Xext/xcmisc.c Xext/xcmisc.c +index f26218e..8c7a86e 100644 +--- Xext/xcmisc.c ++++ Xext/xcmisc.c +@@ -42,6 +42,12 @@ #include "swaprep.h" + #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); + } + diff --git a/x11-servers/xorg-server/files/patch-Xserver-Imakefile b/x11-servers/xorg-server/files/patch-Xserver-Imakefile deleted file mode 100644 index 5dab87bd4828..000000000000 --- a/x11-servers/xorg-server/files/patch-Xserver-Imakefile +++ /dev/null @@ -1,8 +0,0 @@ ---- programs/Xserver/Imakefile.orig Sat May 29 14:12:45 2004 -+++ programs/Xserver/Imakefile Sat May 29 14:12:16 2004 -@@ -1095,5 +1095,3 @@ - - DEFAULTFONTPATH = DefaultFontPath - EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" -- --InstallManPage(Xserver,$(MANDIR)) diff --git a/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c index 6a9380e4526a..5894dbb727bc 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c +++ b/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c @@ -1,7 +1,7 @@ Index: programs/Xserver/Xext/xvmc.c diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c ---- programs/Xserver/Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005 -+++ programs/Xserver/Xext/xvmc.c Thu Jan 26 14:22:20 2006 +--- Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005 ++++ Xext/xvmc.c Thu Jan 26 14:22:20 2006 @@ -24,8 +24,8 @@ #ifdef HAS_XVMCSHM diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c index 129b262f1365..59aad379ae11 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c +++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c @@ -1,18 +1,11 @@ -Index: programs/Xserver/hw/xfree86/common/xf86Config.c -diff -u -p programs/Xserver/hw/xfree86/common/xf86Config.c.orig programs/Xserver/hw/xfree86/common/xf86Config.c ---- programs/Xserver/hw/xfree86/common/xf86Config.c.orig Wed Dec 21 07:30:50 2005 -+++ programs/Xserver/hw/xfree86/common/xf86Config.c Thu Jan 26 15:10:39 2006 -@@ -505,8 +505,12 @@ GenerateDriverlist(char * dirname, char - { - #ifdef XFree86LOADER - char **ret; -- char *subdirs[] = { dirname, NULL }; -+ char *subdirs[2]; - static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL}; -+ -+ subdirs[0] = dirname; -+ subdirs[1] = NULL; -+ - ret = LoaderListDirs(subdirs, patlist); - - /* fix up the probe order for video drivers */ +--- hw/xfree86/common/xf86Config.c.orig Fri Jun 23 12:32:32 2006 ++++ hw/xfree86/common/xf86Config.c Fri Jun 23 12:32:46 2006 +@@ -1042,7 +1042,7 @@ + else + xf86Info.estimateSizesAggressively = 0; + +- xf86Info.aiglx = TRUE; ++ xf86Info.aiglx = FALSE; + xf86Info.aiglxFrom = X_DEFAULT; + if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) { + xf86Info.aiglx = value; diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c index 8fc64d32fb67..933742b00170 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c +++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c @@ -1,7 +1,7 @@ Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c ---- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005 -+++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006 +--- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005 ++++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006 @@ -35,6 +35,7 @@ #include "xf86Priv.h" diff --git a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c index d8f304d153f3..e9fb876333cc 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c +++ b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c @@ -1,7 +1,6 @@ -Index: programs/Xserver/os/xprintf.c diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c ---- programs/Xserver/os/xprintf.c.orig Sun Jul 3 17:53:52 2005 -+++ programs/Xserver/os/xprintf.c Thu Jan 26 12:47:37 2006 +--- os/xprintf.c.orig Sun Jul 3 17:53:52 2005 ++++ os/xprintf.c Thu Jan 26 12:47:37 2006 @@ -39,7 +39,7 @@ # ifdef __va_copy # define va_copy __va_copy diff --git a/x11-servers/xorg-server/files/patch-at_scancode.c b/x11-servers/xorg-server/files/patch-at_scancode.c new file mode 100644 index 000000000000..68ffceb41e86 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-at_scancode.c @@ -0,0 +1,31 @@ +--- hw/xfree86/os-support/shared/at_scancode.c.orig Sun Jul 3 09:01:35 2005 ++++ hw/xfree86/os-support/shared/at_scancode.c Sat Oct 7 21:27:29 2006 +@@ -84,6 +84,10 @@ + case KEY_Prefix0: + pKbd->scanPrefix = 0; + switch (*scanCode) { ++ case 0x1e: *scanCode = KEY_AudioRaise;break; ++ case 0x1f: *scanCode = KEY_AudioLower;break; ++ case 0x20: *scanCode = KEY_Power; break; ++ case 0x25: *scanCode = KEY_Mute; break; + case KEY_KP_7: *scanCode = KEY_Home; break; /* curs home */ + case KEY_KP_8: *scanCode = KEY_Up; break; /* curs up */ + case KEY_KP_9: *scanCode = KEY_PgUp; break; /* curs pgup */ +@@ -104,6 +108,17 @@ + case 0x5b: *scanCode = KEY_LMeta; break; + case 0x5c: *scanCode = KEY_RMeta; break; + case 0x5d: *scanCode = KEY_Menu; break; ++ case 0x5e: *scanCode = KEY_L1; break; /* stop */ ++ case 0x5f: *scanCode = KEY_L2; break; /* again */ ++ case 0x60: *scanCode = KEY_L3; break; /* props */ ++ case 0x61: *scanCode = KEY_L4; break; /* undo */ ++ case 0x62: *scanCode = KEY_L5; break; /* front */ ++ case 0x63: *scanCode = KEY_L6; break; /* copy */ ++ case 0x64: *scanCode = KEY_L7; break; /* open */ ++ case 0x65: *scanCode = KEY_L8; break; /* paste */ ++ case 0x66: *scanCode = KEY_L9; break; /* find */ ++ case 0x67: *scanCode = KEY_L10; break; /* cut */ ++ case 0x68: *scanCode = KEY_Help; break; + case KEY_F3: *scanCode = KEY_F13; break; + case KEY_F4: *scanCode = KEY_F14; break; + case KEY_F5: *scanCode = KEY_F15; break; diff --git a/x11-servers/xorg-server/files/patch-bsdResource.c b/x11-servers/xorg-server/files/patch-bsdResource.c index e031b2681f53..44388bb0a393 100644 --- a/x11-servers/xorg-server/files/patch-bsdResource.c +++ b/x11-servers/xorg-server/files/patch-bsdResource.c @@ -1,5 +1,5 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 +--- hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 ++++ hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 @@ -18,7 +18,7 @@ #ifdef INCLUDE_XF86_NO_DOMAIN diff --git a/x11-servers/xorg-server/files/patch-bsd_kbd.c b/x11-servers/xorg-server/files/patch-bsd_kbd.c new file mode 100644 index 000000000000..a7d8cb3fdd48 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-bsd_kbd.c @@ -0,0 +1,32 @@ +--- hw/xfree86/os-support/bsd/bsd_kbd.c.orig Mon Oct 3 18:46:14 2005 ++++ hw/xfree86/os-support/bsd/bsd_kbd.c Fri Sep 29 23:26:17 2006 +@@ -75,6 +75,17 @@ + KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; + int real_leds = 0; + ++#if defined (SYSCONS_SUPPORT) ++ if (pKbd->sunKbd) { ++ if (leds & 0x08) real_leds |= XLED1; ++ if (leds & 0x04) real_leds |= XLED4; ++ if (leds & 0x02) real_leds |= XLED3; ++ if (leds & 0x01) real_leds |= XLED2; ++ leds = real_leds; ++ real_leds = 0; ++ } ++#endif ++ + #ifdef LED_CAP + if (leds & XLED1) real_leds |= LED_CAP; + #endif +@@ -83,7 +94,11 @@ + #endif + #ifdef LED_SCR + if (leds & XLED3) real_leds |= LED_SCR; ++#ifdef LED_COMP ++ if (leds & XLED4) real_leds |= LED_COMP; ++#else + if (leds & XLED4) real_leds |= LED_SCR; ++#endif + #endif + + switch (pKbd->consType) { diff --git a/x11-servers/xorg-server/files/patch-damageext-damageext.c b/x11-servers/xorg-server/files/patch-damageext-damageext.c new file mode 100644 index 000000000000..c732aed5e234 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-damageext-damageext.c @@ -0,0 +1,50 @@ +commit 8274ea6aa97b06a56b7468c3908894c0ff72b687 +Author: Eric Anholt <eric@anholt.net> +Date: Thu Feb 1 12:15:54 2007 -0800 + + Set the Damage version supported in the server, instead of using damageproto. + + This was caught by distributions upgrading damageproto to 1.1, before the + server they had supported it. The server then advertised the new version + without supporting the protocol. + +diff --git a/damageext/damageext.c b/damageext/damageext.c +index ae1091e..739d20f 100755 +--- damageext/damageext.c ++++ damageext/damageext.c +@@ -35,6 +35,13 @@ int DamageClientPrivateIndex; + RESTYPE DamageExtType; + RESTYPE DamageExtWinType; + ++/* Version of the damage extension supported by the server, as opposed to the ++ * DAMAGE_* defines from damageproto for what version the proto header ++ * supports. ++ */ ++#define SERVER_DAMAGE_MAJOR 1 ++#define SERVER_DAMAGE_MINOR 0 ++ + #define prScreen screenInfo.screens[0] + + static void +@@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client) + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +- if (stuff->majorVersion < DAMAGE_MAJOR) { ++ if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) { + rep.majorVersion = stuff->majorVersion; + rep.minorVersion = stuff->minorVersion; + } else { +- rep.majorVersion = DAMAGE_MAJOR; +- if (stuff->majorVersion == DAMAGE_MAJOR && +- stuff->minorVersion < DAMAGE_MINOR) ++ rep.majorVersion = SERVER_DAMAGE_MAJOR; ++ if (stuff->majorVersion == SERVER_DAMAGE_MAJOR && ++ stuff->minorVersion < SERVER_DAMAGE_MINOR) + rep.minorVersion = stuff->minorVersion; + else +- rep.minorVersion = DAMAGE_MINOR; ++ rep.minorVersion = SERVER_DAMAGE_MINOR; + } + pDamageClient->major_version = rep.majorVersion; + pDamageClient->minor_version = rep.minorVersion; diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c deleted file mode 100644 index 68e18f831ec7..000000000000 --- a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c +++ /dev/null @@ -1,231 +0,0 @@ ---- lib/font/FreeType/ftfuncs.c.orig 2005-10-23 19:32:05.000000000 +0100 -+++ lib/font/FreeType/ftfuncs.c 2006-06-01 23:21:34.000000000 +0100 -@@ -54,10 +54,7 @@ - #include FT_TYPE1_TABLES_H - #include FT_XFREE86_H - #include FT_BBOX_H --#include FT_INTERNAL_TRUETYPE_TYPES_H - #include FT_TRUETYPE_TAGS_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_STREAM_H - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. -@@ -123,6 +120,46 @@ - }; - - -+/* read 2-byte value from a SFNT table */ -+static FT_UShort -+sfnt_get_ushort( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[2]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) ); -+ result = (FT_UShort)( (buff[0] << 8) | buff[1] ); -+ -+ return result; -+} -+ -+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o))) -+ -+ -+#if 0 -+static FT_ULong -+sfnt_get_ulong( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[4]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ); -+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) | -+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3]; -+ -+ return result; -+} -+#endif -+ -+ -+ -+ - static int ftypeInitP = 0; /* is the engine initialised? */ - FT_Library ftypeLibrary; - -@@ -211,6 +248,10 @@ - if(maxp && maxp->maxContours == 0) - face->bitmap = 1; - } -+ -+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face, -+ TTAG_hhea, 34 ); -+ - /* Insert face in hashtable and return it */ - face->next = faceTable[bucket]; - faceTable[bucket] = face; -@@ -462,6 +503,29 @@ - } - - if( FT_IS_SFNT( face->face ) ) { -+#if 1 -+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y; -+ FT_UInt nn; -+ -+ instance->strike_index=0xFFFFU; -+ -+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5); -+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5); -+ -+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64; -+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64; -+ -+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ ) -+ { -+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn]; -+ -+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem ) -+ { -+ instance->strike_index = nn; -+ break; -+ } -+ } -+#else - /* See Set_Char_Sizes() in ttdriver.c */ - FT_Error err; - TT_Face tt_face; -@@ -486,6 +550,7 @@ - sfnt = (SFNT_Service)tt_face->sfnt; - err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index); - if ( err ) instance->strike_index=0xFFFFU; -+#endif - } - - /* maintain a linked list of instances */ -@@ -803,31 +868,36 @@ - * parse the htmx field in TrueType font. - */ - --/* from src/truetype/ttgload.c */ - static void --tt_get_metrics( TT_HoriHeader* header, -+tt_get_metrics( FT_Face face, - FT_UInt idx, -+ FT_UInt num_hmetrics, - FT_Short* bearing, - FT_UShort* advance ) --/* Copyright 1996-2001, 2002 by */ --/* David Turner, Robert Wilhelm, and Werner Lemberg. */ - { -- TT_LongMetrics longs_m; -- FT_UShort k = header->number_Of_HMetrics; -+ /* read the metrics directly from the horizontal header, we -+ * parse the SFNT table directly through the standard FreeType API. -+ * this works with any version of the library and doesn't need to -+ * peek at its internals. Maybe a bit less -+ */ -+ FT_UInt count = num_hmetrics; - -- if ( k == 0 ) { -- *bearing = *advance = 0; -- return; -+ if ( count == 0 ) -+ { -+ *advance = 0; -+ *bearing = 0; - } -+ else if ( idx < count ) -+ { -+ FT_ULong offset = idx*4; - -- if ( idx < (FT_UInt)k ) { -- longs_m = (TT_LongMetrics )header->long_metrics + idx; -- *bearing = longs_m->bearing; -- *advance = longs_m->advance; -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 ); - } -- else { -- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k]; -- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance; -+ else -+ { -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 ); - } - } - -@@ -835,6 +905,7 @@ - ft_get_very_lazy_bbox( FT_UInt index, - FT_Face face, - FT_Size size, -+ FT_UInt num_hmetrics, - double slant, - FT_Matrix *matrix, - FT_BBox *bbox, -@@ -842,14 +913,13 @@ - FT_Long *vertAdvance) - { - if ( FT_IS_SFNT( face ) ) { -- TT_Face ttface = (TT_Face)face; - FT_Size_Metrics *smetrics = &size->metrics; - FT_Short leftBearing = 0; - FT_UShort advance = 0; - FT_Vector p0, p1, p2, p3; - - /* horizontal */ -- tt_get_metrics(&ttface->horizontal, index, -+ tt_get_metrics( face, num_hmetrics, index, - &leftBearing, &advance); - - #if 0 -@@ -910,7 +980,27 @@ - FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return, - int *sbitchk_incomplete_but_exist ) - { --#if (FREETYPE_VERSION >= 2001008) -+#if 1 -+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0) -+ { -+ FT_Error error; -+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index]; -+ -+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 ); -+ if ( !error ) -+ { -+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY ); -+ if ( !error ) -+ { -+ if ( metrics_return != NULL ) -+ *metrics_return = ft_face->glyph->metrics; -+ -+ return 0; -+ } -+ } -+ } -+ return -1; -+#elif (FREETYPE_VERSION >= 2001008) - SFNT_Service sfnt; - TT_Face face; - FT_Error error; -@@ -1043,6 +1133,7 @@ - if( bitmap_metrics == NULL ) { - if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) { - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -@@ -1221,6 +1312,7 @@ - if( is_outline == 1 ){ - if( correct ){ - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h deleted file mode 100644 index 925263c0009e..000000000000 --- a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100 -+++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100 -@@ -47,6 +47,7 @@ - char *filename; - FT_Face face; - int bitmap; -+ FT_UInt num_hmetrics; - struct _FTInstance *instances; - struct _FTInstance *active_instance; - struct _FTFace *next; /* link to next face in bucket */ diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c deleted file mode 100644 index df7c97dce67a..000000000000 --- a/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100 -+++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100 -@@ -35,7 +35,6 @@ - #endif - #include <ft2build.h> - #include FT_CONFIG_CONFIG_H --#include FT_INTERNAL_DEBUG_H - #include FT_SYSTEM_H - #include FT_ERRORS_H - #include FT_TYPES_H diff --git a/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c b/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c deleted file mode 100644 index c676e1934de0..000000000000 --- a/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c +++ /dev/null @@ -1,101 +0,0 @@ ---- lib/font/bitmap/pcfread.c.orig Sat Jul 9 08:36:12 2005 -+++ lib/font/bitmap/pcfread.c Thu Aug 24 21:56:56 2006 -@@ -45,6 +45,7 @@ - #endif - - #include <stdarg.h> -+#include <stdint.h> - - void - pcfError(const char* message, ...) -@@ -133,6 +134,10 @@ - return (PCFTablePtr) NULL; - count = pcfGetLSB32(file); - if (IS_EOF(file)) return (PCFTablePtr) NULL; -+ if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) { -+ pcfError("pcfReadTOC(): invalid file format\n"); -+ return NULL; -+ } - tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec)); - if (!tables) { - pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec)); -@@ -252,6 +257,10 @@ - if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) - goto Bail; - nprops = pcfGetINT32(file, format); -+ if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) { -+ pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops); -+ goto Bail; -+ } - if (IS_EOF(file)) goto Bail; - props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec)); - if (!props) { -@@ -267,6 +276,13 @@ - props[i].name = pcfGetINT32(file, format); - isStringProp[i] = pcfGetINT8(file, format); - props[i].value = pcfGetINT32(file, format); -+ if (props[i].name < 0 -+ || (isStringProp[i] != 0 && isStringProp[i] != 1) -+ || (isStringProp[i] && props[i].value < 0)) { -+ pcfError("pcfGetProperties(): invalid file format %d %d %d\n", -+ props[i].name, isStringProp[i], props[i].value); -+ goto Bail; -+ } - if (IS_EOF(file)) goto Bail; - } - /* pad the property array */ -@@ -282,6 +298,7 @@ - } - if (IS_EOF(file)) goto Bail; - string_size = pcfGetINT32(file, format); -+ if (string_size < 0) goto Bail; - if (IS_EOF(file)) goto Bail; - strings = (char *) xalloc(string_size); - if (!strings) { -@@ -422,6 +439,10 @@ - else - nmetrics = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) { -+ pcfError("pcfReadFont(): invalid file format\n"); -+ goto Bail; -+ } - metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec)); - if (!metrics) { - pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec)); -@@ -447,7 +468,7 @@ - nbitmaps = pcfGetINT32(file, format); - if (nbitmaps != nmetrics || IS_EOF(file)) - goto Bail; -- -+ /* nmetrics is alreadt ok, so nbitmap also is */ - offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32)); - if (!offsets) { - pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32)); -@@ -461,6 +482,7 @@ - for (i = 0; i < GLYPHPADOPTIONS; i++) { - bitmapSizes[i] = pcfGetINT32(file, format); - if (IS_EOF(file)) goto Bail; -+ if (bitmapSizes[i] < 0) goto Bail; - } - - sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)]; -@@ -536,6 +558,7 @@ - if (IS_EOF(file)) goto Bail; - if (nink_metrics != nmetrics) - goto Bail; -+ /* nmetrics already checked */ - ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo)); - if (!ink_metrics) { - pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo)); -@@ -809,6 +832,10 @@ - else - nmetrics = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) { -+ pcfError("pmfReadFont(): invalid file format\n"); -+ goto Bail; -+ } - metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec)); - if (!metrics) { - pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec)); diff --git a/x11-servers/xorg-server/files/patch-imake.c b/x11-servers/xorg-server/files/patch-imake.c deleted file mode 100644 index b0db655d28c5..000000000000 --- a/x11-servers/xorg-server/files/patch-imake.c +++ /dev/null @@ -1,38 +0,0 @@ ---- config/imake/imake.c.orig Thu Feb 22 11:53:58 2007 -+++ config/imake/imake.c Thu Feb 22 11:56:06 2007 -@@ -1150,34 +1150,7 @@ - static void - get_binary_format(FILE *inFile) - { -- int mib[2]; -- size_t len; -- int osrel = 0; -- FILE *objprog = NULL; -- int iself = 0; -- char buf[10]; -- char cmd[PATH_MAX]; -- -- mib[0] = CTL_KERN; -- mib[1] = KERN_OSRELDATE; -- len = sizeof(osrel); -- sysctl(mib, 2, &osrel, &len, NULL, 0); -- if (CrossCompiling) { -- strcpy (cmd, CrossCompileDir); -- strcat (cmd, "/"); -- strcat (cmd,"objformat"); -- } else -- strcpy (cmd, "objformat"); -- -- if (osrel >= 300004 && -- (objprog = popen(cmd, "r")) != NULL && -- fgets(buf, sizeof(buf), objprog) != NULL && -- strncmp(buf, "elf", 3) == 0) -- iself = 1; -- if (objprog) -- pclose(objprog); -- -- fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); -+ fprintf(inFile, "#define DefaultToElfFormat YES\n"); - } - #endif - diff --git a/x11-servers/xorg-server/files/patch-mitri.c b/x11-servers/xorg-server/files/patch-mitri.c deleted file mode 100644 index 8c4ef0f57101..000000000000 --- a/x11-servers/xorg-server/files/patch-mitri.c +++ /dev/null @@ -1,25 +0,0 @@ -Index: render/mitri.c -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v -retrieving revision 1.5 -diff -u -r1.5 mitri.c ---- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5 -+++ programs/Xserver/render/mitri.c 18 Apr 2006 22:34:08 -0000 -@@ -145,7 +145,7 @@ - if (npoint < 3) - return; - ntri = npoint - 2; -- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); -+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); - if (!tris) - return; - for (tri = tris; npoint >= 3; npoint--, points++, tri++) -@@ -177,7 +177,7 @@ - if (npoint < 3) - return; - ntri = npoint - 2; -- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); -+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); - if (!tris) - return; - first = points++; diff --git a/x11-servers/xorg-server/files/patch-randr.c b/x11-servers/xorg-server/files/patch-randr.c new file mode 100644 index 000000000000..956527beeec4 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-randr.c @@ -0,0 +1,13 @@ +--- randr/randr.c.orig Thu Mar 15 13:21:48 2007 ++++ randr/randr.c Thu Mar 15 13:22:00 2007 +@@ -472,8 +472,8 @@ + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = 1; ++ rep.minorVersion = 2; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/x11-servers/xorg-server/files/patch-render.c b/x11-servers/xorg-server/files/patch-render.c index 2bcd61775f36..17f8b144b1a7 100644 --- a/x11-servers/xorg-server/files/patch-render.c +++ b/x11-servers/xorg-server/files/patch-render.c @@ -1,5 +1,5 @@ ---- programs/Xserver/render/render.c.orig Mon May 29 09:43:15 2006 -+++ programs/Xserver/render/render.c Mon May 29 09:45:02 2006 +--- render/render.c.orig Mon May 29 09:43:15 2006 ++++ render/render.c Mon May 29 09:45:02 2006 @@ -1340,7 +1340,7 @@ { if (buffer + sizeof (GlyphSet) < end) diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/patch-servermd.h index 4315d78de44f..5bbb1e4d8ab5 100644 --- a/x11-servers/xorg-server/files/patch-servermd.h +++ b/x11-servers/xorg-server/files/patch-servermd.h @@ -1,5 +1,5 @@ ---- programs/Xserver/include/servermd.h.orig Sun Jan 8 14:05:55 2006 -+++ programs/Xserver/include/servermd.h Sun Jan 8 14:06:22 2006 +--- include/servermd.h.orig Sun Jan 8 14:05:55 2006 ++++ include/servermd.h Sun Jan 8 14:06:22 2006 @@ -216,7 +216,7 @@ defined(__sparc__) || defined(__mc68000__) diff --git a/x11-servers/xorg-server/files/patch-sunffb-nocfb b/x11-servers/xorg-server/files/patch-sunffb-nocfb deleted file mode 100644 index 934268ca4c99..000000000000 --- a/x11-servers/xorg-server/files/patch-sunffb-nocfb +++ /dev/null @@ -1,101 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c.orig Fri Mar 31 00:22:07 2006 -+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c Fri Mar 31 00:35:35 2006 -@@ -43,8 +43,6 @@ - #include "ffb_rcache.h" - #include "ffb_loops.h" - #include "ffb_regs.h" --#include "ffb_stip.h" --#include "ffb_gc.h" - - int CreatorScreenPrivateIndex; - int CreatorGCPrivateIndex; ---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c.orig Fri Mar 31 00:22:07 2006 -+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c Fri Mar 31 00:36:08 2006 -@@ -36,7 +36,6 @@ - #include "ffb_regs.h" - #include "ffb_rcache.h" - #include "ffb_fifo.h" --#include "ffb_stip.h" - #include "ffb_loops.h" - - static Bool FFB_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, ---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c.orig Fri Mar 31 00:22:07 2006 -+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c Fri Mar 31 00:37:04 2006 -@@ -33,11 +33,6 @@ - - #include "xf86PciInfo.h" - #include "xf86Pci.h" --#define PSZ 8 --#include "cfb.h" --#undef PSZ --#include "cfb16.h" --#include "cfb32.h" - - #include "miline.h" - ---- programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile.orig Fri Mar 31 00:22:07 2006 -+++ programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile Fri Mar 31 00:34:27 2006 -@@ -60,16 +60,10 @@ - #define FFBsObjectRule(name) - #endif - --SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c \ -- ffb_cplane.c ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c \ -- ffb_line.c ffb_glyph.c ffb_frect.c ffb_circle.c ffb_checks.c \ -- ffb_stubs.c ffb_gc.c ffb_gspans.c ffb_sspans.c ffb_zeroarc.c \ -- ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c $(DRISRCS) --OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o \ -- ffb_cplane.o ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o \ -- ffb_line.o ffb_glyph.o ffb_frect.o ffb_circle.o ffb_checks.o \ -- ffb_stubs.o ffb_gc.o ffb_gspans.o ffb_sspans.o ffb_zeroarc.o \ -- ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o ffb_dbe.o $(VISOBJS) \ -+SRCS = ffb_driver.c ffb_accel.c ffb_attr.c \ -+ ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c $(DRISRCS) -+OBJS = ffb_driver.o ffb_accel.o ffb_attr.o \ -+ ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o $(VISOBJS) \ - $(DRIOBJS) - - #if defined(XF86DriverSDK) -@@ -107,28 +101,10 @@ - FFBCObjectRule(ffb_accel) - FFBCObjectRule(ffb_driver) - FFBCObjectRule(ffb_attr) --FFBCObjectRule(ffb_stip) --FFBCObjectRule(ffb_bcopy) --FFBCObjectRule(ffb_cplane) --FFBCObjectRule(ffb_fspans) --FFBCObjectRule(ffb_point) --FFBCObjectRule(ffb_seg) --FFBCObjectRule(ffb_plygon) --FFBCObjectRule(ffb_line) --FFBCObjectRule(ffb_glyph) --FFBCObjectRule(ffb_frect) --FFBCObjectRule(ffb_circle) --FFBCObjectRule(ffb_checks) --FFBCObjectRule(ffb_stubs) --FFBCObjectRule(ffb_gc) --FFBCObjectRule(ffb_gspans) --FFBCObjectRule(ffb_sspans) --FFBCObjectRule(ffb_zeroarc) - FFBCObjectRule(ffb_cursor) - FFBCObjectRule(ffb_dga) - FFBCObjectRule(ffb_dac) - FFBCObjectRule(ffb_wid) --FFBCObjectRule(ffb_dbe) - FFBsObjectRule(VISmoveImage) - FFBsObjectRule(ffb_asm) - #if BuildXF86DRI ---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c.orig Wed Apr 19 13:13:47 2006 -+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c Wed Apr 19 13:14:25 2006 -@@ -411,11 +411,6 @@ - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); - } - -- if (xf86LoadSubModule(pScrn, "xf8_32wid") == NULL) { -- FFBFreeRec(pScrn); -- return FALSE; -- } -- - if (xf86LoadSubModule(pScrn, "fb") == NULL) { - FFBFreeRec(pScrn); - return FALSE; diff --git a/x11-servers/xorg-server/files/patch-xf86.tmpl b/x11-servers/xorg-server/files/patch-xf86.tmpl deleted file mode 100644 index 3bf0b443d5f8..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86.tmpl +++ /dev/null @@ -1,12 +0,0 @@ ---- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002 -+++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003 -@@ -19,6 +19,9 @@ - #ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+#elif UseInstalledPrograms -+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11-servers/xorg-server/files/patch-xf86Events.c b/x11-servers/xorg-server/files/patch-xf86Events.c index bdd5bc51c819..2d88773233b8 100644 --- a/x11-servers/xorg-server/files/patch-xf86Events.c +++ b/x11-servers/xorg-server/files/patch-xf86Events.c @@ -1,5 +1,5 @@ ---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 -+++ programs/Xserver/hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004 +--- hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 ++++ hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004 @@ -448,7 +448,7 @@ #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT) static Bool first_time = TRUE; diff --git a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile deleted file mode 100644 index 5728d915fb48..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 -@@ -25,6 +25,8 @@ - SNPRINTFOBJS = snprintf.o - #endif - -+XAWLIB = -lXaw -+ - SRCS =\ - accessx.c\ - card-cfg.c\ diff --git a/x11-servers/xorg-server/files/patch-xf86sym.c b/x11-servers/xorg-server/files/patch-xf86sym.c deleted file mode 100644 index 1372be144354..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86sym.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig Fri May 7 18:51:51 2004 -+++ programs/Xserver/hw/xfree86/loader/xf86sym.c Fri May 7 18:52:02 2004 -@@ -63,7 +63,6 @@ - #include "xf86.h" - #include "xf86Resources.h" - #include "xf86_OSproc.h" --#include "xf86Parser.h" - #include "xf86Config.h" - #ifdef XINPUT - # include "xf86Xinput.h" diff --git a/x11-servers/xorg-server/files/patch-xorgconf.cpp b/x11-servers/xorg-server/files/patch-xorgconf.cpp index e21fac8d8484..04e217b8d9fe 100644 --- a/x11-servers/xorg-server/files/patch-xorgconf.cpp +++ b/x11-servers/xorg-server/files/patch-xorgconf.cpp @@ -1,5 +1,5 @@ ---- programs/Xserver/hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004 -+++ programs/Xserver/hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004 +--- hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004 ++++ hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004 @@ -624,3 +624,11 @@ InputDevice "Keyboard1" "CoreKeyboard" EndSection diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index cadb9a395ce4..c4378db9c053 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -1,20 +1,16 @@ bin/X bin/Xorg -bin/getconfig -bin/getconfig.pl +bin/cvt bin/gtf %%SPARC64_NA%%%%PPC_NA%%bin/inb %%SPARC64_NA%%%%PPC_NA%%bin/inl %%SPARC64_NA%%%%PPC_NA%%bin/inw %%SPARC64_NA%%%%PPC_NA%%bin/ioport -bin/kbd_mode -bin/mmapr -bin/mmapw %%SPARC64_NA%%%%PPC_NA%%bin/outb %%SPARC64_NA%%%%PPC_NA%%bin/outl %%SPARC64_NA%%%%PPC_NA%%bin/outw bin/pcitweak -%%I386%%bin/scanpci +%%AMD64_I386%%bin/scanpci bin/xorgcfg bin/xorgconfig include/X11/bitmaps/card.xbm @@ -34,174 +30,256 @@ include/X11/pixmaps/computer.xpm include/X11/pixmaps/keyboard.xpm include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm +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 +include/xorg/colormapst.h +include/xorg/compiler.h +include/xorg/cursor.h +include/xorg/cursorstr.h +include/xorg/damage.h +include/xorg/damagestr.h +include/xorg/dbestruct.h +include/xorg/dgaproc.h +include/xorg/dix.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 +include/xorg/edid.h +include/xorg/exa.h +include/xorg/exevents.h +include/xorg/extension.h +include/xorg/extinit.h +include/xorg/extnsionst.h +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/globals.h +include/xorg/glyphstr.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 +include/xorg/micmap.h +include/xorg/micoord.h +include/xorg/mifillarc.h +include/xorg/mifpoly.h +include/xorg/migc.h +include/xorg/miline.h +include/xorg/mipict.h +include/xorg/mipointer.h +include/xorg/mipointrst.h +include/xorg/misc.h +include/xorg/miscstruct.h +include/xorg/mispans.h +include/xorg/mistruct.h +include/xorg/miwideline.h +include/xorg/mizerarc.h +include/xorg/msp3430.h +include/xorg/opaque.h +include/xorg/os.h +include/xorg/picture.h +include/xorg/picturestr.h +include/xorg/pixmap.h +include/xorg/pixmapstr.h +include/xorg/property.h +include/xorg/propertyst.h +include/xorg/randrstr.h +include/xorg/region.h +include/xorg/regionstr.h +include/xorg/renderedge.h +include/xorg/resource.h +include/xorg/rgb.h +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/site.h +include/xorg/swaprep.h +include/xorg/swapreq.h +include/xorg/tda8425.h +include/xorg/tda9850.h +include/xorg/tda9885.h +include/xorg/uda1380.h +include/xorg/validate.h +include/xorg/vbe.h +include/xorg/vbeModes.h +include/xorg/vdif.h +include/xorg/vgaHW.h +include/xorg/window.h +include/xorg/windowstr.h +include/xorg/xaa.h +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/xf86Cursor.h +include/xorg/xf86DDC.h +include/xorg/xf86Module.h +include/xorg/xf86OSKbd.h +include/xorg/xf86OSmouse.h +include/xorg/xf86Opt.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/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 +include/xorg/xf86int10.h +include/xorg/xf86sbusBus.h +include/xorg/xf86str.h +include/xorg/xf86xv.h +include/xorg/xf86xvmc.h +include/xorg/xf86xvpriv.h +include/xorg/xisb.h +include/xorg/xorg-server.h +include/xorg/xorgVersion.h +include/xorg/xvdix.h +include/xorg/xvmcext.h lib/X11/Cards lib/X11/Options -lib/X11/app-defaults/XOrgCfg -lib/X11/doc/BUILD -lib/X11/doc/BugReport -lib/X11/doc/DESIGN -lib/X11/doc/Install -lib/X11/doc/LICENSE -lib/X11/doc/OS2.Notes -lib/X11/doc/README -lib/X11/doc/README.DECtga -lib/X11/doc/README.Darwin -lib/X11/doc/README.I128 -lib/X11/doc/README.LynxOS -lib/X11/doc/README.NetBSD -lib/X11/doc/README.OpenBSD -lib/X11/doc/README.SCO -lib/X11/doc/README.SiS -lib/X11/doc/README.Solaris -lib/X11/doc/README.XKB-Config -lib/X11/doc/README.XKB-Enhancing -lib/X11/doc/README.apm -lib/X11/doc/README.ati -lib/X11/doc/README.chips -lib/X11/doc/README.cyrix -lib/X11/doc/README.dps -lib/X11/doc/README.fonts -lib/X11/doc/README.i740 -lib/X11/doc/README.i810 -lib/X11/doc/README.mouse -lib/X11/doc/README.newport -lib/X11/doc/README.r128 -lib/X11/doc/README.rapidaccess -lib/X11/doc/README.rendition -lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES -lib/X11/doc/Versions -lib/X11/doc/VideoBoard98 -lib/X11/etc/Xinstall.sh -lib/X11/etc/xmodmap.std -lib/X11/getconfig/cfg.sample -lib/X11/getconfig/xorg.cfg -lib/X11/xorg.conf.eg -lib/X11/xserver/SecurityPolicy -%%AMD64_I386%%lib/modules/drivers/apm_drv.so -%%AMD64_I386%%lib/modules/drivers/ark_drv.so -lib/modules/drivers/ati_drv.so -lib/modules/drivers/atimisc_drv.so -%%AMD64_I386%%lib/modules/drivers/chips_drv.so -%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so -%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.so -%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so -%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so -%%ALPHA_NA%%lib/modules/drivers/dummy_drv.so -lib/modules/drivers/glint_drv.so -%%AMD64_I386%%lib/modules/drivers/i128_drv.so -%%I386%%lib/modules/drivers/i740_drv.so -%%AMD64_I386%%lib/modules/drivers/i810_drv.so -lib/modules/drivers/mga_drv.so -%%AMD64_I386%%lib/modules/drivers/neomagic_drv.so -%%I386%%lib/modules/drivers/nsc_drv.so -%%SPARC64_NA%%lib/modules/drivers/nv_drv.so -lib/modules/drivers/r128_drv.so -lib/modules/drivers/radeon_drv.so -%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so -%%SPARC64_NA%%lib/modules/drivers/riva128.so -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.so -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.so -%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so -%%AMD64_I386%%lib/modules/drivers/sis_drv.so -%%SPARC64%%lib/modules/drivers/sunbw2_drv.so -%%SPARC64%%lib/modules/drivers/suncg14_drv.so -%%SPARC64%%lib/modules/drivers/suncg3_drv.so -%%SPARC64%%lib/modules/drivers/suncg6_drv.so -%%SPARC64%%lib/modules/drivers/sunffb_drv.so -%%SPARC64%%lib/modules/drivers/sunleo_drv.so -%%SPARC64%%lib/modules/drivers/suntcx_drv.so -lib/modules/drivers/tdfx_drv.so -%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so -%%AMD64_I386%%lib/modules/drivers/trident_drv.so -%%AMD64_I386%%lib/modules/drivers/tseng_drv.so -%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so -lib/modules/drivers/vga_drv.so -%%I386%%lib/modules/drivers/via_drv.so -%%AMD64_I386%%lib/modules/drivers/vmware_drv.so -lib/modules/extensions/libGLcore.so -lib/modules/extensions/libdbe.so -lib/modules/extensions/libdri.so -lib/modules/extensions/libextmod.so -lib/modules/extensions/libglx.so -lib/modules/extensions/librecord.so -lib/modules/extensions/libxtrap.so -lib/modules/fonts/libbitmap.so -lib/modules/fonts/libfreetype.so -lib/modules/fonts/libtype1.so -lib/modules/freebsd/libdrm.so -lib/modules/input/acecad_drv.so -lib/modules/input/calcomp_drv.so -lib/modules/input/citron_drv.so -lib/modules/input/digitaledge_drv.so -lib/modules/input/dmc_drv.so -lib/modules/input/dynapro_drv.so -lib/modules/input/elographics_drv.so -lib/modules/input/fpit_drv.so -lib/modules/input/hyperpen_drv.so -lib/modules/input/js_x_drv.so -lib/modules/input/kbd_drv.so -lib/modules/input/keyboard_drv.so -lib/modules/input/magellan_drv.so -lib/modules/input/microtouch_drv.so -lib/modules/input/mouse_drv.so -lib/modules/input/mutouch_drv.so -lib/modules/input/palmax_drv.so -lib/modules/input/penmount_drv.so -lib/modules/input/spaceorb_drv.so -lib/modules/input/summa_drv.so -lib/modules/input/tek4957_drv.so -lib/modules/input/void_drv.so -lib/modules/input/wacom_drv.so -%%ALPHA_NA%%lib/modules/libafb.so -lib/modules/libcfb.so -lib/modules/libcfb16.so -%%SPARC64%%lib/modules/libcfb24.so -lib/modules/libcfb32.so -lib/modules/libddc.so -lib/modules/libexa.so -lib/modules/libfb.so -lib/modules/libi2c.so -lib/modules/libint10.so -lib/modules/liblayer.so -lib/modules/libmfb.so -lib/modules/libpcidata.so -lib/modules/librac.so -lib/modules/libramdac.so -lib/modules/libscanpci.so -lib/modules/libshadow.so -lib/modules/libshadowfb.so -lib/modules/libvbe.so -lib/modules/libvgahw.so -lib/modules/libxaa.so -lib/modules/libxf1bpp.so -lib/modules/libxf4bpp.so -lib/modules/libxf8_16bpp.so -lib/modules/libxf8_32bpp.so -%%SPARC64%%lib/modules/libxf8_32wid.so -lib/modules/multimedia/bt829_drv.so -lib/modules/multimedia/fi1236_drv.so -lib/modules/multimedia/msp3430_drv.so -lib/modules/multimedia/tda8425_drv.so -lib/modules/multimedia/tda9850_drv.so -lib/modules/multimedia/tda9885_drv.so -lib/modules/multimedia/theatre_detect_drv.so -lib/modules/multimedia/theatre_drv.so -lib/modules/multimedia/theatre200_drv.so -lib/modules/multimedia/uda1380_drv.so -%%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc -%%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc -@dirrm lib/X11/getconfig -@dirrm lib/modules/fonts -@dirrm lib/modules/extensions -@dirrm lib/modules/freebsd -@dirrm lib/modules/drivers -@dirrm lib/modules/input -@dirrm lib/modules/internal -@dirrm lib/modules/multimedia +lib/xorg/modules/extensions/libGLcore.la +lib/xorg/modules/extensions/libGLcore.so +lib/xorg/modules/extensions/libdbe.la +lib/xorg/modules/extensions/libdbe.so +lib/xorg/modules/extensions/libdri.la +lib/xorg/modules/extensions/libdri.so +lib/xorg/modules/extensions/libextmod.la +lib/xorg/modules/extensions/libextmod.so +lib/xorg/modules/extensions/libglx.la +lib/xorg/modules/extensions/libglx.so +lib/xorg/modules/extensions/librecord.la +lib/xorg/modules/extensions/librecord.so +lib/xorg/modules/extensions/libxtrap.la +lib/xorg/modules/extensions/libxtrap.so +lib/xorg/modules/fonts/libfreetype.la +lib/xorg/modules/fonts/libfreetype.so +lib/xorg/modules/fonts/libtype1.la +lib/xorg/modules/fonts/libtype1.so +%%ALPHA_NA%%lib/xorg/modules/libafb.la +%%ALPHA_NA%%lib/xorg/modules/libafb.so +lib/xorg/modules/libcfb.la +lib/xorg/modules/libcfb.so +lib/xorg/modules/libcfb32.la +lib/xorg/modules/libcfb32.so +lib/xorg/modules/libddc.la +lib/xorg/modules/libddc.so +lib/xorg/modules/libexa.la +lib/xorg/modules/libexa.so +lib/xorg/modules/libfb.la +lib/xorg/modules/libfb.so +lib/xorg/modules/libi2c.la +lib/xorg/modules/libi2c.so +lib/xorg/modules/libint10.la +lib/xorg/modules/libint10.so +lib/xorg/modules/libmfb.la +lib/xorg/modules/libmfb.so +lib/xorg/modules/libpcidata.la +lib/xorg/modules/libpcidata.so +lib/xorg/modules/libramdac.la +lib/xorg/modules/libramdac.so +lib/xorg/modules/libscanpci.la +lib/xorg/modules/libscanpci.so +lib/xorg/modules/libshadow.la +lib/xorg/modules/libshadow.so +lib/xorg/modules/libshadowfb.la +lib/xorg/modules/libshadowfb.so +lib/xorg/modules/libvbe.la +lib/xorg/modules/libvbe.so +lib/xorg/modules/libvgahw.la +lib/xorg/modules/libvgahw.so +lib/xorg/modules/libxaa.la +lib/xorg/modules/libxaa.so +lib/xorg/modules/libxf1bpp.la +lib/xorg/modules/libxf1bpp.so +lib/xorg/modules/libxf4bpp.la +lib/xorg/modules/libxf4bpp.so +lib/xorg/modules/libxf8_16bpp.la +lib/xorg/modules/libxf8_16bpp.so +lib/xorg/modules/libxf8_32bpp.la +lib/xorg/modules/libxf8_32bpp.so +lib/xorg/modules/linux/libfbdevhw.la +lib/xorg/modules/linux/libfbdevhw.so +lib/xorg/modules/multimedia/bt829_drv.la +lib/xorg/modules/multimedia/bt829_drv.so +lib/xorg/modules/multimedia/fi1236_drv.la +lib/xorg/modules/multimedia/fi1236_drv.so +lib/xorg/modules/multimedia/msp3430_drv.la +lib/xorg/modules/multimedia/msp3430_drv.so +lib/xorg/modules/multimedia/tda8425_drv.la +lib/xorg/modules/multimedia/tda8425_drv.so +lib/xorg/modules/multimedia/tda9850_drv.la +lib/xorg/modules/multimedia/tda9850_drv.so +lib/xorg/modules/multimedia/tda9885_drv.la +lib/xorg/modules/multimedia/tda9885_drv.so +lib/xorg/modules/multimedia/uda1380_drv.la +lib/xorg/modules/multimedia/uda1380_drv.so +lib/xserver/SecurityPolicy +libdata/pkgconfig/xorg-server.pc +share/X11/app-defaults/XOrgCfg +share/X11/xkb/compiled/README.compiled +share/aclocal/xorg-server.m4 +@dirrm include/xorg +@dirrm lib/xorg/modules/fonts +@dirrm lib/xorg/modules/extensions +@dirrm lib/xorg/modules/linux +@dirrm lib/xorg/modules/multimedia +@dirrm lib/xorg/modules +@dirrm lib/xorg +@dirrm lib/xserver +@dirrmtry include/X11/bitmaps @dirrmtry include/X11/pixmaps @dirrmtry lib/X11/doc @dirrmtry lib/X11/etc @dirrmtry lib/X11/xserver -@dirrmtry lib/modules +@dirrmtry lib/xorg/modules +@dirrmtry lib/xorg +@dirrmtry share/X11/app-defaults diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure deleted file mode 100644 index 84cf7bd2a731..000000000000 --- a/x11-servers/xorg-server/scripts/configure +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF -echo "#define JoystickSupport NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define XnestServer NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF -echo "#define XprtServer NO" >> $LOCALDEF -echo "#define LibInstall NO" >> $LOCALDEF -echo "#define ForceNormalLib NO" >> $LOCALDEF -echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildXprint NO" >> $LOCALDEF -echo "#define BuildLibraries NO" >> $LOCALDEF -echo "#define LibInstallBuild YES" >> $LOCALDEF -echo "#define ModInstall YES" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildGLXLibrary YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF -echo "#define DriverManDir \$(MANSOURCEPATH)4" >> $LOCALDEF -echo "#define DriverManSuffix 4x" >> $LOCALDEF -echo "#define MiscManDir \$(MANSOURCEPATH)7" >> $LOCALDEF -echo "#define MiscManSuffix 7x" >> $LOCALDEF - -if [ X$WITH_DEBUG != X ]; then - export CFLAGS="-g $CFLAGS" - echo "#define InstPgmFlags" >> $LOCALDEF - echo "#define MakeDllModules YES" >> $LOCALDEF -fi - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen diff --git a/x11-servers/xorg-server/scripts/configure.gen b/x11-servers/xorg-server/scripts/configure.gen deleted file mode 100644 index ee7e1d88add8..000000000000 --- a/x11-servers/xorg-server/scripts/configure.gen +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script takes some of the system's imake configuration files and munges -# them to be used in the X.Org build, and allows port configuration located in -# $LOCALDEF to be included in the generated host.def - -SYSSITE=$PREFIX/lib/X11/config/xf86site.def -BUILDSITE=$WRKDIR/xc/config/cf/xorgsite.def -SYSHOST=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -BUILDHOST=$WRKDIR/xc/config/cf/host.def - -# Append system xf86site.def to build's xorgsite.def. -rm -f $BUILDSITE -cp -f $SYSSITE $BUILDSITE - -# Use system host.def as initial config file, setting ProjectRoot appropriately. -rm -f $BUILDHOST -grep -v '#define.*ProjectRoot' $SYSHOST >> $BUILDHOST -echo "#define ProjectRoot $PREFIX" >> $BUILDHOST - -# Add in defines that all ports will want. -echo "#define NothingOutsideProjectRoot YES" >> $BUILDHOST -echo "#define FreeBSDCC ${CC}" >> $BUILDHOST -echo "#define FreeBSDCXX ${CXX}" >> $BUILDHOST -echo "#define FreeBSDPTHREAD_LIBS ${PTHREAD_LIBS}" >> $BUILDHOST -echo "#define FreeBSDPTHREAD_CFLAGS ${PTHREAD_CFLAGS}" >> $BUILDHOST -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $BUILDHOST - -cat ${LOCALDEF} >> ${BUILDHOST} diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 0a8439ca5751..8b1b72c7e918 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,34 +6,33 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 6.9.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src -DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ - X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X virtual framebuffer server from X.Org CONFLICTS= XFree86-VirtualFramebufferServer-* -EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} +XORG_CAT= xserver -USE_XLIB= yes +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ + damageproto xcmiscproto xextproto xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto xf86dgaproto videoproto \ + compositeproto trapproto recordproto resourceproto \ + xineramaproto evieproto xkbfile xfont fontenc xkbui xxf86misc \ + xxf86vm xaw7 xmu xpm xext -XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver +CONFIGURE_ARGS= --disable-dmx --disable-xnest --disable-xorg --disable-xprint \ + --localstatedir=/var +PLIST_FILES= bin/Xvfb MAN1= Xvfb.1 -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include <bsd.port.post.mk> +do-install: + cd ${WRKSRC}/hw/vfb; ${MAKE} install + +.include <bsd.port.mk> diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index 177370c87899..b208692af414 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150 -SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c -SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 +SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 +SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 diff --git a/x11-servers/xorg-vfbserver/pkg-plist b/x11-servers/xorg-vfbserver/pkg-plist deleted file mode 100644 index e2d161bbca7f..000000000000 --- a/x11-servers/xorg-vfbserver/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/Xvfb diff --git a/x11-servers/xorg-vfbserver/scripts/configure b/x11-servers/xorg-vfbserver/scripts/configure deleted file mode 100644 index 2af13d547cf4..000000000000 --- a/x11-servers/xorg-vfbserver/scripts/configure +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define XprtServer NO" >> $LOCALDEF -echo "#define BuildXprint NO" >> $LOCALDEF -echo "#define XnestServer NO" >> $LOCALDEF -echo "#define XorgServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define BuildXF86DRI NO" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -echo "#define InstallSecurityConfig NO" >> $LOCALDEF - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen |