- removed obsolete tdfx-interlace patch, updated XF86_VERSION_SNAP patch

- flex 2.5.31(-3) is fixed now

Changed files:
    XFree86-XF86_VERSION_SNAP.patch -> 1.2
    XFree86-tdfx-interlace.patch -> 1.2
    XFree86.spec -> 1.452

diff --git a/XFree86-XF86_VERSION_SNAP.patch b/XFree86-XF86_VERSION_SNAP.patch
index c30ab88b479fc0a1603c8c20177c60743b8e4cba..792114c62fa75282aafe244a5112982b2c243068 100644 (file)
--- a/XFree86-XF86_VERSION_SNAP.patch
+++ b/XFree86-XF86_VERSION_SNAP.patch
@@ -1,16 +1,7 @@
 diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86Version.h xc/programs/Xserver/hw/xfree86/xf86Version.h
 --- xc.orig/programs/Xserver/hw/xfree86/xf86Version.h  2003-06-25 13:07:21.000000000 +0200
 +++ xc/programs/Xserver/hw/xfree86/xf86Version.h       2003-06-27 14:04:29.000000000 +0200
-@@ -5,7 +5,7 @@
- #define XF86_VERSION_MAJOR    4
- #define XF86_VERSION_MINOR    3
- #define XF86_VERSION_PATCH    99
--#define XF87_VERSION_SNAP     6
-+#define XF86_VERSION_SNAP     6
- 
- /* This has five arguments for compatibilty reasons */
- #define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
-@@ -19,13 +19,13 @@
+@@ -19,7 +19,7 @@
  /* Define these for compatibility.  They'll be removed at some point. */
  #define XF86_VERSION_SUBMINOR XF86_VERSION_PATCH
  #define XF86_VERSION_BETA     0
@@ -19,10 +10,3 @@ diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86Version.h xc/programs/Xserver/
  
  #define XF86_VERSION_CURRENT                                  \
     XF86_VERSION_NUMERIC(XF86_VERSION_MAJOR,                   \
-                       XF86_VERSION_MINOR,                     \
-                       XF86_VERSION_PATCH,                     \
--                      XF87_VERSION_SNAP,                      \
-+                      XF86_VERSION_SNAP,                      \
-                       0)
- 
- #endif

diff --git a/XFree86-tdfx-interlace.patch b/XFree86-tdfx-interlace.patch
deleted file mode 100644 (file)
index 14b5a16..0000000
--- a/XFree86-tdfx-interlace.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h.orig  Thu Apr  5 23:29:17 2001
-+++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h       Thu Sep  5 21:46:01 2002
-@@ -45,6 +45,7 @@
- #define SST_DESKTOP_EN                  BIT(7)
- #define SST_DESKTOP_PIXEL_FORMAT_SHIFT  18
- #define SST_DESKTOP_CLUT_BYPASS         BIT(10)
-+#define SST_INTERLACE                   BIT(3)
- #define SST_HALF_MODE                   BIT(4)
- #define SST_CURSOR_EN                   BIT(27)
- #define SST_FBI_BUSY                    BIT(7)
---- XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c.orig       Wed Sep 18 03:02:14 2002
-+++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c    Wed Sep 18 13:41:20 2002
-@@ -960,7 +960,18 @@
-   clockRanges->minClock= 12000; /* !!! What's the min clock? !!! */
-   clockRanges->maxClock=pTDFX->MaxClock;
-   clockRanges->clockIndex = -1;
--  clockRanges->interlaceAllowed = FALSE;
-+  switch (pTDFX->ChipType) {
-+    case PCI_CHIP_BANSHEE:
-+      clockRanges->interlaceAllowed = FALSE;
-+      break;
-+    case PCI_CHIP_VOODOO3:
-+    case PCI_CHIP_VOODOO5:
-+      clockRanges->interlaceAllowed = TRUE;
-+      break;
-+    default:
-+      clockRanges->interlaceAllowed = FALSE;
-+      break;
-+  }    
-   clockRanges->doubleScanAllowed = TRUE;
- 
-   /*
-@@ -990,7 +1001,7 @@
-     return FALSE;
-   }
- 
--  xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V);
-+  xf86SetCrtcForModes(pScrn, 0);
- 
-   pScrn->currentMode = pScrn->modes;
- 
-@@ -1666,6 +1677,10 @@
-     tdfxReg->screensize=mode->HDisplay|(mode->VDisplay<<12);
-     tdfxReg->vidcfg &= ~SST_HALF_MODE;
-   }
-+  if (mode->Flags&V_INTERLACE) {
-+    tdfxReg->vidcfg|=SST_INTERLACE;
-+  } else
-+    tdfxReg->vidcfg&=~SST_INTERLACE;
- 
-   TDFXTRACEREG("cpp=%d Hdisplay=%d Vdisplay=%d stride=%d screensize=%x\n", 
-            pTDFX->cpp, mode->HDisplay, mode->VDisplay, tdfxReg->stride, 
-@@ -2394,12 +2409,29 @@
- 
- static int
- TDFXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
-+  ScrnInfoPtr pScrn;
-+  TDFXPtr pTDFX;
-+
-   TDFXTRACE("TDFXValidMode start\n");
-   if ((mode->HDisplay>2048) || (mode->VDisplay>1536)) 
-     return MODE_BAD;
--  /* Banshee doesn't support interlace. Does V3? */
--  if (mode->Flags&V_INTERLACE) 
--    return MODE_BAD;
-+  /* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
-+  pScrn = xf86Screens[scrnIndex];
-+  pTDFX = TDFXPTR(pScrn);
-+  if (mode->Flags&V_INTERLACE) {
-+    switch (pTDFX->ChipType) {
-+      case PCI_CHIP_BANSHEE:
-+        return MODE_BAD;
-+        break;
-+      case PCI_CHIP_VOODOO3:
-+      case PCI_CHIP_VOODOO5:
-+        return MODE_OK;
-+        break;
-+      default:
-+        return MODE_BAD;
-+        break;
-+    }
-+  }
-   /* In clock doubled mode widths must be divisible by 16 instead of 8 */
-   if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16))
-     return MODE_BAD;

diff --git a/XFree86.spec b/XFree86.spec
index 49eefaa2ec054c38eef2e6260cc9eb15b84177f3..520e4a36f3b724aade1ad01d3bed7014844eed37 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -99,7 +99,7 @@ Patch33:      %{name}-clearrts.patch
 Patch34:       %{name}-fix-07-s3trio64v2gx+netfinity.patch
 Patch35:       %{name}-i740-driver-update-cvs-20020617.patch
 Patch36:       %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch37:       %{name}-tdfx-interlace.patch
+
 Patch38:       %{name}-tdfx-fix-compiler-warnings.patch
 Patch39:       %{name}-tdfx-fix-vtswitch-font-corruption.patch
 Patch40:       %{name}-Xfont-Type1-large-DoS.patch
@@ -136,7 +136,6 @@ BuildRequires:      ed
 %ifarch %{ix86}
 %{!?_without_tdfx:BuildRequires:       Glide2x_SDK}
 %endif
-BuildConflicts:        flex >= 2.5.31
 Requires:      xauth
 Requires:      %{name}-libs = %{version}
 ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
@@ -1970,7 +1969,6 @@ System. 
 #%patch34 -p1  -- seems not applied (was partially in rc1??? maybe another fix present?)
 #%patch35 -p1  -- obsoleted? (but doesn't look to be applied)
 %{!?_without_tdfx:%patch36 -p0}
-%{!?_without_tdfx:%patch37 -p1}
 #%patch38 -p0  -- causing problems IIRC (but not really needed)
 %{!?_without_tdfx:%patch39 -p0}
 %patch40 -p1