X Strike Force XFree86 SVN commit: rev 874 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-12-24 18:43:38 -0500 (Wed, 24 Dec 2003)
New Revision: 874
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_post430.diff
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff
Log:
Grab fixes to upstream CVS xf-4_3-branch since last pull.
(debian/patches/000_post430.diff):
+ (xc/lib/freetype2/Imakefile):
Include backwards compatibility API for renamed stream functions in
Freetype2 library.
+ (xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c):
1011. Build fix for the i810 driver when XF86DRI isn't defined
(#6006, Matthias Scheler).
(debian/patches/000_stolen_from_HEAD_i830_driver.diff:) resync offsets
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-12-24 23:32:23 UTC (rev 873)
+++ branches/4.3.0/sid/debian/changelog 2003-12-24 23:43:38 UTC (rev 874)
@@ -1,3 +1,17 @@
+xfree86 (4.3.0-0pre1v6) experimental; urgency=low
+
+ * Grab fixes to upstream CVS xf-4_3-branch since last pull.
+ - debian/patches/000_post430.diff:
+ + (xc/lib/freetype2/Imakefile):
+ Include backwards compatibility API for renamed stream functions in
+ Freetype2 library.
+ + (xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c):
+ 1011. Build fix for the i810 driver when XF86DRI isn't defined
+ (#6006, Matthias Scheler).
+ - debian/patches/000_stolen_from_HEAD_i830_driver.diff: resync offsets
+
+ -- Branden Robinson <branden@debian.org> Wed, 24 Dec 2003 18:34:08 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/patches/000_post430.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_post430.diff 2003-12-24 23:32:23 UTC (rev 873)
+++ branches/4.3.0/sid/debian/patches/000_post430.diff 2003-12-24 23:43:38 UTC (rev 874)
@@ -295,6 +295,14 @@
1009. Fix DRM_CAS on ia64 as used by the DRI (Bugzilla #778, John
Dennis). (Alan Hourihane)
+(xc/lib/freetype2/Imakefile):
+ Include backwards compatibility API for renamed stream functions in
+ Freetype2 library.
+
+(xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c):
+ 1011. Build fix for the i810 driver when XF86DRI isn't defined (#6006,
+ Matthias Scheler).
+
Index: xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvs/xc/config/cf/NetBSD.cf,v
@@ -1793,6 +1801,54 @@
}
}
}
+Index: xc/lib/freetype2/Imakefile
+===================================================================
+RCS file: /cvs/xc/lib/freetype2/Imakefile,v
+retrieving revision 1.9
+retrieving revision 1.9.2.1
+diff -u -r1.9 -r1.9.2.1
+--- xc/lib/freetype2/Imakefile 1 Jan 2003 22:08:39 -0000 1.9
++++ xc/lib/freetype2/Imakefile 6 Nov 2003 01:33:04 -0000 1.9.2.1
+@@ -1,4 +1,4 @@
+-XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.9 2003/01/01 22:08:39 torrey Exp $
++XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.9.2.1 2003/11/06 01:33:04 torrey Exp $
+
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+@@ -53,9 +53,10 @@
+
+ HEADERS=ft2build.h
+
+-SRCS_BASE = ftbase.c \
+- ftbdf.c \
++SRCS_BASE = ftapi.c \
++ ftbase.c \
+ ftbbox.c \
++ ftbdf.c \
+ ftdebug.c \
+ ftglyph.c \
+ ftinit.c \
+@@ -65,9 +66,10 @@
+ fttype1.c \
+ ftxf86.c
+
+-OBJS_BASE = ftbase.o \
+- ftbdf.o \
++OBJS_BASE = ftapi.o \
++ ftbase.o \
+ ftbbox.o \
++ ftbdf.o \
+ ftdebug.o \
+ ftglyph.o \
+ ftinit.o \
+@@ -185,6 +187,7 @@
+
+ LinkSourceFile(ft2build.h,$(FREETYPETOP)/include)
+
++LinkSourceFile(ftapi.c,$(FREETYPESRC)/base)
+ LinkSourceFile(ftbase.c,$(FREETYPESRC)/base)
+ LinkSourceFile(ftbdf.c,$(FREETYPESRC)/base)
+ LinkSourceFile(ftbbox.c,$(FREETYPESRC)/base)
Index: xc/programs/Xserver/Xext/Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/Xext/Imakefile,v
@@ -2460,12 +2516,16 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/CHANGELOG,v
retrieving revision 3.2588
-retrieving revision 3.2588.2.32
-diff -u -r3.2588 -r3.2588.2.32
+retrieving revision 3.2588.2.34
+diff -u -r3.2588 -r3.2588.2.34
--- xc/programs/Xserver/hw/xfree86/CHANGELOG 27 Feb 2003 04:56:44 -0000 3.2588
-+++ xc/programs/Xserver/hw/xfree86/CHANGELOG 29 Oct 2003 11:01:56 -0000 3.2588.2.32
-@@ -1,3 +1,104 @@
++++ xc/programs/Xserver/hw/xfree86/CHANGELOG 19 Dec 2003 23:41:23 -0000 3.2588.2.34
+@@ -1,3 +1,108 @@
+XFree86 4.3.0.2 (xx September 2003)
++1011. Build fix for the i810 driver when XF86DRI isn't defined (#6006,
++ Matthias Scheler).
++1010. Include backwards compatibility API for renamed stream functions in
++ Freetype2 library (Torrey T. Lyons).
+1009. Fix DRM_CAS on ia64 as used by the DRI (Bugzilla #778, John Dennis).
+1008. Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
+1007. Fixed definititon of UseInstalledOnCrossCompile so that it never is
@@ -2569,12 +2629,12 @@
XFree86 4.3.0 (27 February 2003)
964. Add an imake option to allow the glibc21-style setjmp() behaviour
to be forced when auto-detecting it fails (this is needed for RH 7.0).
-@@ -16536,4 +16637,9 @@
+@@ -16536,4 +16641,9 @@
XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588 2003/02/27 04:56:44 dawes Exp $
-+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.32 2003/10/29 11:01:56 alanh Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.34 2003/12/19 23:41:23 dawes Exp $
+
+
+
@@ -3431,13 +3491,13 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
retrieving revision 1.27
-retrieving revision 1.27.2.2
-diff -u -r1.27 -r1.27.2.2
+retrieving revision 1.27.2.3
+diff -u -r1.27 -r1.27.2.3
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 14 Feb 2003 17:12:42 -0000 1.27
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 21 Oct 2003 02:22:38 -0000 1.27.2.2
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 19 Dec 2003 23:41:32 -0000 1.27.2.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.27 2003/02/14 17:12:42 dawes Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.27.2.2 2003/10/21 02:22:38 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.27.2.3 2003/12/19 23:41:32 dawes Exp $ */
/**************************************************************************
Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -3506,7 +3566,17 @@
CARD16 imr = INREG16(IMR);
CARD16 ier = INREG16(IER);
CARD16 hwstam = INREG16(HWSTAM);
-@@ -3257,6 +3256,8 @@
+@@ -3234,9 +3233,7 @@
+ I830BIOSLeaveVT(int scrnIndex, int flags)
+ {
+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+-#ifdef XF86DRI
+ I830Ptr pI830 = I830PTR(pScrn);
+-#endif
+
+ DPRINTF(PFX, "Leave VT\n");
+
+@@ -3257,6 +3254,8 @@
RestoreHWState(pScrn);
RestoreBIOSMemSize(pScrn);
I830UnbindGARTMemory(pScrn);
@@ -3515,7 +3585,7 @@
}
/*
-@@ -3386,35 +3387,36 @@
+@@ -3386,35 +3385,36 @@
DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on));
@@ -3576,7 +3646,7 @@
return TRUE;
}
-@@ -3584,3 +3586,5 @@
+@@ -3584,3 +3584,5 @@
pScrn->ValidMode = I830ValidMode;
pScrn->PMEvent = I830PMEvent;
}
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff 2003-12-24 23:32:23 UTC (rev 873)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff 2003-12-24 23:43:38 UTC (rev 874)
@@ -44,8 +44,8 @@
+#define DRAM_WRITE 0x33330000
#endif /* _I830_H_ */
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2003-11-15 18:12:41.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2003-11-15 18:14:32.000000000 +1100
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c~ 2003-12-24 18:03:07.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2003-12-24 18:03:13.000000000 -0500
@@ -230,9 +230,6 @@
static Bool I830VESASetVBEMode(ScrnInfoPtr pScrn, int mode,
VbeCRTCInfoBlock *block);
@@ -56,7 +56,7 @@
#ifdef I830DEBUG
void
-@@ -1063,6 +1063,93 @@
+@@ -1066,6 +1063,93 @@
return FALSE;
}
@@ -150,7 +150,7 @@
static void
RestoreBIOSMemSize(ScrnInfoPtr pScrn)
{
-@@ -1071,6 +1158,9 @@
+@@ -1074,6 +1158,9 @@
DPRINTF(PFX, "RestoreBIOSMemSize\n");
@@ -160,7 +160,7 @@
if (!pI830->overrideBIOSMemSize)
return;
-@@ -1243,6 +1333,7 @@
+@@ -1246,6 +1333,7 @@
return FALSE;
pI830 = I830PTR(pScrn);
@@ -168,7 +168,7 @@
pI830->pEnt = pEnt;
if (pI830->pEnt->location.type != BUS_PCI)
-@@ -1605,10 +1696,13 @@
+@@ -1608,10 +1696,13 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"BIOS now sees %d kB VideoRAM\n",
pI830->BIOSMemorySize / 1024);
@@ -186,7 +186,7 @@
}
}
}
-@@ -1942,6 +2036,7 @@
+@@ -1945,6 +2036,7 @@
* Tiling can't be enabled. Check if there's enough memory for DRI
* without tiling.
*/
@@ -194,7 +194,7 @@
I830ResetAllocations(pScrn, 0);
if (I830Allocate2DMemory(pScrn, ALLOCATE_DRY_RUN | ALLOC_INITIAL) &&
I830Allocate3DMemory(pScrn, ALLOCATE_DRY_RUN | ALLOC_NO_TILING)) {
-@@ -2590,7 +2685,7 @@
+@@ -2593,7 +2685,7 @@
if (temp / pI830->cpp != pScrn->displayWidth) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i),
@@ -203,7 +203,7 @@
OUTREG(stridereg, pScrn->displayWidth * pI830->cpp);
/* Trigger update */
temp = INREG(basereg);
-@@ -2888,7 +2983,8 @@
+@@ -2891,7 +2983,8 @@
* first, then re-initialise the VBE information.
*/
pI830->pVbe = VBEInit(NULL, pI830->pEnt->index);
@@ -213,7 +213,7 @@
if (!pI830->pVbe)
return FALSE;
pI830->vbeInfo = VBEGetVBEInfo(pI830->pVbe);
-@@ -2987,9 +3083,13 @@
+@@ -2990,9 +3083,13 @@
if (pI830->directRenderingEnabled)
pI830->directRenderingEnabled = I830DRIScreenInit(pScreen);
@@ -229,7 +229,7 @@
#else
pI830->directRenderingEnabled = FALSE;
-@@ -3023,6 +3123,9 @@
+@@ -3026,6 +3123,9 @@
pScrn->memPhysBase = (unsigned long)pI830->FbBase;
pScrn->fbOffset = pI830->FrontBuffer.Start;
@@ -239,7 +239,7 @@
vgaHWSetMmioFuncs(hwp, pI830->MMIOBase, 0);
vgaHWGetIOBase(hwp);
DPRINTF(PFX, "assert( if(!vgaHWMapMem(pScrn)) )\n");
-@@ -3160,34 +3263,15 @@
+@@ -3163,34 +3263,15 @@
ScrnInfoPtr pScrn;
I830Ptr pI830;
vbeInfoPtr pVbe;
@@ -276,7 +276,7 @@
}
static void
-@@ -3250,6 +3334,10 @@
+@@ -3251,6 +3332,10 @@
#endif
ResetState(pScrn, TRUE);
@@ -287,7 +287,7 @@
RestoreHWState(pScrn);
RestoreBIOSMemSize(pScrn);
I830UnbindGARTMemory(pScrn);
-@@ -3266,7 +3353,6 @@
+@@ -3266,7 +3351,6 @@
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
I830Ptr pI830 = I830PTR(pScrn);
@@ -295,7 +295,7 @@
DPRINTF(PFX, "Enter VT\n");
-@@ -3277,14 +3365,15 @@
+@@ -3274,14 +3358,15 @@
return FALSE;
CheckInheritedState(pScrn);
Reply to: