diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
| commit | ac39221672c3c391a6c127d2fcc67a1fe3d4512e (patch) | |
| tree | de7ec01912bcb217296d86bd4fad9fd5b211f0cf | |
| parent | - Update to 2.1.3. (diff) | |
Upgrade X.Org ports to 6.8.2.
Release notes are available at
http://www.x.org/X11R6.8.2/doc/RELNOTES.html
Thanks to kris and krion for running several cluster test builds,
maintainers of GNOME for prompt responses, portmgr for postponing ports
freeze for this update, testers on FreeBSD-X11@ list and others that I
might have mised here.
Also included:
- fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La
France; obtained and tested by julian)
- fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and
Matthias Muthmann), which still appears to have problems with some
keyboards - so
- fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR
ports/77217)
- fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested
by Anders Nor Berle; PR ports/74757)
Notes
Notes:
svn path=/head/; revision=131533
106 files changed, 1690 insertions, 1696 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 57052037db84..22fcc81f1106 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1960,6 +1960,8 @@ EXTRACT_CMD?= ${GZIP_CMD} # uses X .if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist +.elif ${X_WINDOW_SYSTEM:L} == xorg +MTREE_FILE= ${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist .endif diff --git a/devel/imake-6/Makefile b/devel/imake-6/Makefile index b9e8787133af..8af57cb0e369 100644 --- a/devel/imake-6/Makefile +++ b/devel/imake-6/Makefile @@ -6,10 +6,10 @@ # PORTNAME= imake -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz @@ -28,10 +28,9 @@ USE_REINPLACE= yes .include <bsd.port.pre.mk> -NO_LATEST_LINK= yes DIST_SUBDIR= xorg WRKSRC= ${WRKDIR}/xc/config -MTREE_FILE= /etc/mtree/BSD.x11-4.dist +MTREE_FILE= ${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist MAN1= ccmakedep.1 \ cleanlinks.1 \ gccmakedep.1 \ diff --git a/devel/imake-6/distinfo b/devel/imake-6/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/devel/imake-6/distinfo +++ b/devel/imake-6/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/devel/imake-6/pkg-plist b/devel/imake-6/pkg-plist index 1a45d762e398..c59143c79134 100644 --- a/devel/imake-6/pkg-plist +++ b/devel/imake-6/pkg-plist @@ -121,3 +121,5 @@ lib/X11/config/xfree86.cf lib/X11/config/xorg.cf lib/X11/config/xorg.tmpl lib/X11/config/xorgsite.def +lib/X11/config/xorgversion.def +@dirrm lib/X11/config diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index 4c51da0c5efb..56b77dbc9b09 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -38,6 +38,12 @@ USE_XPM= yes DOCDIR= ${PREFIX}/share/doc/kterm16c +.if ${X_WINDOW_SYSTEM:L} == xorg +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + post-extract: @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \ @@ -69,6 +75,7 @@ post-patch: do-install: @${INSTALL_PROGRAM} ${WRKSRC}/kterm ${PREFIX}/bin/kterm16c @${INSTALL_DATA} ${WRKSRC}/KTerm.ad ${PREFIX}/lib/X11/app-defaults/KTerm + @${MKDIR} ${PREFIX}/lib/X11/fonts/misc @${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \ ${PREFIX}/lib/X11/fonts/misc @mkfontdir ${PREFIX}/lib/X11/fonts/misc diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist index b5ff5c29ceb8..b15cee379c46 100644 --- a/japanese/kterm16c/pkg-plist +++ b/japanese/kterm16c/pkg-plist @@ -6,3 +6,4 @@ lib/X11/fonts/misc/vga.pcf.gz share/doc/kterm16c/dot.termcap share/doc/kterm16c/kterm16c.doc @dirrm share/doc/kterm16c +%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 38209faef27b..df665e2c9872 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -90,21 +90,11 @@ post-configure: post-build: (cd ${WRKSRC}/contrib/xmindpath; make) -.if ${X_WINDOW_SYSTEM:L} != xfree86-3 - (cd ${WRKSRC}/contrib/xmindpath; \ - ${RM} -f xmindpath.1.html xmindpath-1.html; \ - ${X11BASE}/bin/rman -f HTML < xmindpath.1 > xmindpath-1.html && \ - ${MV} -f xmindpath-1.html xmindpath.1.html) -.endif # NOTE: there are some discussions/twists in gzip'ing xmindpath.1. post-install: (cd ${WRKSRC}/contrib/xmindpath; make install) ${GZIP_CMD} ${PREFIX}/man/man1/xmindpath.1 -.if ${X_WINDOW_SYSTEM:L} != xfree86-3 - (cd ${WRKSRC}/contrib/xmindpath; \ - ${INSTALL_MAN} xmindpath.1.html ${PREFIX}/lib/X11/doc/html) -.endif .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mgp for i in $(DOCS); do \ diff --git a/misc/magicpoint/pkg-plist b/misc/magicpoint/pkg-plist index af0d54fad48c..bfff8de4cf5b 100644 --- a/misc/magicpoint/pkg-plist +++ b/misc/magicpoint/pkg-plist @@ -4,7 +4,6 @@ bin/mgpembed bin/mgpnet bin/xwintoppm bin/xmindpath -lib/X11/doc/html/xmindpath.1.html lib/X11/mgp/default.mgp lib/X11/mgp/mgp1.jpg lib/X11/mgp/mgp2.jpg diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index c7a6dc9d7bbc..4dca71e2adf0 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -55,6 +55,7 @@ do-build: -e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \ -e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ + -e 's,%%XWINSYS%%,${X_WINDOW_SYSTEM:L},g' \ < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \ done diff --git a/x11-fonts/intlfonts/files/DEINSTALL.tmpl b/x11-fonts/intlfonts/files/DEINSTALL.tmpl index e4eae17628cb..b6e1d96284d7 100644 --- a/x11-fonts/intlfonts/files/DEINSTALL.tmpl +++ b/x11-fonts/intlfonts/files/DEINSTALL.tmpl @@ -15,4 +15,6 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then [ `wc -c ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale # Remove a backup file made by type1inst rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale.bak + [ "%%XWINSYS%%" = "xorg" ] && \ + (rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true) fi diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile index c7ac1e4967b5..c139c7fbe115 100644 --- a/x11-fonts/tv-fonts/Makefile +++ b/x11-fonts/tv-fonts/Makefile @@ -38,4 +38,12 @@ do-install: post-install: @-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xorg +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist index 3569af4ac13f..0f12e178b894 100644 --- a/x11-fonts/tv-fonts/pkg-plist +++ b/x11-fonts/tv-fonts/pkg-plist @@ -20,3 +20,7 @@ lib/X11/fonts/misc/teletext2.pcf.gz lib/X11/fonts/misc/teletext2i.pcf.gz lib/X11/fonts/misc/teletext4.pcf.gz lib/X11/fonts/misc/teletext4i.pcf.gz +@unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 || true +@unexec fc-cache -f -v %D/lib/X11/fonts/misc || true +@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi +%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 8f850a082640..2e0abd02e9f6 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-fontserver -PORTVERSION= 6.8.1 -PORTREVISION= 2 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src2.tar.gz diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index dd8c450c9273..c775fb959477 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed -SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f +SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936 diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 5f0e1b513095..7d070d3c6d79 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -2,3 +2,4 @@ bin/xfs etc/rc.d/xfs.sh @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default +@unexec rmdir %D/lib/X11/fs 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 915b435513a9..bfdc6eefe3a4 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-100dpi -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-100dpi/distinfo +++ b/x11-fonts/xorg-fonts-100dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 deleted file mode 100644 index 8b89779ba476..000000000000 --- a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 +++ /dev/null @@ -1,56 +0,0 @@ -Index: fonts/bdf/100dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/100dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else -Index: fonts/bdf/75dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/75dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else diff --git a/x11-fonts/xorg-fonts-100dpi/pkg-plist b/x11-fonts/xorg-fonts-100dpi/pkg-plist index e490a38b7b26..ce6bdbade4c1 100644 --- a/x11-fonts/xorg-fonts-100dpi/pkg-plist +++ b/x11-fonts/xorg-fonts-100dpi/pkg-plist @@ -1896,3 +1896,4 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/100dpi/timR24.pcf.gz +@unexec rmdir %D/lib/X11/fonts/100dpi 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index 18087eb74a05..c3ce61dd17d4 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-75dpi -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-75dpi/distinfo b/x11-fonts/xorg-fonts-75dpi/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-75dpi/distinfo +++ b/x11-fonts/xorg-fonts-75dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 deleted file mode 100644 index 8b89779ba476..000000000000 --- a/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 +++ /dev/null @@ -1,56 +0,0 @@ -Index: fonts/bdf/100dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/100dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else -Index: fonts/bdf/75dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/75dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else diff --git a/x11-fonts/xorg-fonts-75dpi/pkg-plist b/x11-fonts/xorg-fonts-75dpi/pkg-plist index a6fe936f64e8..e1d7affdc256 100644 --- a/x11-fonts/xorg-fonts-75dpi/pkg-plist +++ b/x11-fonts/xorg-fonts-75dpi/pkg-plist @@ -1896,3 +1896,4 @@ lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/75dpi/timR24.pcf.gz +@unexec rmdir %D/lib/X11/fonts/75dpi 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index cdf25cf198b7..1cc633dc8aa6 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-cyrillic -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-cyrillic/distinfo +++ b/x11-fonts/xorg-fonts-cyrillic/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-cyrillic/pkg-plist b/x11-fonts/xorg-fonts-cyrillic/pkg-plist index e8570a82ca7a..fc2472baa0e6 100644 --- a/x11-fonts/xorg-fonts-cyrillic/pkg-plist +++ b/x11-fonts/xorg-fonts-cyrillic/pkg-plist @@ -84,3 +84,4 @@ lib/X11/fonts/cyrillic/koinil2.pcf.gz lib/X11/fonts/cyrillic/proof9x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16b.pcf.gz +@unexec rmdir %D/lib/X11/fonts/cyrillic 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile index d5db4af45e1f..e11867a226bb 100644 --- a/x11-fonts/xorg-fonts-encodings/Makefile +++ b/x11-fonts/xorg-fonts-encodings/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-encodings -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-encodings/distinfo b/x11-fonts/xorg-fonts-encodings/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-encodings/distinfo +++ b/x11-fonts/xorg-fonts-encodings/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist index a4b627981846..029682030d33 100644 --- a/x11-fonts/xorg-fonts-encodings/pkg-plist +++ b/x11-fonts/xorg-fonts-encodings/pkg-plist @@ -3,6 +3,7 @@ lib/X11/fonts/encodings/adobe-standard.enc.gz lib/X11/fonts/encodings/adobe-symbol.enc.gz lib/X11/fonts/encodings/ansi-1251.enc lib/X11/fonts/encodings/armscii-8.enc +lib/X11/fonts/encodings/ascii-0.enc lib/X11/fonts/encodings/dec-special.enc lib/X11/fonts/encodings/encodings.dir lib/X11/fonts/encodings/ibm-cp437.enc @@ -48,3 +49,5 @@ lib/X11/fonts/encodings/suneu-greek.enc lib/X11/fonts/encodings/tcvn-0.enc lib/X11/fonts/encodings/tis620-2.enc lib/X11/fonts/encodings/viscii1.1-1.enc.gz +@unexec rmdir %D/lib/X11/fonts/encodings/large 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/encodings 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index c17b3cd7ee00..ae4446289694 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-miscbitmaps -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-miscbitmaps/distinfo b/x11-fonts/xorg-fonts-miscbitmaps/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/distinfo +++ b/x11-fonts/xorg-fonts-miscbitmaps/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist b/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist index fc31cc8768d2..e058c34eb29f 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist +++ b/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist @@ -411,3 +411,4 @@ lib/X11/fonts/misc/olgl10.pcf.gz lib/X11/fonts/misc/olgl12.pcf.gz lib/X11/fonts/misc/olgl14.pcf.gz lib/X11/fonts/misc/olgl19.pcf.gz +@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index 63917a0d98fb..4f1334b7d35f 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-truetype -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-truetype/distinfo b/x11-fonts/xorg-fonts-truetype/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-truetype/distinfo +++ b/x11-fonts/xorg-fonts-truetype/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-truetype/pkg-plist b/x11-fonts/xorg-fonts-truetype/pkg-plist index 3e12cc2d0088..06c742ea9b1a 100644 --- a/x11-fonts/xorg-fonts-truetype/pkg-plist +++ b/x11-fonts/xorg-fonts-truetype/pkg-plist @@ -13,4 +13,5 @@ lib/X11/fonts/TTF/luxisb.ttf lib/X11/fonts/TTF/luxisbi.ttf lib/X11/fonts/TTF/luxisr.ttf lib/X11/fonts/TTF/luxisri.ttf -@unexec %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rmdir %D/lib/X11/fonts/TTF 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index 884dd35f415b..c826bf33a4a7 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-type1 -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-type1/distinfo +++ b/x11-fonts/xorg-fonts-type1/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-type1/pkg-plist b/x11-fonts/xorg-fonts-type1/pkg-plist index 511c20f91bcb..f0bf3f2f6cd5 100644 --- a/x11-fonts/xorg-fonts-type1/pkg-plist +++ b/x11-fonts/xorg-fonts-type1/pkg-plist @@ -58,4 +58,5 @@ lib/X11/fonts/Type1/l049033t.afm lib/X11/fonts/Type1/l049033t.pfa lib/X11/fonts/Type1/l049036t.afm lib/X11/fonts/Type1/l049036t.pfa -@unexec %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rmdir %D/lib/X11/fonts/Type1 2>/dev/null || true diff --git a/x11-servers/xorg-fontserver/Makefile b/x11-servers/xorg-fontserver/Makefile index 8f850a082640..2e0abd02e9f6 100644 --- a/x11-servers/xorg-fontserver/Makefile +++ b/x11-servers/xorg-fontserver/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-fontserver -PORTVERSION= 6.8.1 -PORTREVISION= 2 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src2.tar.gz diff --git a/x11-servers/xorg-fontserver/distinfo b/x11-servers/xorg-fontserver/distinfo index dd8c450c9273..c775fb959477 100644 --- a/x11-servers/xorg-fontserver/distinfo +++ b/x11-servers/xorg-fontserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed -SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f +SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936 diff --git a/x11-servers/xorg-fontserver/pkg-plist b/x11-servers/xorg-fontserver/pkg-plist index 5f0e1b513095..7d070d3c6d79 100644 --- a/x11-servers/xorg-fontserver/pkg-plist +++ b/x11-servers/xorg-fontserver/pkg-plist @@ -2,3 +2,4 @@ bin/xfs etc/rc.d/xfs.sh @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default +@unexec rmdir %D/lib/X11/fs 2>/dev/null || true diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 7bdc061a8c92..dba59eb13696 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile index e0eff898c59d..f479f7b6cb69 100644 --- a/x11-servers/xorg-printserver/Makefile +++ b/x11-servers/xorg-printserver/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-printserver -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz @@ -26,7 +26,7 @@ XBUILD_DIRS= lib/font programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver -MAN7= Xprint.7 +MAN1= Xprt.1 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11-servers/xorg-printserver/distinfo +++ b/x11-servers/xorg-printserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist index 9903b9835f79..a8db6ee011d0 100644 --- a/x11-servers/xorg-printserver/pkg-plist +++ b/x11-servers/xorg-printserver/pkg-plist @@ -688,9 +688,14 @@ lib/X11/xserver/pt lib/X11/xserver/pt.ISO8859-1 lib/X11/xserver/pt.ISO8859-15 lib/X11/xserver/pt_BR +lib/X11/xserver/pt_BR.88591 +lib/X11/xserver/pt_BR.88591.en +lib/X11/xserver/pt_BR.ISO-8859-1 lib/X11/xserver/pt_BR.ISO8859-1 +lib/X11/xserver/pt_BR.ISO_8859-1 lib/X11/xserver/pt_BR.UTF-8 lib/X11/xserver/pt_BR.iso88591 +lib/X11/xserver/pt_BR.iso885915 lib/X11/xserver/pt_BR.utf8 lib/X11/xserver/pt_PT lib/X11/xserver/pt_PT.ISO8859-1 diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index eeb687996382..dcf1f93b7b5a 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-server -PORTVERSION= 6.8.1 -PORTREVISION= 2 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R6.8.1/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc index 7d7e1cf76d11..8dea98c31e46 100644 --- a/x11-servers/xorg-server-snap/Makefile.inc +++ b/x11-servers/xorg-server-snap/Makefile.inc @@ -17,6 +17,7 @@ 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 USE_IMAKE= YES .if defined(XMAN_DIRS) @@ -42,8 +43,11 @@ 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-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 \ diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11-servers/xorg-server-snap/distinfo +++ b/x11-servers/xorg-server-snap/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist new file mode 100644 index 000000000000..e5854f4aa0d9 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist @@ -0,0 +1,520 @@ +# $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 + .. + .. + 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-ati-591 b/x11-servers/xorg-server-snap/files/patch-ati-591 deleted file mode 100644 index dc8e099f078a..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-ati-591 +++ /dev/null @@ -1,54 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c 26 Jul 2004 19:14:58 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c 15 Dec 2004 07:58:15 -0000 1.3.4.1 -@@ -1918,11 +1918,11 @@ - VBlankEnd += 0x0100U; - - pATI->LCDHBlankWidth = HBlankEnd - HBlankStart; -- pATI->LCDHSyncStart = HSyncStart - HBlankStart - 1; -+ pATI->LCDHSyncStart = HSyncStart - HBlankStart; - pATI->LCDHSyncWidth = HSyncEnd - HSyncStart; - - pATI->LCDVBlankWidth = VBlankEnd - VBlankStart; -- pATI->LCDVSyncStart = VSyncStart - VBlankStart - 1; -+ pATI->LCDVSyncStart = VSyncStart - VBlankStart; - pATI->LCDVSyncWidth = VSyncEnd - VSyncStart; - - HDisplay = HTotal + 5 - pATI->LCDHBlankWidth; -Index: programs/Xserver/hw/xfree86/drivers/ati/ativga.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v -retrieving revision 1.2 -retrieving revision 1.2.4.1 -diff -u -u -r1.2 -r1.2.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/ativga.c 23 Apr 2004 19:26:46 -0000 1.2 -+++ programs/Xserver/hw/xfree86/drivers/ati/ativga.c 15 Dec 2004 07:58:15 -0000 1.2.4.1 -@@ -185,7 +185,11 @@ - (pATI->Chip >= ATI_CHIP_264CT)) - pMode->CrtcHBlankStart--; - pMode->CrtcHSyncStart = pMode->HSyncStart >> 3; -+ if (pATI->LCDPanelID >= 0) -+ pMode->CrtcHSyncStart--; - pMode->CrtcHSyncEnd = pMode->HSyncEnd >> 3; -+ if (pATI->LCDPanelID >= 0) -+ pMode->CrtcHSyncEnd--; - pMode->CrtcHBlankEnd = (pMode->HTotal >> 3) - 1; - pMode->CrtcHTotal = (pMode->HTotal >> 3) - 5; - pMode->CrtcHSkew = pMode->HSkew; -@@ -327,6 +331,11 @@ - pMode->CrtcVBlankStart++; - else - pMode->CrtcVBlankStart--; -+ if (pATI->LCDPanelID >= 0) -+ { -+ pMode->CrtcVSyncStart--; -+ pMode->CrtcVSyncEnd--; -+ } - pMode->CrtcVBlankEnd--; - if (pATI->Chip < ATI_CHIP_264CT) - pMode->CrtcVBlankEnd--; diff --git a/x11-servers/xorg-server-snap/files/patch-atimobility b/x11-servers/xorg-server-snap/files/patch-atimobility new file mode 100644 index 000000000000..dd024a46cc9a --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-atimobility @@ -0,0 +1,73 @@ +--- programs/Xserver/hw/xfree86/drivers/ati/atimode.c.orig Fri Apr 23 19:26:46 2004 ++++ programs/Xserver/hw/xfree86/drivers/ati/atimode.c Sun Feb 13 05:55:05 2005 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */ + /* + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * +@@ -646,7 +646,7 @@ + SetBits(pMode->CrtcVDisplay, CRTC_V_DISP); + pATIHW->crtc_v_sync_strt_wid = + SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) | +- SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID); ++ SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA); + if (pMode->Flags & V_NVSYNC) + pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL; + } +--- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c.orig Wed Dec 15 07:58:15 2004 ++++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Sun Feb 13 05:55:05 2005 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */ + /* + * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * +@@ -1902,10 +1902,10 @@ + VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP); + VSyncStart = + GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT); +- VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) | +- GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID); ++ VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) | ++ GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA); + if (VSyncStart > VSyncEnd) +- VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1; ++ VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1; + VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL); + + VBlankStart = (VDisplay & ~0x03FFU) | +@@ -2177,7 +2177,7 @@ + if ((pATIHW->horz_stretching & + (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) != + (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) +- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, ++ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, + "Inconsistent panel horizontal dimension:" + " %d and %d.\n", pATI->LCDHorizontal, HDisplay); + HDisplay = pATI->LCDHorizontal; +@@ -2193,7 +2193,7 @@ + { + if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) || + !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO)) +- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, ++ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, + "Inconsistent panel vertical dimension: %d and %d.\n", + pATI->LCDVertical, VDisplay); + VDisplay = pATI->LCDVertical; +--- programs/Xserver/hw/xfree86/drivers/ati/atiregs.h.orig Fri Jul 23 05:36:14 2004 ++++ programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Sun Feb 13 05:55:05 2005 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */ + /* + * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * +@@ -551,6 +551,7 @@ + #define CRTC_V_SYNC_STRT 0x000007fful + /* ? 0x0000f800ul */ + #define CRTC_V_SYNC_WID 0x001f0000ul ++#define CRTC_V_SYNC_END_VGA 0x000f0000ul + #define CRTC_V_SYNC_POL 0x00200000ul + /* ? 0xffc00000ul */ + #define CRTC_VLINE_CRNT_VLINE IOPortTag(0x04u, 0x04u) diff --git a/x11-servers/xorg-server-snap/files/patch-atiprobe.c b/x11-servers/xorg-server-snap/files/patch-atiprobe.c deleted file mode 100644 index cb7371b1f153..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-atiprobe.c +++ /dev/null @@ -1,18 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v -retrieving revision 1.3 -retrieving revision 1.3.2.2 -diff -u -u -r1.3 -r1.3.2.2 ---- programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 30 Jul 2004 20:30:51 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 15 Dec 2004 08:47:20 -0000 1.3.2.2 -@@ -1554,6 +1560,9 @@ - continue; - - pPCI = pVideo->thisCard; -+ if (pPCI == NULL) -+ continue; -+ - PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG); - j = PciReg & 0x03U; - if (j == 0x03U) diff --git a/x11-servers/xorg-server-snap/files/patch-i810-6_8 b/x11-servers/xorg-server-snap/files/patch-i810-6_8 deleted file mode 100644 index 698da0065d1a..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-i810-6_8 +++ /dev/null @@ -1,437 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/i810/common.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/common.h 22 Jun 2004 14:28:46 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/i810/common.h 15 Dec 2004 09:35:23 -0000 1.3.4.1 -@@ -173,7 +173,7 @@ - #define BEGIN_LP_RING(n) \ - unsigned int outring, ringmask; \ - volatile unsigned char *virt; \ -- unsigned int needed; \ -+ int needed; \ - if ((n) & 1) \ - ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n); \ - if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \ -@@ -206,7 +206,7 @@ - #define BEGIN_LP_RING(n) \ - unsigned int outring, ringmask; \ - volatile unsigned char *virt; \ -- unsigned int needed; \ -+ int needed; \ - if ((n) & 1) \ - ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n); \ - if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810.h 22 Jun 2004 14:28:46 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810.h 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -172,7 +172,7 @@ - unsigned long OverlayPhysical; - unsigned long OverlayStart; - int colorKey; -- int surfaceAllocation[I810_TOTAL_SURFACES]; -+ unsigned int surfaceAllocation[I810_TOTAL_SURFACES]; - int numSurfaces; - - DGAModePtr DGAModes; -@@ -295,9 +295,10 @@ - extern void I810Sync(ScrnInfoPtr pScrn); - extern unsigned long I810LocalToPhysical(ScrnInfoPtr pScrn, - unsigned long local); --extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, int size); -+extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, -+ int size); - extern int I810AllocHigh(I810MemRange * result, I810MemRange * pool, -- int size); -+ int size); - extern Bool I810AllocateFront(ScrnInfoPtr pScrn); - - extern int I810AllocateGARTMemory(ScrnInfoPtr pScrn); -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -u -u -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 30 Jul 2004 20:30:52 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 15 Dec 2004 09:35:23 -0000 1.4.2.1 -@@ -259,7 +259,7 @@ - #ifdef XF86DRI - /* VT switching tries to do this. - */ -- if (!pI810->LockHeld && pI810->directRenderingEnabled) { -+ if ((!pI810->LockHeld && pI810->directRenderingEnabled) || !pScrn->vtSema) { - return; - } - #endif -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 22 Jun 2004 14:28:46 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -290,7 +290,7 @@ - unsigned long dcacheHandle; - int sysmem_size = 0; - int back_size = 0; -- int pitch_idx = 0; -+ unsigned int pitch_idx = 0; - int bufs; - int width = pScrn->displayWidth * pI810->cpp; - int i; -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v -retrieving revision 1.9 -retrieving revision 1.9.2.1 -diff -u -u -r1.9 -r1.9.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 25 Aug 2004 00:30:41 -0000 1.9 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 15 Dec 2004 09:35:23 -0000 1.9.2.1 -@@ -1124,14 +1124,6 @@ - xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr); - xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr); - -- pI810->LpRing = xalloc(sizeof(I810RingBuffer)); -- if (!pI810->LpRing) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "Could not allocate lpring data structure.\n"); -- I810FreeRec(pScrn); -- return FALSE; -- } -- - return TRUE; - } - -@@ -1159,7 +1151,7 @@ - I810MapMem(ScrnInfoPtr pScrn) - { - I810Ptr pI810 = I810PTR(pScrn); -- unsigned i; -+ long i; - - for (i = 2; i < pI810->FbMapSize; i <<= 1) ; - pI810->FbMapSize = i; -@@ -2074,6 +2066,13 @@ - pI810 = I810PTR(pScrn); - hwp = VGAHWPTR(pScrn); - -+ pI810->LpRing = xcalloc(sizeof(I810RingBuffer),1); -+ if (!pI810->LpRing) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Could not allocate lpring data structure.\n"); -+ return FALSE; -+ } -+ - miClearVisualTypes(); - - /* Re-implemented Direct Color support, -jens */ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -u -u -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 30 Aug 2004 03:19:08 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 15 Dec 2004 09:35:23 -0000 1.4.2.1 -@@ -55,7 +55,7 @@ - int - I810AllocLow(I810MemRange * result, I810MemRange * pool, int size) - { -- if (size > pool->Size) -+ if (size > (long)pool->Size) - return 0; - - pool->Size -= size; -@@ -69,7 +69,7 @@ - int - I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size) - { -- if (size > pool->Size) -+ if (size > (long)pool->Size) - return 0; - - pool->Size -= size; -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h 22 Jun 2004 14:28:46 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h 15 Dec 2004 09:35:23 -0000 1.3.4.1 -@@ -459,11 +459,11 @@ - #define I830_HEAD_MASK 0x001FFFFC - - #define RING_START 0x08 --#define START_ADDR 0x00FFFFF8 -+#define START_ADDR 0x03FFFFF8 - #define I830_RING_START_MASK 0xFFFFF000 - - #define RING_LEN 0x0C --#define RING_NR_PAGES 0x000FF000 -+#define RING_NR_PAGES 0x001FF000 - #define I830_RING_NR_PAGES 0x001FF000 - #define RING_REPORT_MASK 0x00000006 - #define RING_REPORT_64K 0x00000002 -Index: programs/Xserver/hw/xfree86/drivers/i810/i830.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v -retrieving revision 1.5 -retrieving revision 1.5.4.1 -diff -u -u -r1.5 -r1.5.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830.h 6 Jul 2004 14:37:47 -0000 1.5 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830.h 15 Dec 2004 09:35:23 -0000 1.5.4.1 -@@ -180,17 +180,17 @@ - int CacheLines; - - /* These are set in PreInit and never changed. */ -- unsigned long FbMapSize; -- unsigned long TotalVideoRam; -+ long FbMapSize; -+ long TotalVideoRam; - I830MemRange StolenMemory; /* pre-allocated memory */ -- unsigned long BIOSMemorySize; /* min stolen pool size */ -+ long BIOSMemorySize; /* min stolen pool size */ - int BIOSMemSizeLoc; - - /* These change according to what has been allocated. */ - long FreeMemory; - I830MemRange MemoryAperture; - I830MemPool StolenPool; -- unsigned long allocatedMemory; -+ long allocatedMemory; - - /* Regions allocated either from the above pools, or from agpgart. */ - /* for single and dual head configurations */ -@@ -348,7 +348,7 @@ - int xoffset; - int yoffset; - -- int SaveGeneration; -+ unsigned int SaveGeneration; - Bool vbeRestoreWorkaround; - Bool displayInfo; - Bool devicePresence; -@@ -415,7 +415,7 @@ - extern Bool I830BindGARTMemory(ScrnInfoPtr pScrn); - extern Bool I830UnbindGARTMemory(ScrnInfoPtr pScrn); - extern unsigned long I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, -- I830MemPool *pool, unsigned long size, -+ I830MemPool *pool, long size, - unsigned long alignment, int flags); - - extern void I830PrintAllRegisters(I830RegPtr i830Reg); -Index: programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v -retrieving revision 1.6 -retrieving revision 1.6.2.1 -diff -u -u -r1.6 -r1.6.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 30 Jul 2004 20:38:27 -0000 1.6 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 15 Dec 2004 09:35:23 -0000 1.6.2.1 -@@ -594,6 +594,7 @@ - I830Ptr pI830 = I830PTR(pScrn); - vbeInfoPtr pVbe = pI830->pVbe; - CARD32 temp; -+ - #ifdef I915G_WORKAROUND - int getmode; - int mode; -@@ -1018,7 +1019,7 @@ - I830MapMem(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned i; -+ long i; - - for (i = 2; i < pI830->FbMapSize; i <<= 1) ; - pI830->FbMapSize = i; -@@ -2898,7 +2899,7 @@ - OUTREG(LP_RING + RING_TAIL, 0); - OUTREG(LP_RING + RING_HEAD, 0); - -- if ((pI830->LpRing->mem.Start & I830_RING_START_MASK) != -+ if ((long)(pI830->LpRing->mem.Start & I830_RING_START_MASK) != - pI830->LpRing->mem.Start) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "I830SetRingRegs: Ring buffer start (%lx) violates its " -@@ -3441,7 +3442,7 @@ - I830Ptr pI8301 = I830PTR(pI830->entityPrivate->pScrn_1); - - temp = INREG(stridereg); -- if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) { -+ if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe), - (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth); -@@ -3459,7 +3460,7 @@ - sizereg = pI830->pipe ? DSPASIZE : DSPBSIZE; - - temp = INREG(stridereg); -- if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) { -+ if (temp / pI8302->cpp != (CARD32)(pI830->entityPrivate->pScrn_2->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe), - (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth); -@@ -3478,7 +3479,7 @@ - I830Ptr pI8302 = I830PTR(pI830->entityPrivate->pScrn_2); - - temp = INREG(stridereg); -- if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) { -+ if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe), - (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth); -@@ -3494,7 +3495,7 @@ - sizereg = !pI830->pipe ? DSPASIZE : DSPBSIZE; - - temp = INREG(stridereg); -- if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) { -+ if (temp / pI8302->cpp != ((CARD32)pI830->entityPrivate->pScrn_2->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe), - (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth); -@@ -3515,7 +3516,7 @@ - continue; - - temp = INREG(stridereg); -- if (temp / pI830->cpp != pScrn->displayWidth) { -+ if (temp / pI830->cpp != (CARD32)pScrn->displayWidth) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i), - (int)(temp / pI830->cpp), pScrn->displayWidth); -@@ -4354,6 +4355,9 @@ - SaveHWOperatingState(pScrn); - #endif - -+ ResetState(pScrn, TRUE); -+ RestoreHWState(pScrn); -+ - if (IsPrimary(pScrn)) { - if (!SetDisplayDevices(pScrn, pI830->savedDevices)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -@@ -4365,8 +4369,6 @@ - } - } - -- ResetState(pScrn, TRUE); -- RestoreHWState(pScrn); - RestoreBIOSMemSize(pScrn); - if (IsPrimary(pScrn)) - I830UnbindGARTMemory(pScrn); -@@ -4506,7 +4508,8 @@ - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); - Bool on = xf86IsUnblank(mode); -- CARD32 temp, ctrl, base, i; -+ CARD32 temp, ctrl, base; -+ int i; - - DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on)); - -Index: programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 6 Jul 2004 14:37:47 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -63,10 +63,10 @@ - */ - static unsigned long - AllocFromPool(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool, -- unsigned long size, unsigned long alignment, int flags) -+ long size, unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long needed, start, end; -+ long needed, start, end; - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); - - if (!result || !pool || !size) -@@ -94,7 +94,7 @@ - } - } - if (needed > pool->Free.Size) { -- unsigned long extra; -+ long extra; - /* See if the pool can be grown. */ - if (pI830->StolenOnly && !dryrun) - return 0; -@@ -107,7 +107,7 @@ - return 0; - } - -- if (!dryrun && (extra > pI830->MemoryAperture.Size)) -+ if (!dryrun && ((long)extra > pI830->MemoryAperture.Size)) - return 0; - - pool->Free.Size += extra; -@@ -136,7 +136,7 @@ - } - - static unsigned long --AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, unsigned long size, -+AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, long size, - unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -@@ -212,7 +212,7 @@ - - unsigned long - I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool, -- unsigned long size, unsigned long alignment, int flags) -+ long size, unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); -@@ -392,7 +392,7 @@ - I830Allocate2DMemory(ScrnInfoPtr pScrn, const int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long size, alloced; -+ long size, alloced; - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); - int verbosity = dryrun ? 4 : 1; - const char *s = dryrun ? "[dryrun] " : ""; -@@ -610,9 +610,9 @@ - return FALSE; - } - } else { -- unsigned long lineSize; -- unsigned long extra = 0; -- unsigned long maxFb = 0; -+ long lineSize; -+ long extra = 0; -+ long maxFb = 0; - - /* - * XXX Need to "free" up any 3D allocations if the DRI ended up -@@ -857,7 +857,7 @@ - I830GetExcessMemoryAllocations(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long allocated; -+ long allocated; - - allocated = pI830->StolenPool.Total.Size + pI830->allocatedMemory; - if (allocated > pI830->TotalVideoRam) -@@ -1367,7 +1367,7 @@ - I830Ptr pI830 = I830PTR(pScrn); - int pitch, ntiles, i; - static int nextTile = 0; -- static int tileGeneration = -1; -+ static unsigned int tileGeneration = -1; - - #if 0 - /* Hack to "improve" the alignment of the front buffer. diff --git a/x11-servers/xorg-server-snap/files/patch-i830_video.c b/x11-servers/xorg-server-snap/files/patch-i830_video.c deleted file mode 100644 index 259ad42669c1..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-i830_video.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig Fri Dec 31 13:43:36 2004 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c Fri Dec 31 13:44:22 2004 -@@ -632,7 +632,7 @@ - pPriv->gamma0 = 0x080808; - - /* gotta uninit this someplace */ -- REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); -+ REGION_NULL(pScreen, &pPriv->clip); - - pI830->adaptor = adapt; - diff --git a/x11-servers/xorg-server-snap/files/patch-pc98kbd b/x11-servers/xorg-server-snap/files/patch-pc98kbd new file mode 100644 index 000000000000..5b41887944da --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-pc98kbd @@ -0,0 +1,40 @@ +--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig Tue Feb 8 17:48:07 2005 ++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c Tue Feb 8 17:48:52 2005 +@@ -595,10 +595,13 @@ + * they need to get the same key code as the base key on the same + * physical keyboard key. + */ +- if (scanCode == KEY_SysReqest) +- scanCode = KEY_Print; +- else if (scanCode == KEY_Break) +- scanCode = KEY_Pause; ++ /* PC98 keyboards however don't need this */ ++ if (!xf86IsPc98()) { ++ if (scanCode == KEY_SysReqest) ++ scanCode = KEY_Print; ++ else if (scanCode == KEY_Break) ++ scanCode = KEY_Pause; ++ } + #endif + + /* +--- programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c.orig Tue Feb 8 18:14:07 2005 ++++ programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c Tue Feb 8 18:14:12 2005 +@@ -43,6 +43,9 @@ + case KEY_Prefix1: + pKbd->scanPrefix = *scanCode; /* special prefixes */ + return TRUE; ++ } ++ if (!xf86IsPc98()) { ++ switch (*scanCode) { + case 0x59: *scanCode = KEY_0x59; break; + case 0x5a: *scanCode = KEY_0x5A; break; + case 0x5b: *scanCode = KEY_0x5B; break; +@@ -71,6 +74,7 @@ + case 0x74: *scanCode = KEY_0x74; break; + case 0x75: *scanCode = KEY_0x75; break; + case 0x76: *scanCode = KEY_0x76; break; ++ } + } + break; + case KEY_Prefix0: diff --git a/x11-servers/xorg-server-snap/files/patch-r128_accel.c b/x11-servers/xorg-server-snap/files/patch-r128_accel.c deleted file mode 100644 index 6acfe9834a8e..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-r128_accel.c +++ /dev/null @@ -1,33 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c 16 Jun 2004 09:43:58 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c 15 Dec 2004 09:22:02 -0000 1.3.4.1 -@@ -237,17 +237,23 @@ - i = 0; - do { - ret = drmCommandNone(info->drmFD, DRM_R128_CCE_IDLE); -- } while ( ret && errno == EBUSY && i++ < R128_IDLE_RETRY ); -+ } while ( ret && errno == EBUSY && i++ < (R128_IDLE_RETRY * R128_IDLE_RETRY) ); - - if (ret && ret != -EBUSY) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "%s: CCE idle %d\n", __FUNCTION__, ret); - } - -+ if (i > R128_IDLE_RETRY) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "%s: (DEBUG) CCE idle took i = %d\n", __FUNCTION__, i); -+ } -+ - if (ret == 0) return; - - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Idle timed out, resetting engine...\n"); -+ R128CCE_STOP(pScrn, info); - R128EngineReset(pScrn); - - /* Always restart the engine when doing CCE 2D acceleration */ diff --git a/x11-servers/xorg-server-snap/files/patch-r128_dri.c b/x11-servers/xorg-server-snap/files/patch-r128_dri.c deleted file mode 100644 index c31694837bcc..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-r128_dri.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 10 Jul 2004 14:22:35 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 15 Dec 2004 08:53:01 -0000 1.4.4.1 -@@ -1297,6 +1297,7 @@ - if (info->irq) { - drmCtlUninstHandler(info->drmFD); - info->irq = 0; -+ info->gen_int_cntl = 0; - } - - /* De-allocate vertex buffers */ diff --git a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c index 7361e77a5eaf..eddd3071447b 100644 --- a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c +++ b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c @@ -1,19 +1,10 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Tue Aug 24 17:30:41 2004 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Thu Jan 13 14:34:17 2005 -@@ -4471,10 +4471,12 @@ - - RADEONSave(pScrn); - -- if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) { -- RADEONSetDynamicClock(pScrn, 1); -- } else { -- RADEONSetDynamicClock(pScrn, 0); -+ if ((!info->IsSecondary) && info->IsMobility) { -+ if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) { -+ RADEONSetDynamicClock(pScrn, 1); -+ } else { -+ RADEONSetDynamicClock(pScrn, 0); -+ } +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Thu Feb 17 13:15:22 2005 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Thu Feb 17 13:21:09 2005 +@@ -7159,7 +7159,6 @@ + RADEONDoAdjustFrame(pScrn, x, y, FALSE); } - if (info->FBDev) { +- RADEONSetFBLocation (pScrn); + #ifdef XF86DRI + if (info->CPStarted) DRIUnlock(pScrn->pScreen); + #endif diff --git a/x11-servers/xorg-server-snap/files/patch-radeon_reg.h b/x11-servers/xorg-server-snap/files/patch-radeon_reg.h deleted file mode 100644 index 4aa8575e4cb2..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-radeon_reg.h +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h.orig Mon Aug 9 15:37:22 2004 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h Thu Jan 13 14:34:17 2005 -@@ -803,7 +803,7 @@ - # define RADEON_MC_MCLK_MAX_DYN_STOP_LAT (1<<12) - # define RADEON_IO_MCLK_MAX_DYN_STOP_LAT (1<<13) - # define RADEON_MC_MCLK_DYN_ENABLE (1 << 14) --# define RADEON_IO_MCLK_DYN_ENABLE (1 << 14) -+# define RADEON_IO_MCLK_DYN_ENABLE (1 << 15) - #define RADEON_MDGPIO_A_REG 0x01ac - #define RADEON_MDGPIO_EN_REG 0x01b0 - #define RADEON_MDGPIO_MASK 0x0198 diff --git a/x11-servers/xorg-server-snap/files/patch-sparc64kbd b/x11-servers/xorg-server-snap/files/patch-sparc64kbd new file mode 100644 index 000000000000..d4854adf9cac --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-sparc64kbd @@ -0,0 +1,22 @@ +--- 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-xf86Pci.h b/x11-servers/xorg-server-snap/files/patch-xf86Pci.h new file mode 100644 index 000000000000..a7ec47c1e0e1 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-xf86Pci.h @@ -0,0 +1,16 @@ +Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h +=================================================================== +RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v +retrieving revision 1.1.1.2 +diff -u -r1.1.1.2 xf86Pci.h +--- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 25 Nov 2003 19:28:50 -0000 1.1.1.2 ++++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 2 Mar 2005 16:08:29 -0000 +@@ -329,7 +329,7 @@ + #define PCI_MAP_IS_MEM(b) (!PCI_MAP_IS_IO(b)) + + #define PCI_MAP_IS64BITMEM(b) \ +- (((b) & PCI_MAP_MEMORY_TYPE_MASK) == PCI_MAP_MEMORY_TYPE_64BIT) ++ (((b) & PCI_MAP_MEMORY_TYPE) == PCI_MAP_MEMORY_TYPE_64BIT) + + #define PCIGETMEMORY(b) ((b) & PCI_MAP_MEMORY_ADDRESS_MASK) + #define PCIGETMEMORY64HIGH(b) (*((CARD32*)&b + 1)) diff --git a/x11-servers/xorg-server-snap/files/patch-xorg.cf b/x11-servers/xorg-server-snap/files/patch-xorg.cf deleted file mode 100644 index 794860e862fe..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xorg.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xorg.cf.orig Sat Jan 1 16:41:46 2005 -+++ config/cf/xorg.cf Sat Jan 1 16:42:18 2005 -@@ -446,7 +446,7 @@ - # ifndef XF86CardDrivers - # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ -- chips apm i128 ati ark cyrix siliconmotion \ -+ chips apm i128 ati i810 ark cyrix siliconmotion \ - vga dummy vesa \ - XF86OSCardDrivers XF86ExtraCardDrivers - # endif diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist index da6ef8eb22a4..55a23938adc6 100644 --- a/x11-servers/xorg-server-snap/pkg-plist +++ b/x11-servers/xorg-server-snap/pkg-plist @@ -185,3 +185,9 @@ lib/modules/libxf8_32bpp.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_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 +@unexec rmdir %D/lib/X11/doc 2>/dev/null || true diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index eeb687996382..dcf1f93b7b5a 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-server -PORTVERSION= 6.8.1 -PORTREVISION= 2 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R6.8.1/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 7d7e1cf76d11..8dea98c31e46 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -17,6 +17,7 @@ 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 USE_IMAKE= YES .if defined(XMAN_DIRS) @@ -42,8 +43,11 @@ 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-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 \ diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11-servers/xorg-server/files/BSD.x11-xorg.dist b/x11-servers/xorg-server/files/BSD.x11-xorg.dist new file mode 100644 index 000000000000..46a69e71cd9b --- /dev/null +++ b/x11-servers/xorg-server/files/BSD.x11-xorg.dist @@ -0,0 +1,520 @@ +# $FreeBSD: /tmp/pcvs/ports/x11-servers/xorg-server/files/Attic/BSD.x11-xorg.dist,v 1.1 2005-03-17 23:22:12 lesi Exp $ +# +# 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 + .. + .. + 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/files/patch-ati-591 b/x11-servers/xorg-server/files/patch-ati-591 deleted file mode 100644 index dc8e099f078a..000000000000 --- a/x11-servers/xorg-server/files/patch-ati-591 +++ /dev/null @@ -1,54 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c 26 Jul 2004 19:14:58 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c 15 Dec 2004 07:58:15 -0000 1.3.4.1 -@@ -1918,11 +1918,11 @@ - VBlankEnd += 0x0100U; - - pATI->LCDHBlankWidth = HBlankEnd - HBlankStart; -- pATI->LCDHSyncStart = HSyncStart - HBlankStart - 1; -+ pATI->LCDHSyncStart = HSyncStart - HBlankStart; - pATI->LCDHSyncWidth = HSyncEnd - HSyncStart; - - pATI->LCDVBlankWidth = VBlankEnd - VBlankStart; -- pATI->LCDVSyncStart = VSyncStart - VBlankStart - 1; -+ pATI->LCDVSyncStart = VSyncStart - VBlankStart; - pATI->LCDVSyncWidth = VSyncEnd - VSyncStart; - - HDisplay = HTotal + 5 - pATI->LCDHBlankWidth; -Index: programs/Xserver/hw/xfree86/drivers/ati/ativga.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v -retrieving revision 1.2 -retrieving revision 1.2.4.1 -diff -u -u -r1.2 -r1.2.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/ativga.c 23 Apr 2004 19:26:46 -0000 1.2 -+++ programs/Xserver/hw/xfree86/drivers/ati/ativga.c 15 Dec 2004 07:58:15 -0000 1.2.4.1 -@@ -185,7 +185,11 @@ - (pATI->Chip >= ATI_CHIP_264CT)) - pMode->CrtcHBlankStart--; - pMode->CrtcHSyncStart = pMode->HSyncStart >> 3; -+ if (pATI->LCDPanelID >= 0) -+ pMode->CrtcHSyncStart--; - pMode->CrtcHSyncEnd = pMode->HSyncEnd >> 3; -+ if (pATI->LCDPanelID >= 0) -+ pMode->CrtcHSyncEnd--; - pMode->CrtcHBlankEnd = (pMode->HTotal >> 3) - 1; - pMode->CrtcHTotal = (pMode->HTotal >> 3) - 5; - pMode->CrtcHSkew = pMode->HSkew; -@@ -327,6 +331,11 @@ - pMode->CrtcVBlankStart++; - else - pMode->CrtcVBlankStart--; -+ if (pATI->LCDPanelID >= 0) -+ { -+ pMode->CrtcVSyncStart--; -+ pMode->CrtcVSyncEnd--; -+ } - pMode->CrtcVBlankEnd--; - if (pATI->Chip < ATI_CHIP_264CT) - pMode->CrtcVBlankEnd--; diff --git a/x11-servers/xorg-server/files/patch-atimobility b/x11-servers/xorg-server/files/patch-atimobility new file mode 100644 index 000000000000..dd024a46cc9a --- /dev/null +++ b/x11-servers/xorg-server/files/patch-atimobility @@ -0,0 +1,73 @@ +--- programs/Xserver/hw/xfree86/drivers/ati/atimode.c.orig Fri Apr 23 19:26:46 2004 ++++ programs/Xserver/hw/xfree86/drivers/ati/atimode.c Sun Feb 13 05:55:05 2005 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */ + /* + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * +@@ -646,7 +646,7 @@ + SetBits(pMode->CrtcVDisplay, CRTC_V_DISP); + pATIHW->crtc_v_sync_strt_wid = + SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) | +- SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID); ++ SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA); + if (pMode->Flags & V_NVSYNC) + pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL; + } +--- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c.orig Wed Dec 15 07:58:15 2004 ++++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Sun Feb 13 05:55:05 2005 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */ + /* + * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * +@@ -1902,10 +1902,10 @@ + VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP); + VSyncStart = + GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT); +- VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) | +- GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID); ++ VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) | ++ GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA); + if (VSyncStart > VSyncEnd) +- VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1; ++ VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1; + VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL); + + VBlankStart = (VDisplay & ~0x03FFU) | +@@ -2177,7 +2177,7 @@ + if ((pATIHW->horz_stretching & + (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) != + (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) +- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, ++ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, + "Inconsistent panel horizontal dimension:" + " %d and %d.\n", pATI->LCDHorizontal, HDisplay); + HDisplay = pATI->LCDHorizontal; +@@ -2193,7 +2193,7 @@ + { + if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) || + !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO)) +- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, ++ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, + "Inconsistent panel vertical dimension: %d and %d.\n", + pATI->LCDVertical, VDisplay); + VDisplay = pATI->LCDVertical; +--- programs/Xserver/hw/xfree86/drivers/ati/atiregs.h.orig Fri Jul 23 05:36:14 2004 ++++ programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Sun Feb 13 05:55:05 2005 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */ + /* + * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * +@@ -551,6 +551,7 @@ + #define CRTC_V_SYNC_STRT 0x000007fful + /* ? 0x0000f800ul */ + #define CRTC_V_SYNC_WID 0x001f0000ul ++#define CRTC_V_SYNC_END_VGA 0x000f0000ul + #define CRTC_V_SYNC_POL 0x00200000ul + /* ? 0xffc00000ul */ + #define CRTC_VLINE_CRNT_VLINE IOPortTag(0x04u, 0x04u) diff --git a/x11-servers/xorg-server/files/patch-atiprobe.c b/x11-servers/xorg-server/files/patch-atiprobe.c deleted file mode 100644 index cb7371b1f153..000000000000 --- a/x11-servers/xorg-server/files/patch-atiprobe.c +++ /dev/null @@ -1,18 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v -retrieving revision 1.3 -retrieving revision 1.3.2.2 -diff -u -u -r1.3 -r1.3.2.2 ---- programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 30 Jul 2004 20:30:51 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 15 Dec 2004 08:47:20 -0000 1.3.2.2 -@@ -1554,6 +1560,9 @@ - continue; - - pPCI = pVideo->thisCard; -+ if (pPCI == NULL) -+ continue; -+ - PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG); - j = PciReg & 0x03U; - if (j == 0x03U) diff --git a/x11-servers/xorg-server/files/patch-i810-6_8 b/x11-servers/xorg-server/files/patch-i810-6_8 deleted file mode 100644 index 698da0065d1a..000000000000 --- a/x11-servers/xorg-server/files/patch-i810-6_8 +++ /dev/null @@ -1,437 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/i810/common.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/common.h 22 Jun 2004 14:28:46 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/i810/common.h 15 Dec 2004 09:35:23 -0000 1.3.4.1 -@@ -173,7 +173,7 @@ - #define BEGIN_LP_RING(n) \ - unsigned int outring, ringmask; \ - volatile unsigned char *virt; \ -- unsigned int needed; \ -+ int needed; \ - if ((n) & 1) \ - ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n); \ - if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \ -@@ -206,7 +206,7 @@ - #define BEGIN_LP_RING(n) \ - unsigned int outring, ringmask; \ - volatile unsigned char *virt; \ -- unsigned int needed; \ -+ int needed; \ - if ((n) & 1) \ - ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n); \ - if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810.h 22 Jun 2004 14:28:46 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810.h 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -172,7 +172,7 @@ - unsigned long OverlayPhysical; - unsigned long OverlayStart; - int colorKey; -- int surfaceAllocation[I810_TOTAL_SURFACES]; -+ unsigned int surfaceAllocation[I810_TOTAL_SURFACES]; - int numSurfaces; - - DGAModePtr DGAModes; -@@ -295,9 +295,10 @@ - extern void I810Sync(ScrnInfoPtr pScrn); - extern unsigned long I810LocalToPhysical(ScrnInfoPtr pScrn, - unsigned long local); --extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, int size); -+extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, -+ int size); - extern int I810AllocHigh(I810MemRange * result, I810MemRange * pool, -- int size); -+ int size); - extern Bool I810AllocateFront(ScrnInfoPtr pScrn); - - extern int I810AllocateGARTMemory(ScrnInfoPtr pScrn); -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -u -u -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 30 Jul 2004 20:30:52 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 15 Dec 2004 09:35:23 -0000 1.4.2.1 -@@ -259,7 +259,7 @@ - #ifdef XF86DRI - /* VT switching tries to do this. - */ -- if (!pI810->LockHeld && pI810->directRenderingEnabled) { -+ if ((!pI810->LockHeld && pI810->directRenderingEnabled) || !pScrn->vtSema) { - return; - } - #endif -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 22 Jun 2004 14:28:46 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -290,7 +290,7 @@ - unsigned long dcacheHandle; - int sysmem_size = 0; - int back_size = 0; -- int pitch_idx = 0; -+ unsigned int pitch_idx = 0; - int bufs; - int width = pScrn->displayWidth * pI810->cpp; - int i; -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v -retrieving revision 1.9 -retrieving revision 1.9.2.1 -diff -u -u -r1.9 -r1.9.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 25 Aug 2004 00:30:41 -0000 1.9 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 15 Dec 2004 09:35:23 -0000 1.9.2.1 -@@ -1124,14 +1124,6 @@ - xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr); - xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr); - -- pI810->LpRing = xalloc(sizeof(I810RingBuffer)); -- if (!pI810->LpRing) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "Could not allocate lpring data structure.\n"); -- I810FreeRec(pScrn); -- return FALSE; -- } -- - return TRUE; - } - -@@ -1159,7 +1151,7 @@ - I810MapMem(ScrnInfoPtr pScrn) - { - I810Ptr pI810 = I810PTR(pScrn); -- unsigned i; -+ long i; - - for (i = 2; i < pI810->FbMapSize; i <<= 1) ; - pI810->FbMapSize = i; -@@ -2074,6 +2066,13 @@ - pI810 = I810PTR(pScrn); - hwp = VGAHWPTR(pScrn); - -+ pI810->LpRing = xcalloc(sizeof(I810RingBuffer),1); -+ if (!pI810->LpRing) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Could not allocate lpring data structure.\n"); -+ return FALSE; -+ } -+ - miClearVisualTypes(); - - /* Re-implemented Direct Color support, -jens */ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -u -u -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 30 Aug 2004 03:19:08 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 15 Dec 2004 09:35:23 -0000 1.4.2.1 -@@ -55,7 +55,7 @@ - int - I810AllocLow(I810MemRange * result, I810MemRange * pool, int size) - { -- if (size > pool->Size) -+ if (size > (long)pool->Size) - return 0; - - pool->Size -= size; -@@ -69,7 +69,7 @@ - int - I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size) - { -- if (size > pool->Size) -+ if (size > (long)pool->Size) - return 0; - - pool->Size -= size; -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h 22 Jun 2004 14:28:46 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h 15 Dec 2004 09:35:23 -0000 1.3.4.1 -@@ -459,11 +459,11 @@ - #define I830_HEAD_MASK 0x001FFFFC - - #define RING_START 0x08 --#define START_ADDR 0x00FFFFF8 -+#define START_ADDR 0x03FFFFF8 - #define I830_RING_START_MASK 0xFFFFF000 - - #define RING_LEN 0x0C --#define RING_NR_PAGES 0x000FF000 -+#define RING_NR_PAGES 0x001FF000 - #define I830_RING_NR_PAGES 0x001FF000 - #define RING_REPORT_MASK 0x00000006 - #define RING_REPORT_64K 0x00000002 -Index: programs/Xserver/hw/xfree86/drivers/i810/i830.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v -retrieving revision 1.5 -retrieving revision 1.5.4.1 -diff -u -u -r1.5 -r1.5.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830.h 6 Jul 2004 14:37:47 -0000 1.5 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830.h 15 Dec 2004 09:35:23 -0000 1.5.4.1 -@@ -180,17 +180,17 @@ - int CacheLines; - - /* These are set in PreInit and never changed. */ -- unsigned long FbMapSize; -- unsigned long TotalVideoRam; -+ long FbMapSize; -+ long TotalVideoRam; - I830MemRange StolenMemory; /* pre-allocated memory */ -- unsigned long BIOSMemorySize; /* min stolen pool size */ -+ long BIOSMemorySize; /* min stolen pool size */ - int BIOSMemSizeLoc; - - /* These change according to what has been allocated. */ - long FreeMemory; - I830MemRange MemoryAperture; - I830MemPool StolenPool; -- unsigned long allocatedMemory; -+ long allocatedMemory; - - /* Regions allocated either from the above pools, or from agpgart. */ - /* for single and dual head configurations */ -@@ -348,7 +348,7 @@ - int xoffset; - int yoffset; - -- int SaveGeneration; -+ unsigned int SaveGeneration; - Bool vbeRestoreWorkaround; - Bool displayInfo; - Bool devicePresence; -@@ -415,7 +415,7 @@ - extern Bool I830BindGARTMemory(ScrnInfoPtr pScrn); - extern Bool I830UnbindGARTMemory(ScrnInfoPtr pScrn); - extern unsigned long I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, -- I830MemPool *pool, unsigned long size, -+ I830MemPool *pool, long size, - unsigned long alignment, int flags); - - extern void I830PrintAllRegisters(I830RegPtr i830Reg); -Index: programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v -retrieving revision 1.6 -retrieving revision 1.6.2.1 -diff -u -u -r1.6 -r1.6.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 30 Jul 2004 20:38:27 -0000 1.6 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 15 Dec 2004 09:35:23 -0000 1.6.2.1 -@@ -594,6 +594,7 @@ - I830Ptr pI830 = I830PTR(pScrn); - vbeInfoPtr pVbe = pI830->pVbe; - CARD32 temp; -+ - #ifdef I915G_WORKAROUND - int getmode; - int mode; -@@ -1018,7 +1019,7 @@ - I830MapMem(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned i; -+ long i; - - for (i = 2; i < pI830->FbMapSize; i <<= 1) ; - pI830->FbMapSize = i; -@@ -2898,7 +2899,7 @@ - OUTREG(LP_RING + RING_TAIL, 0); - OUTREG(LP_RING + RING_HEAD, 0); - -- if ((pI830->LpRing->mem.Start & I830_RING_START_MASK) != -+ if ((long)(pI830->LpRing->mem.Start & I830_RING_START_MASK) != - pI830->LpRing->mem.Start) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "I830SetRingRegs: Ring buffer start (%lx) violates its " -@@ -3441,7 +3442,7 @@ - I830Ptr pI8301 = I830PTR(pI830->entityPrivate->pScrn_1); - - temp = INREG(stridereg); -- if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) { -+ if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe), - (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth); -@@ -3459,7 +3460,7 @@ - sizereg = pI830->pipe ? DSPASIZE : DSPBSIZE; - - temp = INREG(stridereg); -- if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) { -+ if (temp / pI8302->cpp != (CARD32)(pI830->entityPrivate->pScrn_2->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe), - (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth); -@@ -3478,7 +3479,7 @@ - I830Ptr pI8302 = I830PTR(pI830->entityPrivate->pScrn_2); - - temp = INREG(stridereg); -- if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) { -+ if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe), - (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth); -@@ -3494,7 +3495,7 @@ - sizereg = !pI830->pipe ? DSPASIZE : DSPBSIZE; - - temp = INREG(stridereg); -- if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) { -+ if (temp / pI8302->cpp != ((CARD32)pI830->entityPrivate->pScrn_2->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe), - (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth); -@@ -3515,7 +3516,7 @@ - continue; - - temp = INREG(stridereg); -- if (temp / pI830->cpp != pScrn->displayWidth) { -+ if (temp / pI830->cpp != (CARD32)pScrn->displayWidth) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i), - (int)(temp / pI830->cpp), pScrn->displayWidth); -@@ -4354,6 +4355,9 @@ - SaveHWOperatingState(pScrn); - #endif - -+ ResetState(pScrn, TRUE); -+ RestoreHWState(pScrn); -+ - if (IsPrimary(pScrn)) { - if (!SetDisplayDevices(pScrn, pI830->savedDevices)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -@@ -4365,8 +4369,6 @@ - } - } - -- ResetState(pScrn, TRUE); -- RestoreHWState(pScrn); - RestoreBIOSMemSize(pScrn); - if (IsPrimary(pScrn)) - I830UnbindGARTMemory(pScrn); -@@ -4506,7 +4508,8 @@ - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); - Bool on = xf86IsUnblank(mode); -- CARD32 temp, ctrl, base, i; -+ CARD32 temp, ctrl, base; -+ int i; - - DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on)); - -Index: programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 6 Jul 2004 14:37:47 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -63,10 +63,10 @@ - */ - static unsigned long - AllocFromPool(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool, -- unsigned long size, unsigned long alignment, int flags) -+ long size, unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long needed, start, end; -+ long needed, start, end; - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); - - if (!result || !pool || !size) -@@ -94,7 +94,7 @@ - } - } - if (needed > pool->Free.Size) { -- unsigned long extra; -+ long extra; - /* See if the pool can be grown. */ - if (pI830->StolenOnly && !dryrun) - return 0; -@@ -107,7 +107,7 @@ - return 0; - } - -- if (!dryrun && (extra > pI830->MemoryAperture.Size)) -+ if (!dryrun && ((long)extra > pI830->MemoryAperture.Size)) - return 0; - - pool->Free.Size += extra; -@@ -136,7 +136,7 @@ - } - - static unsigned long --AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, unsigned long size, -+AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, long size, - unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -@@ -212,7 +212,7 @@ - - unsigned long - I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool, -- unsigned long size, unsigned long alignment, int flags) -+ long size, unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); -@@ -392,7 +392,7 @@ - I830Allocate2DMemory(ScrnInfoPtr pScrn, const int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long size, alloced; -+ long size, alloced; - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); - int verbosity = dryrun ? 4 : 1; - const char *s = dryrun ? "[dryrun] " : ""; -@@ -610,9 +610,9 @@ - return FALSE; - } - } else { -- unsigned long lineSize; -- unsigned long extra = 0; -- unsigned long maxFb = 0; -+ long lineSize; -+ long extra = 0; -+ long maxFb = 0; - - /* - * XXX Need to "free" up any 3D allocations if the DRI ended up -@@ -857,7 +857,7 @@ - I830GetExcessMemoryAllocations(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long allocated; -+ long allocated; - - allocated = pI830->StolenPool.Total.Size + pI830->allocatedMemory; - if (allocated > pI830->TotalVideoRam) -@@ -1367,7 +1367,7 @@ - I830Ptr pI830 = I830PTR(pScrn); - int pitch, ntiles, i; - static int nextTile = 0; -- static int tileGeneration = -1; -+ static unsigned int tileGeneration = -1; - - #if 0 - /* Hack to "improve" the alignment of the front buffer. diff --git a/x11-servers/xorg-server/files/patch-i830_video.c b/x11-servers/xorg-server/files/patch-i830_video.c deleted file mode 100644 index 259ad42669c1..000000000000 --- a/x11-servers/xorg-server/files/patch-i830_video.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig Fri Dec 31 13:43:36 2004 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c Fri Dec 31 13:44:22 2004 -@@ -632,7 +632,7 @@ - pPriv->gamma0 = 0x080808; - - /* gotta uninit this someplace */ -- REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); -+ REGION_NULL(pScreen, &pPriv->clip); - - pI830->adaptor = adapt; - diff --git a/x11-servers/xorg-server/files/patch-pc98kbd b/x11-servers/xorg-server/files/patch-pc98kbd new file mode 100644 index 000000000000..5b41887944da --- /dev/null +++ b/x11-servers/xorg-server/files/patch-pc98kbd @@ -0,0 +1,40 @@ +--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig Tue Feb 8 17:48:07 2005 ++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c Tue Feb 8 17:48:52 2005 +@@ -595,10 +595,13 @@ + * they need to get the same key code as the base key on the same + * physical keyboard key. + */ +- if (scanCode == KEY_SysReqest) +- scanCode = KEY_Print; +- else if (scanCode == KEY_Break) +- scanCode = KEY_Pause; ++ /* PC98 keyboards however don't need this */ ++ if (!xf86IsPc98()) { ++ if (scanCode == KEY_SysReqest) ++ scanCode = KEY_Print; ++ else if (scanCode == KEY_Break) ++ scanCode = KEY_Pause; ++ } + #endif + + /* +--- programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c.orig Tue Feb 8 18:14:07 2005 ++++ programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c Tue Feb 8 18:14:12 2005 +@@ -43,6 +43,9 @@ + case KEY_Prefix1: + pKbd->scanPrefix = *scanCode; /* special prefixes */ + return TRUE; ++ } ++ if (!xf86IsPc98()) { ++ switch (*scanCode) { + case 0x59: *scanCode = KEY_0x59; break; + case 0x5a: *scanCode = KEY_0x5A; break; + case 0x5b: *scanCode = KEY_0x5B; break; +@@ -71,6 +74,7 @@ + case 0x74: *scanCode = KEY_0x74; break; + case 0x75: *scanCode = KEY_0x75; break; + case 0x76: *scanCode = KEY_0x76; break; ++ } + } + break; + case KEY_Prefix0: diff --git a/x11-servers/xorg-server/files/patch-r128_accel.c b/x11-servers/xorg-server/files/patch-r128_accel.c deleted file mode 100644 index 6acfe9834a8e..000000000000 --- a/x11-servers/xorg-server/files/patch-r128_accel.c +++ /dev/null @@ -1,33 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c 16 Jun 2004 09:43:58 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c 15 Dec 2004 09:22:02 -0000 1.3.4.1 -@@ -237,17 +237,23 @@ - i = 0; - do { - ret = drmCommandNone(info->drmFD, DRM_R128_CCE_IDLE); -- } while ( ret && errno == EBUSY && i++ < R128_IDLE_RETRY ); -+ } while ( ret && errno == EBUSY && i++ < (R128_IDLE_RETRY * R128_IDLE_RETRY) ); - - if (ret && ret != -EBUSY) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "%s: CCE idle %d\n", __FUNCTION__, ret); - } - -+ if (i > R128_IDLE_RETRY) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "%s: (DEBUG) CCE idle took i = %d\n", __FUNCTION__, i); -+ } -+ - if (ret == 0) return; - - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Idle timed out, resetting engine...\n"); -+ R128CCE_STOP(pScrn, info); - R128EngineReset(pScrn); - - /* Always restart the engine when doing CCE 2D acceleration */ diff --git a/x11-servers/xorg-server/files/patch-r128_dri.c b/x11-servers/xorg-server/files/patch-r128_dri.c deleted file mode 100644 index c31694837bcc..000000000000 --- a/x11-servers/xorg-server/files/patch-r128_dri.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 10 Jul 2004 14:22:35 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 15 Dec 2004 08:53:01 -0000 1.4.4.1 -@@ -1297,6 +1297,7 @@ - if (info->irq) { - drmCtlUninstHandler(info->drmFD); - info->irq = 0; -+ info->gen_int_cntl = 0; - } - - /* De-allocate vertex buffers */ diff --git a/x11-servers/xorg-server/files/patch-radeon_driver.c b/x11-servers/xorg-server/files/patch-radeon_driver.c index 7361e77a5eaf..eddd3071447b 100644 --- a/x11-servers/xorg-server/files/patch-radeon_driver.c +++ b/x11-servers/xorg-server/files/patch-radeon_driver.c @@ -1,19 +1,10 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Tue Aug 24 17:30:41 2004 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Thu Jan 13 14:34:17 2005 -@@ -4471,10 +4471,12 @@ - - RADEONSave(pScrn); - -- if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) { -- RADEONSetDynamicClock(pScrn, 1); -- } else { -- RADEONSetDynamicClock(pScrn, 0); -+ if ((!info->IsSecondary) && info->IsMobility) { -+ if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) { -+ RADEONSetDynamicClock(pScrn, 1); -+ } else { -+ RADEONSetDynamicClock(pScrn, 0); -+ } +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Thu Feb 17 13:15:22 2005 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Thu Feb 17 13:21:09 2005 +@@ -7159,7 +7159,6 @@ + RADEONDoAdjustFrame(pScrn, x, y, FALSE); } - if (info->FBDev) { +- RADEONSetFBLocation (pScrn); + #ifdef XF86DRI + if (info->CPStarted) DRIUnlock(pScrn->pScreen); + #endif diff --git a/x11-servers/xorg-server/files/patch-radeon_reg.h b/x11-servers/xorg-server/files/patch-radeon_reg.h deleted file mode 100644 index 4aa8575e4cb2..000000000000 --- a/x11-servers/xorg-server/files/patch-radeon_reg.h +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h.orig Mon Aug 9 15:37:22 2004 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h Thu Jan 13 14:34:17 2005 -@@ -803,7 +803,7 @@ - # define RADEON_MC_MCLK_MAX_DYN_STOP_LAT (1<<12) - # define RADEON_IO_MCLK_MAX_DYN_STOP_LAT (1<<13) - # define RADEON_MC_MCLK_DYN_ENABLE (1 << 14) --# define RADEON_IO_MCLK_DYN_ENABLE (1 << 14) -+# define RADEON_IO_MCLK_DYN_ENABLE (1 << 15) - #define RADEON_MDGPIO_A_REG 0x01ac - #define RADEON_MDGPIO_EN_REG 0x01b0 - #define RADEON_MDGPIO_MASK 0x0198 diff --git a/x11-servers/xorg-server/files/patch-sparc64kbd b/x11-servers/xorg-server/files/patch-sparc64kbd new file mode 100644 index 000000000000..d4854adf9cac --- /dev/null +++ b/x11-servers/xorg-server/files/patch-sparc64kbd @@ -0,0 +1,22 @@ +--- 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/files/patch-xf86Pci.h b/x11-servers/xorg-server/files/patch-xf86Pci.h new file mode 100644 index 000000000000..a7ec47c1e0e1 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-xf86Pci.h @@ -0,0 +1,16 @@ +Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h +=================================================================== +RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v +retrieving revision 1.1.1.2 +diff -u -r1.1.1.2 xf86Pci.h +--- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 25 Nov 2003 19:28:50 -0000 1.1.1.2 ++++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 2 Mar 2005 16:08:29 -0000 +@@ -329,7 +329,7 @@ + #define PCI_MAP_IS_MEM(b) (!PCI_MAP_IS_IO(b)) + + #define PCI_MAP_IS64BITMEM(b) \ +- (((b) & PCI_MAP_MEMORY_TYPE_MASK) == PCI_MAP_MEMORY_TYPE_64BIT) ++ (((b) & PCI_MAP_MEMORY_TYPE) == PCI_MAP_MEMORY_TYPE_64BIT) + + #define PCIGETMEMORY(b) ((b) & PCI_MAP_MEMORY_ADDRESS_MASK) + #define PCIGETMEMORY64HIGH(b) (*((CARD32*)&b + 1)) diff --git a/x11-servers/xorg-server/files/patch-xorg.cf b/x11-servers/xorg-server/files/patch-xorg.cf deleted file mode 100644 index 794860e862fe..000000000000 --- a/x11-servers/xorg-server/files/patch-xorg.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xorg.cf.orig Sat Jan 1 16:41:46 2005 -+++ config/cf/xorg.cf Sat Jan 1 16:42:18 2005 -@@ -446,7 +446,7 @@ - # ifndef XF86CardDrivers - # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ -- chips apm i128 ati ark cyrix siliconmotion \ -+ chips apm i128 ati i810 ark cyrix siliconmotion \ - vga dummy vesa \ - XF86OSCardDrivers XF86ExtraCardDrivers - # endif diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index da6ef8eb22a4..55a23938adc6 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -185,3 +185,9 @@ lib/modules/libxf8_32bpp.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_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 +@unexec rmdir %D/lib/X11/doc 2>/dev/null || true diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 8677424daa26..c21f6a5f6e5d 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index 57c1f2c64da1..a3b5ff171a47 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -25,4 +25,12 @@ MAN1= ctwm.1 post-extract: @(cd ${WRKSRC} && ${LN} -s ../xpm xpm) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xorg +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist index 63f9f3f850b0..a4646df20bb6 100644 --- a/x11-wm/ctwm/pkg-plist +++ b/x11-wm/ctwm/pkg-plist @@ -90,3 +90,4 @@ lib/X11/twm/images/xrn.xpm lib/X11/twm/images/xterm.xpm lib/X11/twm/system.ctwmrc @dirrm lib/X11/twm/images +%%NEWMTREE%%@unexec rmdir %D/lib/X11/twm 2>/dev/null || true diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile index 7dde582f2b3f..0874291863fa 100644 --- a/x11-wm/vtwm/Makefile +++ b/x11-wm/vtwm/Makefile @@ -19,4 +19,12 @@ USE_XPM= yes MAN1= vtwm.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xorg +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/x11-wm/vtwm/pkg-plist b/x11-wm/vtwm/pkg-plist index 2be80dd2f8b4..1dd612a354a3 100644 --- a/x11-wm/vtwm/pkg-plist +++ b/x11-wm/vtwm/pkg-plist @@ -1,2 +1,3 @@ bin/vtwm lib/X11/twm/system.vtwmrc +%%NEWMTREE%%@unexec rmdir %D/lib/X11/twm 2>/dev/null || true diff --git a/x11/libGL/Makefile b/x11/libGL/Makefile index af90016b6843..04f4a881bae9 100644 --- a/x11/libGL/Makefile +++ b/x11/libGL/Makefile @@ -43,6 +43,7 @@ post-extract: xc/programs/Xserver/GL) post-install: + ${MKDIR} ${PREFIX}/include/GL .for i in ${GLHEADERS} ${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/GL .endfor diff --git a/x11/libGL/pkg-plist b/x11/libGL/pkg-plist index f4a50091e24c..52b3f27f8e33 100644 --- a/x11/libGL/pkg-plist +++ b/x11/libGL/pkg-plist @@ -9,3 +9,4 @@ include/GL/glxtokens.h lib/libGL.a lib/libGL.so lib/libGL.so.1 +@dirrm include/GL diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile index 0f2bc1825c90..9d4204eee5e9 100644 --- a/x11/xfree86_xkb_xml/Makefile +++ b/x11/xfree86_xkb_xml/Makefile @@ -27,4 +27,12 @@ CONFIGURE_ARGS= --with-xkb-base=${X11BASE}/lib/X11/xkb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xorg +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/x11/xfree86_xkb_xml/pkg-plist b/x11/xfree86_xkb_xml/pkg-plist index 2fc155b4aa8b..e31f5ca63962 100644 --- a/x11/xfree86_xkb_xml/pkg-plist +++ b/x11/xfree86_xkb_xml/pkg-plist @@ -2,3 +2,5 @@ lib/X11/xkb/rules/xfree86.xml lib/X11/xkb/rules/xkb.dtd share/locale/bg/LC_MESSAGES/xfree86_xkb_xml.mo share/locale/ru/LC_MESSAGES/xfree86_xkb_xml.mo +%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true +%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 1f4555b6a6bb..9df059c6075a 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-clients -PORTVERSION= 6.8.1 -PORTREVISION= 1 +PORTVERSION= 6.8.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R6.8.1/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src2.tar.gz \ X11R${PORTVERSION}-src3.tar.gz @@ -54,6 +53,7 @@ post-install: ${CHOWN} root:wheel ${PREFIX}/bin/luit ${CHMOD} 04711 ${PREFIX}/bin/luit .endif + ${MKDIR} ${PREFIX}/lib/X11/xinit ${INSTALL_DATA} ${WRKSRC}/programs/xinit/xinitrc \ ${PREFIX}/lib/X11/xinit/xinitrc.default .for i in ${XDMCONFDATA} diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo index 0c514cc6b0f3..2833f6b9461c 100644 --- a/x11/xorg-clients/distinfo +++ b/x11/xorg-clients/distinfo @@ -1,6 +1,6 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed -SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f +SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist index 27e0adb88a33..8f470516426d 100644 --- a/x11/xorg-clients/pkg-plist +++ b/x11/xorg-clients/pkg-plist @@ -511,7 +511,9 @@ lib/X11/xkb/rules/sgi.lst lib/X11/xkb/rules/sun lib/X11/xkb/rules/sun.lst lib/X11/xkb/rules/xfree86 +lib/X11/xkb/rules/xfree86-it.lst lib/X11/xkb/rules/xfree86.lst +lib/X11/xkb/rules/xfree86.xml lib/X11/xkb/rules/xorg lib/X11/xkb/rules/xorg-it.lst lib/X11/xkb/rules/xorg.lst @@ -752,14 +754,6 @@ lib/X11/xkb/types/pc lib/X11/xkb/xkbcomp lib/X11/xman.help lib/X11/xsm/system.xsm -@dirrm lib/X11/icons/redglass/cursors -@dirrm lib/X11/icons/redglass -@dirrm lib/X11/icons/whiteglass/cursors -@dirrm lib/X11/icons/whiteglass -@dirrm lib/X11/icons/handhelds/cursors -@dirrm lib/X11/icons/handhelds -@dirrm lib/X11/icons/default -@dirrm lib/X11/xkb/geometry/ibm @comment xterm workaround bin/resize @@ -768,3 +762,56 @@ bin/xterm lib/X11/app-defaults/UXTerm lib/X11/app-defaults/XTerm-color lib/X11/app-defaults/XTerm + +@dirrm include/X11/PM +@dirrm lib/X11/proxymngr +@dirrm lib/X11/rstart/commands/x11r6 +@dirrm lib/X11/rstart/commands +@dirrm lib/X11/rstart/contexts +@dirrm lib/X11/rstart +@dirrm lib/X11/twm +@dirrm lib/X11/x11perfcomp +@dirrm lib/X11/xdm/pixmaps +@dirrm lib/X11/xdm +@dirrm lib/X11/xedit/lisp/progmodes +@dirrm lib/X11/xedit/lisp +@dirrm lib/X11/xedit +@dirrm lib/X11/xkb/compat +@dirrm lib/X11/xkb/geometry/digital +@dirrm lib/X11/xkb/geometry/ibm +@dirrm lib/X11/xkb/geometry/sgi +@dirrm lib/X11/xkb/geometry +@dirrm lib/X11/xkb/keycodes/digital +@dirrm lib/X11/xkb/keycodes/sgi +@dirrm lib/X11/xkb/keycodes +@dirrm lib/X11/xkb/keymap/digital +@dirrm lib/X11/xkb/keymap/sgi +@dirrm lib/X11/xkb/keymap/sun +@dirrm lib/X11/xkb/keymap +@dirrm lib/X11/xkb/semantics +@dirrm lib/X11/xkb/symbols/hp +@dirrm lib/X11/xkb/symbols/digital +@dirrm lib/X11/xkb/symbols/fujitsu +@dirrm lib/X11/xkb/symbols/macintosh +@dirrm lib/X11/xkb/symbols/nec +@dirrm lib/X11/xkb/symbols/sgi +@dirrm lib/X11/xkb/symbols/sony +@dirrm lib/X11/xkb/symbols/sun +@dirrm lib/X11/xkb/symbols/xfree68 +@dirrm lib/X11/xkb/symbols/pc +@dirrm lib/X11/xkb/symbols +@dirrm lib/X11/xkb/types +@dirrm lib/X11/xkb/compiled +@dirrm lib/X11/xkb/rules +@dirrm lib/X11/xkb +@dirrm lib/X11/xsm +@dirrm lib/X11/icons/default +@dirrm lib/X11/icons/redglass/cursors +@dirrm lib/X11/icons/redglass +@dirrm lib/X11/icons/whiteglass/cursors +@dirrm lib/X11/icons/whiteglass +@dirrm lib/X11/icons/handhelds/cursors +@dirrm lib/X11/icons/handhelds +@dirrm lib/X11/icons +@dirrm lib/X11/xinit +@unexec rmdir %D/lib/X11/fonts/util 2>/dev/null || true diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure index aa92ba29b024..5b2332cff3fb 100644 --- a/x11/xorg-clients/scripts/configure +++ b/x11/xorg-clients/scripts/configure @@ -7,6 +7,7 @@ echo "#define BuildServer NO" >> $LOCALDEF echo "#define BuildLBX NO" >> $LOCALDEF echo "#define BuildXterm NO" >> $LOCALDEF echo "#define BuildFontServer NO" >> $LOCALDEF +echo "#define BuildPlugin NO" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define UseInstalledLibraries YES" >> $LOCALDEF echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF diff --git a/x11/xorg-documents/Makefile b/x11/xorg-documents/Makefile index b15c0d59786c..8a02646c6653 100644 --- a/x11/xorg-documents/Makefile +++ b/x11/xorg-documents/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-documents -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R6.8.1/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src6.tar.gz diff --git a/x11/xorg-documents/distinfo b/x11/xorg-documents/distinfo index f1dbf971ca94..4ae7a9fead90 100644 --- a/x11/xorg-documents/distinfo +++ b/x11/xorg-documents/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src6.tar.gz) = 13d9a1ebf811261434eb8a771d826c3c -SIZE (xorg/X11R6.8.1-src6.tar.gz) = 3180972 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src6.tar.gz) = edfb5acc726fb7ce3634e5d9725deaf3 +SIZE (xorg/X11R6.8.2-src6.tar.gz) = 3205143 diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 138e45a9bc1d..2dba31eac5a4 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-libraries -PORTVERSION= 6.8.1 -PORTREVISION= 1 +PORTVERSION= 6.8.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R6.8.1/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11/xorg-libraries/distinfo +++ b/x11/xorg-libraries/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11/xorg-libraries/files/patch-xpm-sec b/x11/xorg-libraries/files/patch-xpm-sec deleted file mode 100644 index fcb22f47be46..000000000000 --- a/x11/xorg-libraries/files/patch-xpm-sec +++ /dev/null @@ -1,228 +0,0 @@ -? extras/Xpm/lib/xorg681-xpm-secadd.patch -Index: extras/Xpm/lib/Attrib.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/Attrib.c,v -retrieving revision 1.1.1.1.6.1 -diff -u -r1.1.1.1.6.1 Attrib.c ---- extras/Xpm/lib/Attrib.c 15 Sep 2004 15:47:39 -0000 1.1.1.1.6.1 -+++ extras/Xpm/lib/Attrib.c 5 Nov 2004 03:21:02 -0000 -@@ -52,7 +52,7 @@ - XpmColor **colorTable, **color; - int a; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ if (ncolors >= UINT_MAX / sizeof(XpmColor *)) - return XpmNoMemory; - - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); -Index: extras/Xpm/lib/CrDatFrI.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/CrDatFrI.c,v -retrieving revision 1.2.4.1 -diff -u -r1.2.4.1 CrDatFrI.c ---- extras/Xpm/lib/CrDatFrI.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 -+++ extras/Xpm/lib/CrDatFrI.c 5 Nov 2004 03:21:02 -0000 -@@ -124,7 +124,7 @@ - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -- if (header_size >= SIZE_MAX / sizeof(char *)) -+ if (header_size >= UINT_MAX / sizeof(char *)) - return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) -Index: extras/Xpm/lib/create.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.2.4.1 -diff -u -r1.2.4.1 create.c ---- extras/Xpm/lib/create.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 -+++ extras/Xpm/lib/create.c 5 Nov 2004 03:21:03 -0000 -@@ -1,4 +1,4 @@ --/* $XdotOrg: xc/extras/Xpm/lib/create.c,v 1.2.4.1 2004/09/15 15:47:39 daniel Exp $ */ -+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ - /* - * Copyright (C) 1989-95 GROUPE BULL - * -@@ -817,7 +817,7 @@ - - ErrorStatus = XpmSuccess; - -- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -+ if (image->ncolors >= UINT_MAX / sizeof(Pixel)) - return (XpmNoMemory); - - /* malloc pixels index tables */ -@@ -992,8 +992,10 @@ - return (XpmNoMemory); - - #if !defined(FOR_MSW) && !defined(AMIGA) -- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) { -+ XDestroyImage(*image_return); - return XpmNoMemory; -+ } - /* now that bytes_per_line must have been set properly alloc data */ - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -2061,8 +2063,8 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -- if (ncolors >= SIZE_MAX / sizeof(Pixel)) -- return XpmNoMemory; -+ if (ncolors >= UINT_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); - - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) -@@ -2366,7 +2368,7 @@ - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -Index: extras/Xpm/lib/hashtab.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/hashtab.c,v -retrieving revision 1.1.1.1.6.1 -diff -u -r1.1.1.1.6.1 hashtab.c ---- extras/Xpm/lib/hashtab.c 15 Sep 2004 15:47:39 -0000 1.1.1.1.6.1 -+++ extras/Xpm/lib/hashtab.c 5 Nov 2004 03:21:03 -0000 -@@ -138,13 +138,13 @@ - unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; -- int oldSize = size; -+ unsigned int oldSize = size; - - t = atomTable; - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -- if (size >= SIZE_MAX / sizeof(*atomTable)) -+ if (size >= UINT_MAX / sizeof(*atomTable)) - return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) -@@ -206,7 +206,7 @@ - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -- if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ if (table->size >= UINT_MAX / sizeof(*atomTable)) - return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) -Index: extras/Xpm/lib/parse.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/parse.c,v -retrieving revision 1.2.4.1 -diff -u -r1.2.4.1 parse.c ---- extras/Xpm/lib/parse.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 -+++ extras/Xpm/lib/parse.c 5 Nov 2004 03:21:03 -0000 -@@ -1,4 +1,4 @@ --/* $XdotOrg: xc/extras/Xpm/lib/parse.c,v 1.2.4.1 2004/09/15 15:47:39 daniel Exp $ */ -+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ - /* - * Copyright (C) 1989-95 GROUPE BULL - * -@@ -205,7 +205,7 @@ - char **defaults; - int ErrorStatus; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ if (ncolors >= UINT_MAX / sizeof(XpmColor)) - return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) -@@ -218,7 +218,7 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -+ if (cpp >= UINT_MAX - 1) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -@@ -306,7 +306,7 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -+ if (cpp >= UINT_MAX - 1) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -@@ -374,7 +374,7 @@ - unsigned int a, x, y; - - if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -+ width * height >= UINT_MAX / sizeof(unsigned int)) - return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); -@@ -432,7 +432,7 @@ - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -Index: extras/Xpm/lib/scan.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.2.4.1 -diff -u -r1.2.4.1 scan.c ---- extras/Xpm/lib/scan.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 -+++ extras/Xpm/lib/scan.c 5 Nov 2004 03:21:03 -0000 -@@ -234,14 +234,14 @@ - cpp = 0; - - if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -+ width * height >= UINT_MAX / sizeof(unsigned int)) - RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -- if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -+ if (pmap.size >= UINT_MAX / sizeof(Pixel)) - RETURN(XpmNoMemory); - - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); -@@ -308,7 +308,7 @@ - * get rgb values and a string of char, and possibly a name for each - * color - */ -- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor)) - RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) -@@ -368,7 +368,7 @@ - - /* first get a character string */ - a = 0; -- if (cpp >= SIZE_MAX - 1) -+ if (cpp >= UINT_MAX - 1) - return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); -@@ -461,7 +461,7 @@ - } - - /* first get character strings and rgb values */ -- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1) - return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist index 46c44c9b6ff6..7eaee36b0459 100644 --- a/x11/xorg-libraries/pkg-plist +++ b/x11/xorg-libraries/pkg-plist @@ -314,7 +314,6 @@ include/X11/extensions/Xvproto.h include/X11/extensions/bigreqstr.h include/X11/extensions/composite.h include/X11/extensions/compositeproto.h -include/X11/extensions/damage.h include/X11/extensions/damageproto.h include/X11/extensions/damagewire.h include/X11/extensions/dpms.h @@ -496,6 +495,9 @@ lib/X11/locale/mulelao-1/XI18N_OBJS lib/X11/locale/mulelao-1/XLC_LOCALE lib/X11/locale/nokhchi-1/XI18N_OBJS lib/X11/locale/nokhchi-1/XLC_LOCALE +lib/X11/locale/pt_BR.UTF-8/Compose +lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS +lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE lib/X11/locale/tatar-cyr/XI18N_OBJS lib/X11/locale/tatar-cyr/XLC_LOCALE lib/X11/locale/th_TH.UTF-8/XI18N_OBJS @@ -672,6 +674,70 @@ libdata/pkgconfig/xdamage.pc libdata/pkgconfig/xevie.pc libdata/pkgconfig/xfixes.pc libdata/pkgconfig/xrender.pc -@dirrm include/X11/XprintAppUtil +@dirrm include/X11/extensions +@dirrm include/X11/ICE +@dirrm include/X11/SM +@dirrm include/X11/Xmu @dirrm include/X11/XprintUtil +@dirrm include/X11/XprintAppUtil +@dirrm include/X11/Xaw +@dirrm include/X11/Xcursor +@dirrm include/GL +@dirrm include/DPS +@dirrm lib/X11/locale/lib/common +@dirrm lib/X11/locale/lib +@dirrm lib/X11/locale/C +@dirrm lib/X11/locale/armscii-8 +@dirrm lib/X11/locale/en_US.UTF-8 +@dirrm lib/X11/locale/georgian-academy +@dirrm lib/X11/locale/georgian-ps +@dirrm lib/X11/locale/ibm-cp1133 +@dirrm lib/X11/locale/iscii-dev +@dirrm lib/X11/locale/isiri-3342 +@dirrm lib/X11/locale/iso8859-1 +@dirrm lib/X11/locale/iso8859-2 +@dirrm lib/X11/locale/iso8859-3 +@dirrm lib/X11/locale/iso8859-4 +@dirrm lib/X11/locale/iso8859-5 +@dirrm lib/X11/locale/iso8859-6 +@dirrm lib/X11/locale/iso8859-7 +@dirrm lib/X11/locale/iso8859-8 +@dirrm lib/X11/locale/iso8859-9 +@dirrm lib/X11/locale/iso8859-10 +@dirrm lib/X11/locale/iso8859-11 +@dirrm lib/X11/locale/iso8859-13 +@dirrm lib/X11/locale/ja +@dirrm lib/X11/locale/iso8859-14 +@dirrm lib/X11/locale/iso8859-15 +@dirrm lib/X11/locale/iso8859-9e +@dirrm lib/X11/locale/ja.JIS +@dirrm lib/X11/locale/ja.SJIS +@dirrm lib/X11/locale/ja_JP.UTF-8 +@dirrm lib/X11/locale/ko +@dirrm lib/X11/locale/ko_KR.UTF-8 +@dirrm lib/X11/locale/koi8-r +@dirrm lib/X11/locale/koi8-u +@dirrm lib/X11/locale/koi8-c +@dirrm lib/X11/locale/microsoft-cp1251 +@dirrm lib/X11/locale/microsoft-cp1255 +@dirrm lib/X11/locale/microsoft-cp1256 +@dirrm lib/X11/locale/mulelao-1 +@dirrm lib/X11/locale/nokhchi-1 +@dirrm lib/X11/locale/pt_BR.UTF-8 +@dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/th_TH +@dirrm lib/X11/locale/th_TH.UTF-8 +@dirrm lib/X11/locale/tscii-0 +@dirrm lib/X11/locale/vi_VN.tcvn +@dirrm lib/X11/locale/vi_VN.viscii +@dirrm lib/X11/locale/zh_CN +@dirrm lib/X11/locale/zh_CN.gbk @dirrm lib/X11/locale/zh_CN.UTF-8 +@dirrm lib/X11/locale/zh_HK.big5 +@dirrm lib/X11/locale/zh_HK.big5hkscs +@dirrm lib/X11/locale/zh_TW +@dirrm lib/X11/locale/zh_TW.big5 +@dirrm lib/X11/locale/zh_TW.UTF-8 +@dirrm lib/X11/locale/el_GR.UTF-8 +@unexec rmdir %D/include/X11/fonts 2>/dev/null || true +@unexec rmdir %D/lib/X11/locale 2>/dev/null || true diff --git a/x11/xorg-manpages/Makefile b/x11/xorg-manpages/Makefile index 7900a6d2be85..245848ceebcc 100644 --- a/x11/xorg-manpages/Makefile +++ b/x11/xorg-manpages/Makefile @@ -6,10 +6,11 @@ # PORTNAME= xorg-manpages -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R6.8.1/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src +DISTNAME= X11R${PORTVERSION}-src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src3.tar.gz EXTRACT_ONLY= X11R${PORTVERSION}-src1.tar.gz @@ -26,7 +27,7 @@ XINCLUDE_DIRS= ${XMAN_DIRS} post-extract: (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \ + ${DISTDIR}/${DIST_SUBDIR}/X11R${PORTVERSION}-src3.tar.gz | \ ${TAR} -xf - xc/programs/Xserver); .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" diff --git a/x11/xorg-manpages/distinfo b/x11/xorg-manpages/distinfo index 62c1647dc07b..00c3b2d7e408 100644 --- a/x11/xorg-manpages/distinfo +++ b/x11/xorg-manpages/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 -SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57 +SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299 diff --git a/x11/xorg-manpages/files/manpages b/x11/xorg-manpages/files/manpages index c2016c272820..bc50600695cd 100644 --- a/x11/xorg-manpages/files/manpages +++ b/x11/xorg-manpages/files/manpages @@ -1544,4 +1544,5 @@ MAN7= X.7 \ XConsortium.7 \ XProjectTeam.7 \ XStandards.7 \ + Xprint.7 \ Xsecurity.7 diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 3082b789bab6..17478cf4445c 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none |