diff options
| author | marcus <marcus@FreeBSD.org> | 2004-08-10 09:29:22 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-08-10 09:29:22 +0800 |
| commit | 6f022c38fcab5d16a80baf642907cb11328e008b (patch) | |
| tree | 1ea652121d06b334dcf11bc01247ce4373a657a7 /x11-servers | |
| parent | 21e9a82722f5559a4d7498b5573a8a31d5af16b4 (diff) | |
| download | freebsd-ports-gnome-6f022c38fcab5d16a80baf642907cb11328e008b.tar.gz freebsd-ports-gnome-6f022c38fcab5d16a80baf642907cb11328e008b.tar.zst freebsd-ports-gnome-6f022c38fcab5d16a80baf642907cb11328e008b.zip | |
Update XFree86 clients to 4.4 release. Release notes are available at
http://www.xfree86.org/4.4.0/RELNOTES.html
PR: ports/67733 imake
ports/67508 libraries
ports/67510 clients
ports/67513 server
ports/67776 100dpi fonts
ports/67777 75dpi fonts
ports/67778 cyrillic fonts
ports/67779 default bitmap fonts
ports/67781 font encodings
ports/67783 scalable fonts
ports/67784 font server
ports/67785 XFree86 meta-port
ports/67775 documents
ports/67786 manpages
ports/67787 nest server
ports/67788 print server
ports/67789 virtual framebuffer server
ports/56487 (Upgrading Xfree86-clients from ports overwrites xdm config files)
ports/44252 (XFree86-4-Server port removes/overwrites config files)
Submitted by: Dejan Lesjak (dejan DOT lesjak AT ijs DOT si)
Additional changes by: anholt
Jung-uk Kim (jkim AT niksun DOT com)
arved
Tested by: pointyhat
linimon
Diffstat (limited to 'x11-servers')
62 files changed, 578 insertions, 1078 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index db5bf191b51f..e9f2b4303faa 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -6,15 +6,14 @@ # PORTNAME= FontServer -PORTVERSION= 4.3.0 -PORTREVISION= 3 +PORTVERSION= 4.4.0 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font server @@ -25,6 +24,10 @@ MAN1= xfs.1 XBUILD_DIRS= programs/xfs XINCLUDE_DIRS= lib/xtrans programs/Xserver XINSTALL_MAN_DIRS= programs/xfs +EXTRA_PATCHES+= ${FILESDIR}/patch-programs::xfs::Imakefile + +post-install: + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo index 9a51f735dc5b..ba2d5d81e5e3 100644 --- a/x11-servers/XFree86-4-FontServer/distinfo +++ b/x11-servers/XFree86-4-FontServer/distinfo @@ -1,6 +1,6 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -SIZE (xc/X430src-1.tgz) = 10993622 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -SIZE (xc/X430src-2.tgz) = 7962239 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -SIZE (xc/X430src-3.tgz) = 12366363 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 diff --git a/x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile b/x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile new file mode 100644 index 000000000000..7133d1c1c76d --- /dev/null +++ b/x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile @@ -0,0 +1,11 @@ +--- programs/xfs/Imakefile.orig Tue Apr 20 20:57:28 2004 ++++ programs/xfs/Imakefile Tue Apr 20 20:58:12 2004 +@@ -58,7 +58,7 @@ + InstallManPage(xfs,$(MANDIR)) + + #if InstallFSConfig +-InstallNonExecFile(config,$(FSLIBDIR)) ++InstallNamedNonExec(config,config.default,$(FSLIBDIR)) + #else + InstallNonExecFileNoClobber(config,$(FSLIBDIR)) + #endif diff --git a/x11-servers/XFree86-4-FontServer/pkg-install b/x11-servers/XFree86-4-FontServer/pkg-install new file mode 100644 index 000000000000..24645352073e --- /dev/null +++ b/x11-servers/XFree86-4-FontServer/pkg-install @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} +XFSCONFDIR=${PKG_PREFIX}/lib/X11/fs + +if [ ! -f ${XFSCONFDIR}/config ]; then + cp ${XFSCONFDIR}/config.default ${XFSCONFDIR}/config +fi diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist index ced5ee87b536..a06037d5a018 100644 --- a/x11-servers/XFree86-4-FontServer/pkg-plist +++ b/x11-servers/XFree86-4-FontServer/pkg-plist @@ -1,2 +1,3 @@ +@unexec if cmp -s %D/lib/X11/fs/config %D/lib/X11/fs/config.default; then rm -f %D/lib/X11/fs/config; fi bin/xfs -lib/X11/fs/config +lib/X11/fs/config.default diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index a905d0466c67..5170d53e9cf3 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -6,21 +6,20 @@ # PORTNAME= NestServer -PORTVERSION= 4.3.0 -PORTREVISION= 4 +PORTVERSION= 4.4.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz:x \ + XFree86-4.4.0-src-2.tgz:x \ + XFree86-4.4.0-src-3.tgz:x \ + Wraphelp2.gz:local +EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 nested X server @@ -28,6 +27,7 @@ COMMENT= XFree86-4 nested X server CONFLICTS= xorg-nestserver-* MAN1= Xnest.1 +EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver @@ -37,6 +37,9 @@ post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c +post-install: + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo index 4c3445d29834..edbe3d91944d 100644 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ b/x11-servers/XFree86-4-NestServer/distinfo @@ -1,8 +1,8 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -SIZE (xc/X430src-1.tgz) = 10993622 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -SIZE (xc/X430src-2.tgz) = 7962239 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -SIZE (xc/X430src-3.tgz) = 12366363 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 SIZE (xc/Wraphelp2.gz) = 3376 diff --git a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile new file mode 100644 index 000000000000..350e13eebafb --- /dev/null +++ b/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 ++++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 +@@ -160,7 +160,7 @@ + LinkSourceFile(modinit.h,extmod) + + #if BuildXCSecurity && InstallSecurityConfig +-InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) ++InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-NestServer,$(SERVERCONFIGDIR)) + #endif + + DependTarget() diff --git a/x11-servers/XFree86-4-NestServer/pkg-install b/x11-servers/XFree86-4-NestServer/pkg-install new file mode 100644 index 000000000000..6f04a27ffda8 --- /dev/null +++ b/x11-servers/XFree86-4-NestServer/pkg-install @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} +SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver + +if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then + cp ${SECCONFDIR}/SecurityPolicy.default-NestServer \ + ${SECCONFDIR}/SecurityPolicy +fi diff --git a/x11-servers/XFree86-4-NestServer/pkg-plist b/x11-servers/XFree86-4-NestServer/pkg-plist index 8d4ae03e0554..d30d2d29dd1e 100644 --- a/x11-servers/XFree86-4-NestServer/pkg-plist +++ b/x11-servers/XFree86-4-NestServer/pkg-plist @@ -1,2 +1,2 @@ bin/Xnest -lib/X11/xserver/SecurityPolicy +lib/X11/xserver/SecurityPolicy.default-NestServer diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 30ca5a0c4aa9..d222fc4d4f3d 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -6,21 +6,20 @@ # PORTNAME= PrintServer -PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTVERSION= 4.4.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ +DISTFILES= XFree86-4.4.0-src-1.tgz:x \ + XFree86-4.4.0-src-2.tgz:x \ + XFree86-4.4.0-src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 print server diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo index 4c3445d29834..edbe3d91944d 100644 --- a/x11-servers/XFree86-4-PrintServer/distinfo +++ b/x11-servers/XFree86-4-PrintServer/distinfo @@ -1,8 +1,8 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -SIZE (xc/X430src-1.tgz) = 10993622 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -SIZE (xc/X430src-2.tgz) = 7962239 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -SIZE (xc/X430src-3.tgz) = 12366363 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 SIZE (xc/Wraphelp2.gz) = 3376 diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 00a143795cfd..5b377c9d7c22 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -6,69 +6,49 @@ # PORTNAME= Server -PORTVERSION= 4.3.0 -PORTREVISION= 14 +PORTVERSION= 4.4.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ +DISTFILES= XFree86-4.4.0-src-1.tgz:x \ + XFree86-4.4.0-src-2.tgz:x \ + XFree86-4.4.0-src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 X server and related programs CONFLICTS= xorg-server-* -EXTRA_PATCHES+= \ - ${FILESDIR}/patch-FreeBSD.cf \ - ${FILESDIR}/patch-Pci.h \ - ${FILESDIR}/patch-Sbus.c \ - ${FILESDIR}/patch-alpha_video.c \ - ${FILESDIR}/patch-bsd-Imakefile \ - ${FILESDIR}/patch-bsd-bsdResource.c \ - ${FILESDIR}/patch-bsd_Imakefile \ - ${FILESDIR}/patch-bus-Imakefile \ - ${FILESDIR}/patch-bus_Imakefile \ - ${FILESDIR}/patch-compiler.h \ - ${FILESDIR}/patch-elfloader.c \ - ${FILESDIR}/patch-freebsdPci.c \ - ${FILESDIR}/patch-ftfuncs.c \ - ${FILESDIR}/patch-int10-generic.c \ - ${FILESDIR}/patch-libc_wrapper.c \ - ${FILESDIR}/patch-loader-Imakefile \ - ${FILESDIR}/patch-loader-elfloader.c \ - ${FILESDIR}/patch-loader.c \ - ${FILESDIR}/patch-mga_dri.c \ - ${FILESDIR}/patch-mga_driver.c \ - ${FILESDIR}/patch-nv_driver.c \ - ${FILESDIR}/patch-nv_setup.c \ - ${FILESDIR}/patch-os-support_Imakefile \ - ${FILESDIR}/patch-r128_driver.c \ - ${FILESDIR}/patch-radeon_cursor.c \ - ${FILESDIR}/patch-radeon_dri.c \ - ${FILESDIR}/patch-radeon_reg.h \ - ${FILESDIR}/patch-savage-pci-id \ - ${FILESDIR}/patch-smi \ - ${FILESDIR}/patch-sunffb_Imakefile \ - ${FILESDIR}/patch-xc::lib::font::fontfile \ - ${FILESDIR}/patch-xf86-common-Imakefile \ - ${FILESDIR}/patch-xf86Events.c \ - ${FILESDIR}/patch-xf86Sbus.h \ - ${FILESDIR}/patch-xf86sym.c \ - ${FILESDIR}/patch-xkbInit.c +# Override default from XFree86-4-libraries/Makefile.inc +PATCHDIR= ${MASTERDIR}/files + +.for pf in patch-Imake.rules patch-Imake.tmpl \ + patch-X11.tmpl patch-Xcursor-Imakefile \ + patch-amd64 patch-c2 patch-dri-Imakefile \ + patch-f patch-imake.c \ + patch-texteroids patch-xditview-Imakefile patch-xdm \ + patch-xdm_session.c patch-xf86.tmpl \ + patch-xterm-Imakefile patch-z05 patch-z14 \ + patch-z15 patch-z30 patch-z32 patch-z34 patch-z35 \ + patch-z41 patch-z44 patch-z45 +# patch-startx + +EXTRA_PATCHES+= ${.CURDIR}/../../x11/XFree86-4-libraries/files/${pf} +.endfor + SCRIPTS_ENV= OSVERSION=${OSVERSION} \ BuildXF86DRI=${BuildXF86DRI} \ WITH_DEBUG="${WITH_DEBUG}" MAN1= XFree86.1 \ Xserver.1 \ + getconfig.1 \ gtf.1 \ kbd_mode.1 \ pcitweak.1 \ @@ -110,7 +90,8 @@ MAN4= citron.4 \ radeon.4 \ void.4 \ wacom.4 -MAN5= XF86Config.5 +MAN5= XF86Config.5 \ + getconfig.5 PKGMESSAGE= ${WRKDIR}/.pkg-message XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans @@ -135,6 +116,32 @@ BuildXF86DRI= NO PLIST_SUB+= DRI="@comment " .endif +.if ${ARCH} == alpha +PLIST_SUB+= ALPHA_NA="@comment " +MAN4+= cirrus.4 +.else +PLIST_SUB+= ALPHA_NA="" +.endif + +.if ${ARCH} == amd64 +PLIST_SUB+= AMD64_NA="@comment " +PLIST_SUB+= AMD64_I386="" +MAN4+= apm.4 \ + chips.4 \ + cirrus.4 \ + cyrix.4 \ + fbdev.4 \ + i128.4 \ + neomagic.4 \ + sis.4 \ + trident.4 \ + tseng.4 \ + vesa.4 +.else +PLIST_SUB+= AMD64_NA="" +PLIST_SUB+= AMD64_I386="@comment " +.endif + .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " .else @@ -142,8 +149,8 @@ PLIST_SUB+= IA64_NA="" .endif .if ${ARCH} == sparc64 -PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64_NA="@comment " +PLIST_SUB+= SPARC64="" MAN4+= sunffb.4 .else PLIST_SUB+= SPARC64="@comment " @@ -154,13 +161,13 @@ MAN4+= glint.4 \ s3virge.4 \ savage.4 \ siliconmotion.4 \ - sis.4 \ tdfx.4 \ vga.4 .endif .if ${ARCH} == i386 PLIST_SUB+= I386="" +PLIST_SUB+= AMD64_I386="" MAN1+= scanpci.1 MAN4+= apm.4 \ chips.4 \ @@ -171,23 +178,28 @@ MAN4+= apm.4 \ i810.4 \ neomagic.4 \ nsc.4 \ + sis.4 \ trident.4 \ tseng.4 \ vesa.4 \ + via.4 \ vmware.4 .else PLIST_SUB+= I386="@comment " +PLIST_SUB+= AMD64_I386="@comment " .endif post-extract:: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c + @${MKDIR} ${WRKDIR}/drmsource post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} post-install:: + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index 4c3445d29834..edbe3d91944d 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -1,8 +1,8 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -SIZE (xc/X430src-1.tgz) = 10993622 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -SIZE (xc/X430src-2.tgz) = 7962239 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -SIZE (xc/X430src-3.tgz) = 12366363 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 SIZE (xc/Wraphelp2.gz) = 3376 diff --git a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf index c0cfe1547bad..bcbd69901253 100644 --- a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf +++ b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf @@ -1,11 +1,39 @@ ---- config/cf/FreeBSD.cf.orig Tue May 20 05:10:21 2003 -+++ config/cf/FreeBSD.cf Tue May 20 03:41:35 2003 -@@ -464,6 +464,8 @@ +--- config/cf/FreeBSD.cf.orig Sat Nov 1 20:38:01 2003 ++++ config/cf/FreeBSD.cf Tue Nov 11 20:47:11 2003 +@@ -172,11 +172,11 @@ + * ld: warning: libXThrStub.so.6, needed by libX11.so, not found + */ + #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) +-# define CcCmd $(CLIENTENVSETUP) cc +-# define CplusplusCmd $(CLIENTENVSETUP) c++ ++# define CcCmd $(CLIENTENVSETUP) FreeBSDCC ++# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd FreeBSDCC ++# define CplusplusCmd FreeBSDCXX #endif - #ifdef Sparc64Architecture - #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -+#define AsVISOption -Av9a -+#define AsOutputArchSize 64 + + #define CppCmd /usr/bin/cpp +@@ -393,18 +393,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif - #ifdef ia64Architecture - #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 + +-/* 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/XFree86-4-Server/files/patch-GL-Imakefile b/x11-servers/XFree86-4-Server/files/patch-GL-Imakefile new file mode 100644 index 000000000000..40560c382274 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-GL-Imakefile @@ -0,0 +1,11 @@ +--- lib/GL/Imakefile.orig Thu Oct 23 00:33:15 2003 ++++ lib/GL/Imakefile Thu Oct 23 00:35:49 2003 +@@ -110,7 +110,7 @@ + #if BuildXF86DRI && GlxUseBuiltInDRIDriver + SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) + #else +-SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) ++SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) /*$(LIBGLBUILDDIR) $(OSMESADIRS) */ $(DRIVERDIRS) + #endif + + MakeSubdirs($(SUBDIRS)) diff --git a/x11-servers/XFree86-4-Server/files/patch-Pci.h b/x11-servers/XFree86-4-Server/files/patch-Pci.h deleted file mode 100644 index 75a9b57dda6a..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Pci.h +++ /dev/null @@ -1,36 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Mon Dec 23 07:37:26 2002 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Sat Jul 26 21:34:12 2003 -@@ -230,6 +230,10 @@ - # define ARCH_PCI_INIT linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN -+# elif defined(FreeBSD) -+# define ARCH_PCI_INIT freebsdPciInit -+# define INCLUDE_XF86_MAP_PCI_MEM -+# define INCLUDE_XF86_NO_DOMAIN - # endif - # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper - #elif defined(__i386__) -@@ -291,14 +295,20 @@ - # elif defined(sun) - # define ARCH_PCI_INIT sparcPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# elif defined(__OpenBSD__) && defined(__sparc64__) -+# elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN - # endif -+# if !defined(__FreeBSD__) - # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge -+# endif - #elif defined(__x86_64__) --# define ARCH_PCI_INIT ix86PciInit -+# if defined(__FreeBSD__) -+# define ARCH_PCI_INIT freebsdPciInit -+# else -+# define ARCH_PCI_INIT ix86PciInit -+# endif - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN - # if defined(linux) diff --git a/x11-servers/XFree86-4-Server/files/patch-Sbus.c b/x11-servers/XFree86-4-Server/files/patch-Sbus.c deleted file mode 100644 index 9013e1dfe8c0..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Sbus.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Sbus.c.orig Fri May 16 15:33:46 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Sbus.c Fri May 16 15:37:46 2003 -@@ -170,6 +170,8 @@ - promP1275 = TRUE; - else - promP1275 = FALSE; -+#elif defined(__FreeBSD__) -+ promP1275 = TRUE; - #else - #error Missing promIsP1275() function for this OS - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c b/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c new file mode 100644 index 000000000000..ca124eacf985 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c @@ -0,0 +1,43 @@ +Index: programs/Xserver/Xext/saver.c +=================================================================== +RCS file: /cvs/xc/programs/Xserver/Xext/saver.c,v +retrieving revision 3.8 +retrieving revision 3.8.2.1 +diff -u -u -r3.8 -r3.8.2.1 +--- programs/Xserver/Xext/saver.c 17 Nov 2003 22:20:26 -0000 3.8 ++++ programs/Xserver/Xext/saver.c 2 Mar 2004 19:39:48 -0000 3.8.2.1 +@@ -27,7 +27,7 @@ + * Author: Keith Packard, MIT X Consortium + */ + +-/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */ ++/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8.2.1 2004/03/02 19:39:48 dawes Exp $ */ + + #define NEED_REPLIES + #define NEED_EVENTS +@@ -810,7 +810,7 @@ + DepthPtr pDepth; + WindowOptPtr ancwopt; + unsigned long *pVlist; +- unsigned long *values = 0; ++ unsigned long *values = 0, *save = 0; + unsigned long tmask, imask; + unsigned long val; + Pixmap pixID; +@@ -938,6 +938,7 @@ + ret = BadAlloc; + goto bail; + } ++ save = values; + pAttr->screen = pScreen; + pAttr->client = client; + pAttr->x = stuff->x; +@@ -1166,7 +1167,7 @@ + bail: + CheckScreenPrivate (pScreen); + xfree (pAttr); +- xfree (values); ++ xfree (save); + return ret; + } + diff --git a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c index 13490c5be1d9..fdb7cbd95a5b 100644 --- a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c +++ b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c @@ -1,39 +1,8 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Tue Oct 29 16:19:13 2002 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Sat Feb 21 00:26:25 2004 -@@ -33,7 +33,10 @@ - #include <sys/param.h> - #ifndef __NetBSD__ - # include <sys/sysctl.h> --# else -+# ifdef __FreeBSD__ -+# include <machine/sysarch.h> -+# endif -+#else - # include <machine/sysarch.h> - #endif - #include "xf86Axp.h" -@@ -51,6 +54,8 @@ - #define MAP_FAILED ((caddr_t)-1) - #endif - -+axpDevice bsdGetAXP(void); -+ - #ifndef __NetBSD__ - extern unsigned long dense_base(void); - -@@ -260,10 +265,10 @@ - #endif /* __OpenBSD__ */ - - xf86ErrorF("\tlinear framebuffer access unavailable\n"); -+#endif - } - useDevMem = FALSE; - return; --#endif - } - - void -@@ -475,7 +480,7 @@ +$FreeBSD: /tmp/pcvs/ports/x11-servers/XFree86-4-Server/files/Attic/patch-alpha_video.c,v 1.3 2004-08-10 01:29:21 marcus Exp $ + +--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Feb 25 11:04:10 2004 ++++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Feb 25 11:04:50 2004 +@@ -483,7 +483,7 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset); #ifdef __FreeBSD__ diff --git a/x11-servers/XFree86-4-Server/files/patch-bsd-Imakefile b/x11-servers/XFree86-4-Server/files/patch-bsd-Imakefile deleted file mode 100644 index e37b4bc833c6..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bsd-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig Tue Jul 15 20:29:18 2003 -+++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Tue Jul 15 20:29:20 2003 -@@ -150,6 +150,9 @@ - #elif defined(Sparc64Architecture) - VIDEO_SRC = sparc64_video.c - VIDEO_OBJ = sparc64_video.o -+#elif defined(x86_64Architecture) -+VIDEO_SRC = i386_video.c -+VIDEO_OBJ = i386_video.o - #else - #error Unknown architecture ! - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c b/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c deleted file mode 100644 index 34da14506316..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Wed May 22 14:38:29 2002 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Wed Jun 4 19:00:15 2003 -@@ -19,5 +19,5 @@ - #ifdef INCLUDE_XF86_NO_DOMAIN - --#if defined(__alpha__) || defined(__sparc64__) -+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) - - resPtr diff --git a/x11-servers/XFree86-4-Server/files/patch-bsd_Imakefile b/x11-servers/XFree86-4-Server/files/patch-bsd_Imakefile deleted file mode 100644 index 961c53dac7bd..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bsd_Imakefile +++ /dev/null @@ -1,16 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig Thu May 15 18:39:39 2003 -+++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Thu May 15 18:40:42 2003 -@@ -45,10 +45,10 @@ - IOPERM_SRC = ioperm_noop.c - IOPERM_OBJ = ioperm_noop.o - # endif --#elif defined(FreeBSDArchitecture) && !defined(AlphaBsdArchitecture) -+#elif defined(FreeBSDArchitecture) -+# if defined(i386Architecture) || defined(x86_64Architecture) - IOPERMDEFINES = -DUSE_DEV_IO --#else --# if defined(AlphaBsdArchitecture) -+# elif defined(AlphaBsdArchitecture) - IOPERMDEFINES = -DUSE_ALPHA_PORTS - # else - IOPERM_SRC = ioperm_noop.c diff --git a/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile b/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile deleted file mode 100644 index 693bcf59410a..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile Sun Feb 23 12:26:49 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Wed Jun 4 19:19:39 2003 -@@ -81,5 +81,5 @@ - PCIDRVROBJ = ix86Pci.o linuxPci.o - --#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) -+#elif defined(FreeBSDArchitecture) && (defined(AlphaArchitecture) || defined(x86_64Architecture)) - - diff --git a/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile b/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile deleted file mode 100644 index 503877315957..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Sun Feb 23 15:26:49 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Fri May 16 14:33:32 2003 -@@ -88,6 +88,15 @@ - PCIDRVRSRC = freebsdPci.c - PCIDRVROBJ = freebsdPci.o - -+#elif defined(FreeBSDArchitecture) && defined(Sparc64Architecture) -+ -+XCOMM Sparc SBUS & PCI drivers -+ -+PCIDRVRSRC = freebsdPci.c -+PCIDRVROBJ = freebsdPci.o -+SBUSDRVSRC = Sbus.c -+SBUSDRVOBJ = Sbus.o -+ - #elif defined(NetBSDArchitecture) && defined(AlphaArchitecture) - - XCOMM Alpha (NetBSD) PCI driver diff --git a/x11-servers/XFree86-4-Server/files/patch-compiler.h b/x11-servers/XFree86-4-Server/files/patch-compiler.h deleted file mode 100644 index 2cbe5f847ea2..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-compiler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/compiler.h.orig Thu May 15 14:49:26 2003 -+++ programs/Xserver/hw/xfree86/common/compiler.h Thu May 15 14:50:07 2003 -@@ -514,7 +514,7 @@ - return ret; - } - --# elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__)) && defined(__sparc__) -+# elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__) - - # if !defined(Lynx) - # ifndef ASI_PL diff --git a/x11-servers/XFree86-4-Server/files/patch-elfloader.c b/x11-servers/XFree86-4-Server/files/patch-elfloader.c deleted file mode 100644 index 8b12a697405f..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-elfloader.c +++ /dev/null @@ -1,70 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Fri Jan 24 12:26:35 2003 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c Tue May 20 15:18:44 2003 -@@ -1150,6 +1150,7 @@ - #endif - #if defined(__sparc__) - unsigned char *dest8; /* address of the 8 bit place being modified */ -+ unsigned long *dest64; - #endif - #if defined(__alpha__) - unsigned int *dest32h; /* address of the high 32 bit place being modified */ -@@ -1960,7 +1961,6 @@ - break; - - case R_SPARC_32: /* 3 */ -- case R_SPARC_GLOB_DAT: /* 20 */ - case R_SPARC_UA32: /* 23 */ - dest32 = (unsigned int *)(secp + rel->r_offset); - symval += rel->r_addend; -@@ -1970,29 +1970,36 @@ - ((unsigned char *)dest32)[3] = (unsigned char)(symval ); - break; - -+ case R_SPARC_GLOB_DAT: /* 20 */ -+ case R_SPARC_64: /* 32 */ -+ dest64 = (unsigned long *)(secp + rel->r_offset); -+ symval += rel->r_addend; -+ *dest64 = symval; -+ break; -+ - case R_SPARC_DISP8: /* 4 */ - dest8 = (unsigned char *)(secp + rel->r_offset); - symval += rel->r_addend; -- *dest8 = (symval - (Elf32_Addr) dest8); -+ *dest8 = (symval - (Elf_Addr) dest8); - break; - - case R_SPARC_DISP16: /* 5 */ - dest16 = (unsigned short *)(secp + rel->r_offset); - symval += rel->r_addend; -- *dest16 = (symval - (Elf32_Addr) dest16); -+ *dest16 = (symval - (Elf_Addr) dest16); - break; - - case R_SPARC_DISP32: /* 6 */ - dest32 = (unsigned int *)(secp + rel->r_offset); - symval += rel->r_addend; -- *dest32 = (symval - (Elf32_Addr) dest32); -+ *dest32 = (symval - (Elf_Addr) dest32); - break; - - case R_SPARC_WDISP30: /* 7 */ - dest32 = (unsigned int *)(secp + rel->r_offset); - symval += rel->r_addend; - *dest32 = ((*dest32 & 0xc0000000) | -- ((symval - (Elf32_Addr) dest32) >> 2)); -+ (((symval - (Elf_Addr) dest32) >> 2) & 0x3fffffff)); - break; - - case R_SPARC_HI22: /* 9 */ -@@ -2038,8 +2045,8 @@ - break; - - case R_SPARC_RELATIVE: /* 22 */ -- dest32 = (unsigned int *)(secp + rel->r_offset); -- *dest32 += (unsigned int)secp + rel->r_addend; -+ dest64 = (unsigned long *)(secp + rel->r_offset); -+ *dest64 = (unsigned long)secp + rel->r_addend; - break; - #endif /*__sparc__*/ - #ifdef __ia64__ diff --git a/x11-servers/XFree86-4-Server/files/patch-freebsdPci.c b/x11-servers/XFree86-4-Server/files/patch-freebsdPci.c deleted file mode 100644 index 58b4c940474a..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-freebsdPci.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c.orig Thu May 15 18:53:48 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c Thu May 15 18:54:24 2003 -@@ -84,7 +84,7 @@ - /* bridge */ NULL - }; - --#if !defined(__OpenBSD__) -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) - #if X_BYTE_ORDER == X_BIG_ENDIAN - #ifdef __sparc__ - #ifndef ASI_PL diff --git a/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c b/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c deleted file mode 100644 index 91fa2471a90f..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/font/FreeType/ftfuncs.c~ 2003-02-13 06:01:45.000000000 +0300 -+++ lib/font/FreeType/ftfuncs.c 2003-03-04 20:27:16.000000000 +0300 -@@ -959,11 +959,11 @@ - int underlinePosition, underlineThickness; - - if(post) { -- underlinePosition = TRANSFORM_FUNITS_Y(post->underlinePosition); -+ underlinePosition = TRANSFORM_FUNITS_Y(-post->underlinePosition); - underlineThickness = TRANSFORM_FUNITS_Y(post->underlineThickness); - } else { - underlinePosition = -- TRANSFORM_FUNITS_Y(t1info->underline_position); -+ TRANSFORM_FUNITS_Y(-t1info->underline_position); - underlineThickness = - TRANSFORM_FUNITS_Y(t1info->underline_thickness); - }
\ No newline at end of file diff --git a/x11-servers/XFree86-4-Server/files/patch-int10-generic.c b/x11-servers/XFree86-4-Server/files/patch-int10-generic.c deleted file mode 100644 index 3840a5bcd28b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-int10-generic.c +++ /dev/null @@ -1,39 +0,0 @@ -Index: programs/Xserver/hw/xfree86/int10/generic.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/hw/xfree86/int10/generic.c,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -u -r1.25 -r1.26 ---- programs/Xserver/hw/xfree86/int10/generic.c 4 Apr 2002 14:05:51 -0000 1.25 -+++ programs/Xserver/hw/xfree86/int10/generic.c 20 Mar 2003 15:11:26 -0000 1.26 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.23 2001/05/28 14:21:56 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.25tsi Exp $ */ - /* - * XFree86 int10 module - * execute BIOS int 10h calls in x86 real mode environment -@@ -108,7 +108,7 @@ - MapVRam(pInt); - #ifdef _PC - if (!sysMem) -- sysMem = xf86MapVidMem(screen, VIDMEM_FRAMEBUFFER, V_BIOS, -+ sysMem = xf86MapVidMem(screen, VIDMEM_MMIO, V_BIOS, - BIOS_SIZE + SYS_BIOS - V_BIOS); - INTPriv(pInt)->sysMem = sysMem; - -@@ -446,12 +446,14 @@ - #define OFF(addr) ((addr) & 0xffff) - #if defined _PC - # define HIGH_OFFSET (INTPriv(pInt)->highMemory) -+# define HIGH_BASE V_BIOS - #else - # define HIGH_OFFSET SYS_BIOS -+# define HIGH_BASE SYS_BIOS - #endif - # define SYS(addr) ((addr) >= HIGH_OFFSET) - #define V_ADDR(addr) \ -- (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_OFFSET) \ -+ (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_BASE) \ - : (((char*)(INTPriv(pInt)->base) + addr))) - #define VRAM_ADDR(addr) (addr - V_RAM) - #define VRAM_BASE (INTPriv(pInt)->vRam) diff --git a/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c b/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c deleted file mode 100644 index f299cdbdffa0..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fri Feb 21 22:00:39 2003 -+++ programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Wed Jun 4 18:55:45 2003 -@@ -481,5 +481,5 @@ - if (flags & XF86_MAP_SHARED) f |= MAP_SHARED; - if (flags & XF86_MAP_PRIVATE) f |= MAP_PRIVATE; --#ifdef __x86_64__ -+#if defined(__x86_64__) && defined(linux) - if (flags & XF86_MAP_32BIT) f |= MAP_32BIT; - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile b/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile deleted file mode 100644 index 628c842478e5..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/Imakefile Wed Feb 26 15:32:12 2003 -+++ programs/Xserver/hw/xfree86/loader/Imakefile Wed Jun 4 19:14:55 2003 -@@ -35,5 +35,5 @@ - #endif - --#if defined (x86_64Architecture) -+#if defined (x86_64Architecture) && defined(linux) - ARCHDEFINES = -DDoMMAPedMerge -DMmapPageAlign - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c b/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c deleted file mode 100644 index 99fae89aa17e..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/elfloader.c Fri Jan 24 09:26:35 2003 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c Wed Jun 4 19:12:09 2003 -@@ -74,5 +74,5 @@ - # error No MAP_ANON? - # endif --# if !defined (__x86_64__) -+# if !defined (__x86_64__) || !defined(__linux__) - # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON) - # else diff --git a/x11-servers/XFree86-4-Server/files/patch-loader.c b/x11-servers/XFree86-4-Server/files/patch-loader.c deleted file mode 100644 index 23acde46016b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-loader.c +++ /dev/null @@ -1,20 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loader.c.orig Thu May 15 19:50:47 2003 -+++ programs/Xserver/hw/xfree86/loader/loader.c Thu May 15 19:51:35 2003 -@@ -88,7 +88,7 @@ - static int refCount[MAX_HANDLE] ; - #endif - --#if defined(__sparc__) && defined(__GNUC__) -+#if defined(__sparc__) && defined(__GNUC__) && !defined(__FreeBSD__) - # define SYMFUNCDOT(func) { "." #func, (funcptr)&__sparc_dot_ ## func }, - # if !defined(__OpenBSD__) - # define SYMFUNCDOT89(func) { "." #func, (funcptr)&func ## _sparcv89 }, -@@ -298,7 +298,7 @@ - LoaderAddSymbols(-1, -1, dixLookupTab ) ; - LoaderAddSymbols(-1, -1, fontLookupTab ) ; - LoaderAddSymbols(-1, -1, extLookupTab ); --#ifdef __sparc__ -+#if defined(__sparc__) && !defined(__FreeBSD__) - #ifdef linux - if (sparcUseHWMulDiv()) - LoaderAddSymbols(-1, -1, SparcV89LookupTab ) ; diff --git a/x11-servers/XFree86-4-Server/files/patch-mga_dri.c b/x11-servers/XFree86-4-Server/files/patch-mga_dri.c deleted file mode 100644 index ea1a8da4d83c..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-mga_dri.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c -=================================================================== -RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v -retrieving revision 1.50 -retrieving revision 1.51 -diff -u -u -r1.50 -r1.51 ---- programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 25 Mar 2003 11:20:38 -0000 1.50 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 5 Apr 2003 04:00:25 -0000 1.51 -@@ -1359,6 +1359,7 @@ - if (pMga->irq) { - drmCtlUninstHandler(pMga->drmFD); - pMga->irq = 0; -+ pMga->reg_ien = 0; - } - - /* Cleanup DMA */ diff --git a/x11-servers/XFree86-4-Server/files/patch-mga_driver.c b/x11-servers/XFree86-4-Server/files/patch-mga_driver.c deleted file mode 100644 index 13228b270c5b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-mga_driver.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Wed Jan 29 11:29:49 2003 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Mar 13 00:12:12 2003 -@@ -304,7 +304,10 @@ - "drmAgpVendorId", - "drmCommandNone", - "drmCommandWrite", -+ "drmCtlInstHandler", -+ "drmCtlUninstHandler", - "drmFreeVersion", -+ "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", diff --git a/x11-servers/XFree86-4-Server/files/patch-nv_driver.c b/x11-servers/XFree86-4-Server/files/patch-nv_driver.c deleted file mode 100644 index 6b0ad1d3e495..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-nv_driver.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v -retrieving revision 1.103 -retrieving revision 1.104 -diff -u -u -r1.103 -r1.104 ---- programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c 18 Mar 2003 22:23:30 -0000 1.103 -+++ programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c 19 Mar 2003 18:02:49 -0000 1.104 -@@ -181,6 +181,7 @@ - */ - - static const char *vgahwSymbols[] = { -+ "vgaHWUnmapMem", - "vgaHWDPMSSet", - "vgaHWFreeHWRec", - "vgaHWGetHWRec", diff --git a/x11-servers/XFree86-4-Server/files/patch-nv_setup.c b/x11-servers/XFree86-4-Server/files/patch-nv_setup.c deleted file mode 100644 index ff3ee569a4fd..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-nv_setup.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v -retrieving revision 1.28 -retrieving revision 1.29 -diff -u -u -r1.28 -r1.29 ---- programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c 12 Mar 2003 21:27:18 -0000 1.28 -+++ programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c 4 Apr 2003 00:18:50 -0000 1.29 -@@ -24,7 +24,7 @@ - /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen - <jpaana@s2.org> */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.27 2003/02/10 23:42:51 mvojkovi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.28 2003/03/12 21:27:18 mvojkovi Exp $ */ - - #include "nv_include.h" - -@@ -424,6 +424,9 @@ - break; - } - -+ if(pNv->riva.Architecture == 3) -+ pNv->riva.PCRTC0 = pNv->riva.PGRAPH; -+ - if(pNv->SecondCRTC) { - pNv->riva.PCIO = pNv->riva.PCIO0 + 0x2000; - pNv->riva.PCRTC = pNv->riva.PCRTC0 + 0x800; -@@ -492,7 +495,6 @@ - frameBase+0x00C00000, 0x00008000); - - NVCommonSetup(pScrn); -- pNv->riva.PCRTC = pNv->riva.PCRTC0 = pNv->riva.PGRAPH; - } - - void diff --git a/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile b/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile deleted file mode 100644 index 5ca4d30ccf34..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Mon Feb 17 12:06:45 2003 -+++ programs/Xserver/hw/xfree86/os-support/Imakefile Thu May 15 16:51:46 2003 -@@ -13,6 +13,7 @@ - #if defined(i386Architecture) || defined(ia64Architecture) || \ - (defined(SunArchitecture) && defined(SparcArchitecture)) || \ - (defined(FreeBSDArchitecture) && defined(AlphaArchitecture)) || \ -+ (defined(FreeBSDArchitecture) && defined(Sparc64Architecture)) || \ - (defined(NetBSDArchitecture) && defined(AlphaArchitecture)) || \ - (defined(NetBSDArchitecture) && defined(PpcArchitecture)) || \ - (defined(NetBSDArchitecture) && defined(SparcArchitecture)) || \ diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile new file mode 100644 index 000000000000..d004ae77d6f4 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 ++++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 +@@ -160,7 +160,7 @@ + LinkSourceFile(modinit.h,extmod) + + #if BuildXCSecurity && InstallSecurityConfig +-InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) ++InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-Server,$(SERVERCONFIGDIR)) + #endif + + DependTarget() diff --git a/x11-servers/XFree86-4-Server/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server/files/patch-r128_driver.c deleted file mode 100644 index 6274de047f4e..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-r128_driver.c +++ /dev/null @@ -1,30 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Tue Feb 18 17:19:41 2003 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Thu Mar 13 00:12:12 2003 -@@ -275,6 +275,7 @@ - "drmAddMap", - "drmAgpAcquire", - "drmAgpAlloc", -+ "drmAgpBase", - "drmAgpBind", - "drmAgpDeviceId", - "drmAgpEnable", -@@ -288,8 +289,11 @@ - "drmCommandRead", - "drmCommandWrite", - "drmCommandWriteRead", -+ "drmCtlInstHandler", -+ "drmCtlUninstHandler", - "drmFreeBufs", - "drmFreeVersion", -+ "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", -@@ -307,6 +311,7 @@ - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", -+ "DRIGetDeviceInfo", - "DRIGetSAREAPrivate", - "DRILock", - "DRIQueryVersion", diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_cursor.c b/x11-servers/XFree86-4-Server/files/patch-radeon_cursor.c deleted file mode 100644 index 3d131171006e..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_cursor.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c,v -retrieving revision 1.23 -diff -p -u -r1.23 radeon_cursor.c ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c 2003/02/24 20:34:55 1.23 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c 2003/04/03 01:19:29 -@@ -370,7 +370,7 @@ static void RADEONLoadCursorARGB (ScrnIn - } - - if (info->IsSecondary || info->Clone) { -- save2 = INREG(RADEON_CRTC_GEN_CNTL) & ~(CARD32) (3 << 20); -+ save2 = INREG(RADEON_CRTC2_GEN_CNTL) & ~(CARD32) (3 << 20); - save2 |= (CARD32) (2 << 20); - OUTREG(RADEON_CRTC2_GEN_CNTL, save2 & (CARD32)~RADEON_CRTC2_CUR_EN); - } diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_dri.c b/x11-servers/XFree86-4-Server/files/patch-radeon_dri.c deleted file mode 100644 index 5bc369808bf6..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_dri.c +++ /dev/null @@ -1,15 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v -retrieving revision 1.32 -diff -p -u -r1.32 radeon_dri.c ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003/02/19 09:17:30 1.32 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003/03/17 01:43:24 -@@ -1585,6 +1585,7 @@ void RADEONDRICloseScreen(ScreenPtr pScr - if (info->irq) { - drmCtlUninstHandler(info->drmFD); - info->irq = 0; -+ info->ModeReg.gen_int_cntl = 0; - } - - /* De-allocate vertex buffers */ diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c b/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c new file mode 100644 index 000000000000..70d910dd4cba --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c @@ -0,0 +1,186 @@ +Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c +=================================================================== +RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v +retrieving revision 1.118 +retrieving revision 1.119 +diff -u -u -r1.118 -r1.119 +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 26 Feb 2004 04:25:29 -0000 1.118 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 3 Mar 2004 18:11:43 -0000 1.119 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.118 2004/02/26 04:25:29 martin Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.119 2004/03/03 18:11:43 dawes Exp $ */ + /* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. +@@ -7031,12 +7031,79 @@ + RADEONFreeRec(pScrn); + } + ++/* ++ * Powering done DAC, needed for DPMS problem with ViewSonic P817 (or its variant). ++ * ++ * Note for current DAC mapping when calling this function: ++ * For most of cards: ++ * single CRT: Driver doesn't change the existing CRTC->DAC mapping, ++ * CRTC1 could be driving either DAC or both DACs. ++ * CRT+CRT: CRTC1->TV DAC, CRTC2->Primary DAC ++ * DFP/LCD+CRT: CRTC2->TV DAC, CRTC2->Primary DAC. ++ * Some boards have two DACs reversed or don't even have a primary DAC, ++ * this is reflected in pRADEONEnt->ReversedDAC. And radeon 7200 doesn't ++ * have a second DAC. ++ * It's kind of messy, we'll need to redo DAC mapping part some day. ++ */ ++static void RADEONDacPowerSet(ScrnInfoPtr pScrn, Bool IsOn, Bool IsPrimaryDAC) ++{ ++ RADEONInfoPtr info = RADEONPTR(pScrn); ++ unsigned char *RADEONMMIO = info->MMIO; ++ ++ if (IsPrimaryDAC) { ++ CARD32 dac_cntl; ++ CARD32 dac_macro_cntl = 0; ++ dac_cntl = INREG(RADEON_DAC_CNTL); ++ if ((!info->IsMobility) || (info->ChipFamily == CHIP_FAMILY_RV350)) ++ dac_macro_cntl = INREG(RADEON_DAC_MACRO_CNTL); ++ if (IsOn) { ++ dac_cntl &= ~RADEON_DAC_PDWN; ++ dac_macro_cntl &= ~(RADEON_DAC_PDWN_R | ++ RADEON_DAC_PDWN_G | ++ RADEON_DAC_PDWN_B); ++ } else { ++ dac_cntl |= RADEON_DAC_PDWN; ++ dac_macro_cntl |= (RADEON_DAC_PDWN_R | ++ RADEON_DAC_PDWN_G | ++ RADEON_DAC_PDWN_B); ++ } ++ OUTREG(RADEON_DAC_CNTL, dac_cntl); ++ if ((!info->IsMobility) || (info->ChipFamily == CHIP_FAMILY_RV350)) ++ OUTREG(RADEON_DAC_MACRO_CNTL, dac_macro_cntl); ++ } else { ++ if (info->ChipFamily != CHIP_FAMILY_R200) { ++ CARD32 tv_dac_cntl = INREG(RADEON_TV_DAC_CNTL); ++ if (IsOn) { ++ tv_dac_cntl &= ~(RADEON_TV_DAC_RDACPD | ++ RADEON_TV_DAC_GDACPD | ++ RADEON_TV_DAC_BDACPD | ++ RADEON_TV_DAC_BGSLEEP); ++ } else { ++ tv_dac_cntl |= (RADEON_TV_DAC_RDACPD | ++ RADEON_TV_DAC_GDACPD | ++ RADEON_TV_DAC_BDACPD | ++ RADEON_TV_DAC_BGSLEEP); ++ } ++ OUTREG(RADEON_TV_DAC_CNTL, tv_dac_cntl); ++ } else { ++ CARD32 fp2_gen_cntl = INREG(RADEON_FP2_GEN_CNTL); ++ if (IsOn) { ++ fp2_gen_cntl |= RADEON_FP2_DV0_EN; ++ } else { ++ fp2_gen_cntl &= ~RADEON_FP2_DV0_EN; ++ } ++ OUTREG(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); ++ } ++ } ++} ++ + /* Sets VESA Display Power Management Signaling (DPMS) Mode */ + static void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, + int PowerManagementMode, + int flags) + { + RADEONInfoPtr info = RADEONPTR(pScrn); ++ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); + unsigned char *RADEONMMIO = info->MMIO; + + #ifdef XF86DRI +@@ -7055,8 +7122,6 @@ + RADEON_CRTC2_VSYNC_DIS | + RADEON_CRTC2_HSYNC_DIS); + +- /* TODO: additional handling for LCD ? */ +- + switch (PowerManagementMode) { + case DPMSModeOn: + /* Screen: On; HSync: On, VSync: On */ +@@ -7123,13 +7188,19 @@ + if (info->ChipFamily >= CHIP_FAMILY_R200) { + OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); + } ++ } else if (info->DisplayType == MT_CRT) { ++ RADEONDacPowerSet(pScrn, TRUE, !pRADEONEnt->ReversedDAC); + } + } else { +- if ((info->Clone) && (info->CloneType == MT_DFP)) { +- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_BLANK_EN); +- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_ON, ~RADEON_FP2_ON); +- if (info->ChipFamily >= CHIP_FAMILY_R200) { +- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); ++ if (info->Clone) { ++ if (info->CloneType == MT_DFP) { ++ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_BLANK_EN); ++ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_ON, ~RADEON_FP2_ON); ++ if (info->ChipFamily >= CHIP_FAMILY_R200) { ++ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); ++ } ++ } else if (info->CloneType == MT_CRT) { ++ RADEONDacPowerSet(pScrn, TRUE, !pRADEONEnt->ReversedDAC); + } + } + if (info->DisplayType == MT_DFP) { +@@ -7140,6 +7211,14 @@ + OUTREGP (RADEON_LVDS_GEN_CNTL, RADEON_LVDS_BLON, ~RADEON_LVDS_BLON); + usleep (info->PanelPwrDly * 1000); + OUTREGP (RADEON_LVDS_GEN_CNTL, RADEON_LVDS_ON, ~RADEON_LVDS_ON); ++ } else if (info->DisplayType == MT_CRT) { ++ if ((pRADEONEnt->HasSecondary) || info->Clone) { ++ RADEONDacPowerSet(pScrn, TRUE, pRADEONEnt->ReversedDAC); ++ } else { ++ RADEONDacPowerSet(pScrn, TRUE, TRUE); ++ if (info->HasCRTC2) ++ RADEONDacPowerSet(pScrn, TRUE, FALSE); ++ } + } + } + } else if ((PowerManagementMode == DPMSModeOff) || +@@ -7152,13 +7231,19 @@ + if (info->ChipFamily >= CHIP_FAMILY_R200) { + OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); + } ++ } else if (info->DisplayType == MT_CRT) { ++ RADEONDacPowerSet(pScrn, FALSE, !pRADEONEnt->ReversedDAC); + } + } else { +- if ((info->Clone) && (info->CloneType == MT_DFP)) { +- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_BLANK_EN, ~RADEON_FP2_BLANK_EN); +- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_ON); +- if (info->ChipFamily >= CHIP_FAMILY_R200) { +- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); ++ if (info->Clone) { ++ if(info->CloneType == MT_DFP) { ++ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_BLANK_EN, ~RADEON_FP2_BLANK_EN); ++ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_ON); ++ if (info->ChipFamily >= CHIP_FAMILY_R200) { ++ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); ++ } ++ } else if (info->CloneType == MT_CRT) { ++ RADEONDacPowerSet(pScrn, FALSE, !pRADEONEnt->ReversedDAC); + } + } + if (info->DisplayType == MT_DFP) { +@@ -7179,6 +7264,17 @@ + if (info->IsMobility || info->IsIGP) { + OUTPLL(RADEON_PIXCLKS_CNTL, tmpPixclksCntl); + } ++ } else if (info->DisplayType == MT_CRT) { ++ if ((pRADEONEnt->HasSecondary) || info->Clone) { ++ RADEONDacPowerSet(pScrn, FALSE, pRADEONEnt->ReversedDAC); ++ } else { ++ /* single CRT, turning both DACs off, we don't really know ++ * which DAC is actually connected. ++ */ ++ RADEONDacPowerSet(pScrn, FALSE, TRUE); ++ if (info->HasCRTC2) /* don't apply this to old radeon (singel CRTC) card */ ++ RADEONDacPowerSet(pScrn, FALSE, FALSE); ++ } + } + } + } diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h b/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h index 7131c938ac1c..c8a912487b43 100644 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h +++ b/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h @@ -1,11 +1,31 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h.orig Fri Feb 7 10:08:59 2003 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h Sat Apr 26 01:10:10 2003 -@@ -879,7 +879,7 @@ - # define RADEON_P2PLL_REF_DIV_MASK 0x03ff - # define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */ - # define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */ --# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff < 18) -+# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff << 18) - # define R300_PPLL_REF_DIV_ACC_SHIFT 18 - #define RADEON_PALETTE_DATA 0x00b4 - #define RADEON_PALETTE_30_DATA 0x00b8 +Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h +=================================================================== +RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v +retrieving revision 1.32 +retrieving revision 1.33 +diff -u -u -r1.32 -r1.33 +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 19 Feb 2004 22:38:12 -0000 1.32 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 3 Mar 2004 18:11:45 -0000 1.33 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.32 2004/02/19 22:38:12 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.33 2004/03/03 18:11:45 dawes Exp $ */ + /* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. +@@ -401,11 +401,16 @@ + # define RADEON_DAC_FORCE_DATA_SEL_MASK (3 << 6) + # define RADEON_DAC_FORCE_DATA_MASK 0x0003ff00 + # define RADEON_DAC_FORCE_DATA_SHIFT 8 ++#define RADEON_DAC_MACRO_CNTL 0x0d04 ++# define RADEON_DAC_PDWN_R (1 << 16) ++# define RADEON_DAC_PDWN_G (1 << 17) ++# define RADEON_DAC_PDWN_B (1 << 18) + #define RADEON_TV_DAC_CNTL 0x088c + # define RADEON_TV_DAC_STD_MASK 0x0300 + # define RADEON_TV_DAC_RDACPD (1 << 24) + # define RADEON_TV_DAC_GDACPD (1 << 25) + # define RADEON_TV_DAC_BDACPD (1 << 26) ++# define RADEON_TV_DAC_BGSLEEP (1 << 26) + #define RADEON_DISP_HW_DEBUG 0x0d14 + # define RADEON_CRT2_DISP1_SEL (1 << 5) + #define RADEON_DISP_OUTPUT_CNTL 0x0d64 diff --git a/x11-servers/XFree86-4-Server/files/patch-savage-pci-id b/x11-servers/XFree86-4-Server/files/patch-savage-pci-id deleted file mode 100644 index f7396543d878..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-savage-pci-id +++ /dev/null @@ -1,87 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500 -@@ -457,21 +457,34 @@ - #define PCI_CHIP_TRIO64V2_DXGX 0x8901 - #define PCI_CHIP_PLATO_PX 0x8902 - #define PCI_CHIP_Trio3D 0x8904 --#define PCI_CHIP_Trio3D_2X 0x8A13 - #define PCI_CHIP_VIRGE_DXGX 0x8A01 - #define PCI_CHIP_VIRGE_GX2 0x8A10 -+#define PCI_CHIP_Trio3D_2X 0x8A13 - #define PCI_CHIP_SAVAGE3D 0x8A20 - #define PCI_CHIP_SAVAGE3D_MV 0x8A21 - #define PCI_CHIP_SAVAGE4 0x8A22 --#define PCI_CHIP_VIRGE_MX 0x8C01 --#define PCI_CHIP_VIRGE_MXPLUS 0x8C01 --#define PCI_CHIP_VIRGE_MXP 0x8C03 - #define PCI_CHIP_PROSAVAGE_PM 0x8A25 - #define PCI_CHIP_PROSAVAGE_KM 0x8A26 -+#define PCI_CHIP_VIRGE_MX 0x8C01 -+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 -+#define PCI_CHIP_VIRGE_MXP 0x8C03 - #define PCI_CHIP_SAVAGE_MX_MV 0x8C10 - #define PCI_CHIP_SAVAGE_MX 0x8C11 - #define PCI_CHIP_SAVAGE_IX_MV 0x8C12 - #define PCI_CHIP_SAVAGE_IX 0x8C13 -+#define PCI_CHIP_SUPSAV_MX128 0x8C22 -+#define PCI_CHIP_SUPSAV_MX64 0x8C24 -+#define PCI_CHIP_SUPSAV_MX64C 0x8C26 -+#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A -+#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B -+#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C -+#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D -+#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E -+#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F -+#define PCI_CHIP_S3TWISTER_P 0x8D01 -+#define PCI_CHIP_S3TWISTER_K 0x8D02 -+#define PCI_CHIP_PROSAVAGE_DDR 0x8D03 -+#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04 - #define PCI_CHIP_SAVAGE2000 0x9102 - - /* ARK Logic */ ---- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500 -+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500 -@@ -3,30 +3,6 @@ - #ifndef _SAVAGE_REGS_H - #define _SAVAGE_REGS_H - --/* These are here until xf86PciInfo.h is updated. */ -- --#ifndef PCI_CHIP_S3TWISTER_P --#define PCI_CHIP_S3TWISTER_P 0x8d01 --#endif --#ifndef PCI_CHIP_S3TWISTER_K --#define PCI_CHIP_S3TWISTER_K 0x8d02 --#endif --#ifndef PCI_CHIP_SUPSAV_MX128 --#define PCI_CHIP_SUPSAV_MX128 0x8c22 --#define PCI_CHIP_SUPSAV_MX64 0x8c24 --#define PCI_CHIP_SUPSAV_MX64C 0x8c26 --#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a --#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b --#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c --#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d --#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e --#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f --#endif --#ifndef PCI_CHIP_PROSAVAGE_DDR --#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 --#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 --#endif -- - #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) - - #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE)) ---- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500 -+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500 -@@ -123,8 +123,8 @@ - { PCI_CHIP_SAVAGE_IX, "Savage/IX" }, - { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" }, - { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" }, -- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" }, -- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" }, -+ { PCI_CHIP_S3TWISTER_P, "Twister PN133" }, -+ { PCI_CHIP_S3TWISTER_K, "Twister KN133" }, - { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" }, - { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" }, - { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" }, diff --git a/x11-servers/XFree86-4-Server/files/patch-smi b/x11-servers/XFree86-4-Server/files/patch-smi deleted file mode 100644 index 2c17234d8377..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-smi +++ /dev/null @@ -1,40 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c.orig Wed Feb 5 09:45:29 2003 -+++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c Fri May 2 03:09:24 2003 -@@ -1410,7 +1410,7 @@ - ENTER_PROC("SMI_Save"); - - /* Save the standard VGA registers */ -- vgaHWSave(pScrn, vgaSavePtr, VGA_SR_MODE); -+ vgaHWSave(pScrn, vgaSavePtr, VGA_SR_ALL); - save->smiDACMask = VGAIN8(pSmi, VGA_DAC_MASK); - VGAOUT8(pSmi, VGA_DAC_READ_ADDR, 0); - for (i = 0; i < 256; i++) -@@ -1601,7 +1601,7 @@ - VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0xA0, restore->SRA0); - - /* Restore the standard VGA registers */ -- vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE); -+ vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL); - if (restore->smiDACMask) - { - VGAOUT8(pSmi, VGA_DAC_MASK, restore->smiDACMask); -@@ -1672,7 +1672,7 @@ - } - - if (restore->modeInit) -- vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE); -+ vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL); - - if (!SMI_LYNXM_SERIES(pSmi->Chipset)) - { ---- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c.orig Sat Jan 11 19:55:49 2003 -+++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c Fri May 2 03:09:24 2003 -@@ -277,7 +277,7 @@ - {XvSettable | XvGettable, 0, 1, XV_INTERLACED_NAME}, - }; - --static XF86AttributeRec SMI_VideoAttributes[N_ATTRS] = { -+static XF86AttributeRec SMI_VideoAttributes[2] = { - {XvSettable | XvGettable, 0, 255, XV_BRIGHTNESS_NAME}, - {XvSettable | XvGettable, 0x000000, 0xFFFFFF, XV_COLORKEY_NAME}, - }; diff --git a/x11-servers/XFree86-4-Server/files/patch-sunffb_Imakefile b/x11-servers/XFree86-4-Server/files/patch-sunffb_Imakefile deleted file mode 100644 index fe16ad9c1cf7..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-sunffb_Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile.orig Mon Sep 16 14:06:01 2002 -+++ programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile Tue May 20 12:25:15 2003 -@@ -49,7 +49,7 @@ - #define FFBsObjectRule(name) @@\ - name.o: name.s @@\ - $(RM) $@ @@\ -- $(CPP) $*.s | $(AS) $(GCCVISOPTION) -o $@ - -+ $(CC) -c -x assembler-with-cpp $(GCCVISOPTION) $*.s -o $@ - #endif - #else - VISOBJS = diff --git a/x11-servers/XFree86-4-Server/files/patch-xc::lib::font::fontfile b/x11-servers/XFree86-4-Server/files/patch-xc::lib::font::fontfile deleted file mode 100644 index def6a519f7c1..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xc::lib::font::fontfile +++ /dev/null @@ -1,185 +0,0 @@ -Index: lib/font/fontfile/dirfile.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/dirfile.c,v -retrieving revision 3.15 -diff -u -r3.15 dirfile.c ---- dirfile.c 31 May 2002 18:45:50 -0000 3.15 -+++ dirfile.c 11 Feb 2004 21:17:20 -0000 -@@ -68,6 +68,9 @@ - - FontDirectoryPtr dir = NullFontDirectory; - -+ if (strlen(directory) + 1 + sizeof(FontDirFile) > sizeof(dir_file)) -+ return BadFontPath; -+ - #ifdef FONTDIRATTRIB - /* Check for font directory attributes */ - #ifndef __UNIXOS2__ -@@ -154,6 +157,9 @@ - char dir_file[MAXFONTFILENAMELEN]; - struct stat statb; - -+ if (strlen(dir->directory) + sizeof(FontDirFile) > sizeof(dir_file)) -+ return FALSE; -+ - strcpy (dir_file, dir->directory); - strcat (dir_file, FontDirFile); - if (stat (dir_file, &statb) == -1) -@@ -202,6 +208,8 @@ - continue; - - len = strlen (fileName) - renderer->fileSuffixLen; -+ if (len >= sizeof(copy)) -+ continue; - CopyISOLatin1Lowered (copy, fileName, len); - copy[len] = '\0'; - name.name = copy; -@@ -251,9 +259,13 @@ - int status = Successful; - struct stat statb; - -+ if (strlen(directory) >= sizeof(alias_file)) -+ return BadFontPath; - dir = *pdir; - strcpy(alias_file, directory); - if (!isFile) { -+ if (strlen(directory) + 1 + sizeof(FontAliasFile) > sizeof(alias_file)) -+ return BadFontPath; - if (directory[strlen(directory) - 1] != '/') - strcat(alias_file, "/"); - strcat(alias_file, FontAliasFile); -@@ -286,6 +298,10 @@ - status = AllocError; - break; - case NAME: -+ if (strlen(lexToken) >= sizeof(alias)) { -+ status = BadFontPath; -+ break; -+ } - strcpy(alias, lexToken); - token = lexAlias(file, &lexToken); - switch (token) { -@@ -302,6 +318,10 @@ - status = AllocError; - break; - case NAME: -+ if (strlen(lexToken) >= sizeof(font_name)) { -+ status = BadFontPath; -+ break; -+ } - CopyISOLatin1Lowered(alias, alias, strlen(alias)); - CopyISOLatin1Lowered(font_name, lexToken, strlen(lexToken)); - if (!FontFileAddFontAlias (dir, alias, font_name)) -Index: lib/font/fontfile/encparse.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/encparse.c,v -retrieving revision 1.18 -diff -u -r1.18 encparse.c ---- encparse.c 2 Nov 2001 03:06:40 -0000 1.18 -+++ encparse.c 11 Feb 2004 21:17:20 -0000 -@@ -833,6 +833,7 @@ - char file_name[MAXFONTFILENAMELEN], encoding_name[MAXFONTNAMELEN], - buf[MAXFONTFILENAMELEN]; - int count, n; -+ static char format[24] = ""; - - /* As we don't really expect to open encodings that often, we don't - take the trouble of caching encodings directories. */ -@@ -848,8 +849,12 @@ - } - - encoding = NULL; -+ if (!format[0]) { -+ sprintf(format, "%%%ds %%%d[^\n]\n", sizeof(encoding_name) - 1, -+ sizeof(file_name) - 1); -+ } - for(;;) { -- count = fscanf(file, "%s %[^\n]\n", encoding_name, file_name); -+ count = fscanf(file, format, encoding_name, file_name); - if(count == EOF) - break; - if(count != 2) -Index: lib/font/fontfile/fontfile.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/fontfile.c,v -retrieving revision 3.16 -diff -u -r3.16 fontfile.c ---- fontfile.c 31 May 2002 18:45:50 -0000 3.16 -+++ fontfile.c 11 Feb 2004 21:17:20 -0000 -@@ -424,11 +424,16 @@ - vals.ranges = ranges; - vals.nranges = nranges; - -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->OpenScalable) (fpe, pFont, -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->OpenScalable) (fpe, pFont, - flags, entry, fileName, &vals, format, fmask, - non_cachable_font); -+ } - - /* In case rasterizer does something bad because of - charset subsetting... */ -@@ -497,6 +502,8 @@ - - dir = (FontDirectoryPtr) fpe->private; - bitmap = &entry->u.bitmap; -+ if (strlen(dir->directory) + strlen(bitmap->fileName) >= sizeof(fileName)) -+ return BadFontName; - strcpy (fileName, dir->directory); - strcat (fileName, bitmap->fileName); - ret = (*bitmap->renderer->OpenBitmap) -@@ -530,6 +537,8 @@ - - dir = (FontDirectoryPtr) fpe->private; - bitmap = &entry->u.bitmap; -+ if (strlen(dir->directory) + strlen(bitmap->fileName) >= sizeof(fileName)) -+ return BadFontName; - strcpy (fileName, dir->directory); - strcat (fileName, bitmap->fileName); - ret = (*bitmap->renderer->GetInfoBitmap) (fpe, pFontInfo, entry, fileName); -@@ -891,10 +900,15 @@ - vals.ranges = FontParseRanges(origName, &vals.nranges); - ranges = vals.ranges; - /* Make a new scaled instance */ -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->GetInfoScalable) -- (fpe, *pFontInfo, entry, &tmpName, fileName, &vals); -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->GetInfoScalable) -+ (fpe, *pFontInfo, entry, &tmpName, fileName, &vals); -+ } - if (ranges) xfree(ranges); - } - } -@@ -931,10 +945,15 @@ - bc = &entry->u.bc; - entry = bc->entry; - /* Make a new scaled instance */ -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->GetInfoScalable) -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->GetInfoScalable) - (fpe, *pFontInfo, entry, tmpName, fileName, &bc->vals); -+ } - break; - #endif - default: diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile b/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile deleted file mode 100644 index c5c5c7617849..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile +++ /dev/null @@ -1,21 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/Imakefile.orig Mon Feb 17 12:06:41 2003 -+++ programs/Xserver/hw/xfree86/common/Imakefile Thu May 15 20:17:15 2003 -@@ -18,7 +18,8 @@ - #endif /* GNUMachArchitecture */ - #else - # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) \ -- || defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) -+ || defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) \ -+ || defined(FreeBSDArchitecture) - KBD = xf86KbdBSD - # else - # ifdef LinuxArchitecture -@@ -29,7 +30,7 @@ - # endif - #endif - --#ifdef SparcArchitecture -+#if defined(SparcArchitecture) || defined(Sparc64Architecture) - SBUSSRC = xf86sbusBus.c - SBUSOBJ = xf86sbusBus.o - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86Events.c b/x11-servers/XFree86-4-Server/files/patch-xf86Events.c deleted file mode 100644 index 728c22d9a811..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xf86Events.c +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Wed May 21 14:24:03 2003 -+++ programs/Xserver/hw/xfree86/common/xf86Events.c Wed May 21 14:24:28 2003 -@@ -828,6 +828,7 @@ - } - #endif - -+#ifndef __sparc64__ - /* - * PC keyboards generate separate key codes for - * Alt+Print and Control+Pause but in the X keyboard model -@@ -838,6 +839,7 @@ - scanCode = KEY_Print; - else if (scanCode == KEY_Break) - scanCode = KEY_Pause; -+#endif - - /* - * Now map the scancodes to real X-keycodes ... diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86Sbus.h b/x11-servers/XFree86-4-Server/files/patch-xf86Sbus.h deleted file mode 100644 index c6ac90bc6a21..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xf86Sbus.h +++ /dev/null @@ -1,16 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig Wed May 22 17:38:30 2002 -+++ programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h Fri May 16 15:47:05 2003 -@@ -35,7 +35,13 @@ - #elif defined(__OpenBSD__) && defined(__sparc64__) - /* XXX */ - #elif defined(CSRG_BASED) -+#if defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/fbio.h> -+#include <dev/ofw/openpromio.h> -+#else - #include <machine/fbio.h> -+#endif - #else - #include <sun/fbio.h> - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86sym.c b/x11-servers/XFree86-4-Server/files/patch-xf86sym.c deleted file mode 100644 index 1d30c304c847..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xf86sym.c +++ /dev/null @@ -1,31 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig Wed Feb 26 15:08:02 2003 -+++ programs/Xserver/hw/xfree86/loader/xf86sym.c Wed May 21 08:47:39 2003 -@@ -106,6 +106,14 @@ - extern void* __remqu(long, long); - #endif - -+#if defined(__sparc__) && defined(__FreeBSD__) -+extern float _Qp_qtos(unsigned int *); -+extern double _Qp_qtod(unsigned int *); -+extern unsigned long long _Qp_qtoux(unsigned int *); -+extern void _Qp_dtoq(unsigned int *, double); -+extern void _Qp_uitoq(unsigned int *, unsigned int); -+#endif -+ - #if defined(__GNUC__) - extern long __div64(long, long); - extern long __divdf3(long, long); -@@ -1066,6 +1074,13 @@ - - #ifdef __FreeBSD__ - SYMFUNC(sysctlbyname) -+#if defined(__sparc__) -+ SYMFUNC(_Qp_qtos) -+ SYMFUNC(_Qp_qtod) -+ SYMFUNC(_Qp_qtoux) -+ SYMFUNC(_Qp_uitoq) -+ SYMFUNC(_Qp_dtoq) -+#endif - #endif - - /* diff --git a/x11-servers/XFree86-4-Server/files/patch-xkbInit.c b/x11-servers/XFree86-4-Server/files/patch-xkbInit.c deleted file mode 100644 index 9b65d4c8b948..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xkbInit.c +++ /dev/null @@ -1,17 +0,0 @@ -Index: programs/Xserver/xkb/xkbInit.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/xkb/xkbInit.c,v -retrieving revision 3.26 -retrieving revision 3.27 -diff -u -r3.26 -r3.27 ---- programs/Xserver/xkb/xkbInit.c 9 Feb 2003 06:29:20 -0000 3.26 -+++ programs/Xserver/xkb/xkbInit.c 17 Mar 2003 23:52:27 -0000 3.27 -@@ -713,7 +713,7 @@ - if (names->types) names->types = _XkbDupString(names->types); - if (names->compat) names->compat = _XkbDupString(names->compat); - if (names->geometry) names->geometry = _XkbDupString(names->geometry); -- if (names->symbols) names->geometry = _XkbDupString(names->symbols); -+ if (names->symbols) names->symbols = _XkbDupString(names->symbols); - - if (defs.model && defs.layout && rules) { - XkbComponentNamesRec rNames; diff --git a/x11-servers/XFree86-4-Server/pkg-install b/x11-servers/XFree86-4-Server/pkg-install new file mode 100644 index 000000000000..d62eb7772f13 --- /dev/null +++ b/x11-servers/XFree86-4-Server/pkg-install @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} +SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver + +if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then + cp ${SECCONFDIR}/SecurityPolicy.default-Server \ + ${SECCONFDIR}/SecurityPolicy +fi diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index 2b78984594b1..9e425f930547 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -1,5 +1,7 @@ bin/X bin/XFree86 +bin/getconfig +bin/getconfig.pl bin/gtf %%SPARC64_NA%%bin/inb %%SPARC64_NA%%bin/inl @@ -44,48 +46,49 @@ lib/X11/doc/Install lib/X11/doc/LICENSE lib/X11/doc/README lib/X11/doc/README.DECtga -lib/X11/doc/README.DGA lib/X11/doc/README.DRI lib/X11/doc/README.DRIcomp -%%I386%%lib/X11/doc/README.I128 -%%I386%%lib/X11/doc/README.SiS +lib/X11/doc/README.I128 +lib/X11/doc/README.SiS lib/X11/doc/README.XKB-Config lib/X11/doc/README.XKB-Enhancing -%%I386%%lib/X11/doc/README.apm +lib/X11/doc/README.apm lib/X11/doc/README.ati -%%I386%%lib/X11/doc/README.chips -%%I386%%lib/X11/doc/README.cyrix +lib/X11/doc/README.chips +lib/X11/doc/README.cyrix lib/X11/doc/README.dps lib/X11/doc/README.fonts -%%I386%%lib/X11/doc/README.i740 -%%I386%%lib/X11/doc/README.i810 +lib/X11/doc/README.i740 +lib/X11/doc/README.i810 lib/X11/doc/README.mouse -%%I386%%lib/X11/doc/README.newport +lib/X11/doc/README.newport lib/X11/doc/README.r128 lib/X11/doc/README.rapidaccess -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge +lib/X11/doc/README.rendition +lib/X11/doc/README.s3virge lib/X11/doc/RELNOTES -lib/X11/doc/ServersOnly -lib/X11/doc/Status lib/X11/doc/Versions lib/X11/doc/VideoBoard98 lib/X11/etc/Xinstall.sh lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std -lib/X11/xserver/SecurityPolicy +lib/X11/getconfig/cfg.sample +lib/X11/getconfig/xfree86.cfg +lib/X11/xserver/SecurityPolicy.default-Server lib/modules/codeconv/libARABIC.a lib/modules/codeconv/libARMSCII8.a lib/modules/codeconv/libBIG5.a lib/modules/codeconv/libBIG5HKSCS.a lib/modules/codeconv/libDOSENCODING.a +lib/modules/codeconv/libGB18030.a lib/modules/codeconv/libGB2312.a lib/modules/codeconv/libGBK.a lib/modules/codeconv/libGEORGIAN.a lib/modules/codeconv/libISO8859_1.a lib/modules/codeconv/libISO8859_10.a lib/modules/codeconv/libISO8859_11.a +lib/modules/codeconv/libISO8859_13.a lib/modules/codeconv/libISO8859_14.a lib/modules/codeconv/libISO8859_15.a lib/modules/codeconv/libISO8859_2.a @@ -105,38 +108,40 @@ lib/modules/codeconv/libKSCJOHAB.a lib/modules/codeconv/libMULEENCODING.a lib/modules/codeconv/libTCVN.a lib/modules/codeconv/libVISCII.a -%%I386%%lib/modules/drivers/apm_drv.o -%%I386%%lib/modules/drivers/ark_drv.o +%%AMD64_I386%%lib/modules/drivers/apm_drv.o +%%AMD64_I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o lib/modules/drivers/atimisc_drv.o -%%I386%%lib/modules/drivers/chips_drv.o -%%I386%%lib/modules/drivers/cirrus_alpine.o -%%I386%%lib/modules/drivers/cirrus_drv.o -%%I386%%lib/modules/drivers/cirrus_laguna.o -%%I386%%lib/modules/drivers/cyrix_drv.o +%%AMD64_I386%%lib/modules/drivers/chips_drv.o +%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o +%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o +%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o +%%AMD64_I386%%lib/modules/drivers/cyrix_drv.o %%SPARC64_NA%%lib/modules/drivers/glint_drv.o -%%I386%%lib/modules/drivers/i128_drv.o +%%AMD64_I386%%lib/modules/drivers/i128_drv.o %%I386%%lib/modules/drivers/i740_drv.o %%I386%%lib/modules/drivers/i810_drv.o %%SPARC64_NA%%lib/modules/drivers/mga_drv.o -%%I386%%lib/modules/drivers/neomagic_drv.o +%%AMD64_I386%%lib/modules/drivers/neomagic_drv.o %%I386%%lib/modules/drivers/nsc_drv.o lib/modules/drivers/nv_drv.o lib/modules/drivers/r128_drv.o lib/modules/drivers/radeon_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o +lib/modules/drivers/riva128.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/sis_drv.o +%%AMD64_I386%%lib/modules/drivers/sis_drv.o %%SPARC64%%lib/modules/drivers/sunffb_drv.o %%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o -%%I386%%lib/modules/drivers/trident_drv.o -%%I386%%lib/modules/drivers/tseng_drv.o -%%I386%%lib/modules/drivers/vesa_drv.o +%%AMD64_I386%%lib/modules/drivers/trident_drv.o +%%AMD64_I386%%lib/modules/drivers/tseng_drv.o +%%AMD64_I386%%lib/modules/drivers/vesa_drv.o %%SPARC64_NA%%lib/modules/drivers/vga_drv.o +%%I386%%lib/modules/drivers/via_drv.o %%I386%%lib/modules/drivers/vmware_drv.o lib/modules/extensions/libGLcore.a lib/modules/extensions/libdbe.a @@ -190,5 +195,6 @@ lib/modules/libxf24_32bpp.a lib/modules/libxf4bpp.a lib/modules/libxf8_16bpp.a lib/modules/libxf8_32bpp.a +%%SPARC64%%lib/modules/libxf8_32wid.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_NA%%lib/modules/v20002d.uc diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 62670938544e..8ae97f51887a 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -32,6 +32,8 @@ echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ wacom void citron" >> $LOCALDEF echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF echo "#define BuildXF86DRM NO" >> $LOCALDEF +echo "#define InstSrcDir $WRKDIR/drmsource" >> $LOCALDEF +echo "#define HasGlide3 YES" >> $LOCALDEF # disable some options for i in \ @@ -63,6 +65,7 @@ echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define BuildGLXLibrary YES" >> $LOCALDEF echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF +echo "#define UseInstalledLibraries YES" >> $LOCALDEF echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF echo "#define FreeBSDCC ${CC}" >> $LOCALDEF @@ -80,13 +83,13 @@ cat >> $LOCALDEF <<END #if defined(i386Architecture) # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ + cirrus vmware tseng trident via chips apm \ i128 nsc ati i810 ark cyrix siliconmotion \ vesa vga #elif defined(ia64Architecture) # define XF86CardDrivers mga nv tdfx glint ati vga #elif defined(AlphaArchitecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ +# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \ tdfx savage cirrus ati siliconmotion vga #elif defined(Sparc64Architecture) # define XF86CardDrivers nv ati sunffb diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index 86d887ac8b91..4ab3747a0363 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -6,21 +6,20 @@ # PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.3.0 -PORTREVISION= 4 +PORTVERSION= 4.4.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ +DISTFILES= XFree86-4.4.0-src-1.tgz:x \ + XFree86-4.4.0-src-2.tgz:x \ + XFree86-4.4.0-src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 virtual framebuffer server @@ -32,6 +31,7 @@ RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz MAN1= Xvfb.1 +EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver @@ -41,6 +41,9 @@ post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c +post-install: + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo index 4c3445d29834..edbe3d91944d 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo @@ -1,8 +1,8 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -SIZE (xc/X430src-1.tgz) = 10993622 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -SIZE (xc/X430src-2.tgz) = 7962239 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -SIZE (xc/X430src-3.tgz) = 12366363 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 SIZE (xc/Wraphelp2.gz) = 3376 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile new file mode 100644 index 000000000000..557654663de4 --- /dev/null +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 ++++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 +@@ -160,7 +160,7 @@ + LinkSourceFile(modinit.h,extmod) + + #if BuildXCSecurity && InstallSecurityConfig +-InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) ++InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-VFBServer,$(SERVERCONFIGDIR)) + #endif + + DependTarget() diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install new file mode 100644 index 000000000000..3b7163d6046d --- /dev/null +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} +SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver + +if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then + cp ${SECCONFDIR}/SecurityPolicy.default-VFBServer \ + ${SECCONFDIR}/SecurityPolicy +fi diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist index e31e7c170ff1..e81bbc131be4 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist @@ -1,2 +1,2 @@ bin/Xvfb -lib/X11/xserver/SecurityPolicy +lib/X11/xserver/SecurityPolicy.default-VFBServer |