Attachment 2611 Details for Bug 3163 – ddx-use-dri-version-defines-1.patch

[patch] ddx-use-dri-version-defines-1.patch

ddx-use-dri-version-defines-1.patch (text/plain), 9.01 KB, created by Adam Jackson on 2005-05-02 20:00:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-05-02 20:00:49 UTC

Size: 9.01 KB

patch

obsolete

>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.5
>diff -u -d -r1.5 r128_dri.c
>--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c	4 Dec 2004 22:34:54 -0000	1.5
>+++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c	3 May 2005 02:55:50 -0000
>@@ -983,7 +983,7 @@
> 
>     /* Check the DRI version */
>     DRIQueryVersion(&major, &minor, &patch);
>-    if (major != 4 || minor < 0) {
>+    if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
> 	xf86DrvMsg(pScreen->myNum, X_ERROR,
> 		"[dri] R128DRIScreenInit failed because of a version mismatch.\n"
> 		"[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v
>retrieving revision 1.16
>diff -u -d -r1.16 radeon_dri.c
>--- programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c	24 Mar 2005 06:45:51 -0000	1.16
>+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c	3 May 2005 02:55:50 -0000
>@@ -1211,7 +1211,7 @@
> 
>     /* Check the DRI version */
>     DRIQueryVersion(&major, &minor, &patch);
>-    if (major != 4 || minor < 0) {
>+    if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
> 	xf86DrvMsg(pScreen->myNum, X_ERROR,
> 		   "[dri] RADEONDRIScreenInit failed because of a version "
> 		   "mismatch.\n"
>Index: programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 glint_dri.c
>--- programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c	16 Jun 2004 09:43:59 -0000	1.3
>+++ programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c	3 May 2005 02:55:51 -0000
>@@ -458,7 +458,7 @@
>     {
>        int major, minor, patch;
>        DRIQueryVersion(&major, &minor, &patch);
>-       if (major != 4 || minor < 0) {
>+       if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
>           xf86DrvMsg(pScreen->myNum, X_ERROR,
>                      "[dri] GLINTDRIScreenInit failed because of a version mismatch.\n"
>                      "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n"
>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.6
>diff -u -d -r1.6 i810_dri.c
>--- programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	24 Jan 2005 15:02:17 -0000	1.6
>+++ programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	3 May 2005 02:55:52 -0000
>@@ -319,7 +319,7 @@
>       int major, minor, patch;
> 
>       DRIQueryVersion(&major, &minor, &patch);
>-      if (major != 4 || minor < 0) {
>+      if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
> 	 xf86DrvMsg(pScreen->myNum, X_ERROR,
> 		    "[dri] I810DRIScreenInit failed because of a version mismatch.\n"
> 		    "[dri] libDRI version is %d.%d.%d bug version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v
>retrieving revision 1.7
>diff -u -d -r1.7 i830_dri.c
>--- programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c	1 Feb 2005 19:47:32 -0000	1.7
>+++ programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c	3 May 2005 02:55:52 -0000
>@@ -438,7 +438,7 @@
>       int major, minor, patch;
> 
>       DRIQueryVersion(&major, &minor, &patch);
>-      if (major != 4 || minor < 0) {
>+      if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
> 	 xf86DrvMsg(pScreen->myNum, X_ERROR,
> 		    "[dri] %s failed because of a version mismatch.\n"
> 		    "[dri] libDRI version is %d.%d.%d bug version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v
>retrieving revision 1.4
>diff -u -d -r1.4 mga_dri.c
>--- programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c	26 Jul 2004 23:14:37 -0000	1.4
>+++ programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c	3 May 2005 02:55:53 -0000
>@@ -1012,7 +1012,7 @@
>    {
>       int major, minor, patch;
>       DRIQueryVersion( &major, &minor, &patch );
>-      if ( major != 4 || minor < 0 ) {
>+      if ( major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION ) {
>          xf86DrvMsg( pScreen->myNum, X_ERROR,
> 		     "[dri] MGADRIScreenInit failed because of a version mismatch.\n"
> 		     "[dri] libDRI version = %d.%d.%d but version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c,v
>retrieving revision 1.19
>diff -u -d -r1.19 savage_dri.c
>--- programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c	17 Mar 2005 00:04:19 -0000	1.19
>+++ programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c	3 May 2005 02:55:54 -0000
>@@ -834,7 +834,7 @@
>    {
>       int major, minor, patch;
>       DRIQueryVersion( &major, &minor, &patch );
>-      if ( major != 4 || minor < 0 ) {
>+      if ( major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION ) {
>          xf86DrvMsg( pScreen->myNum, X_ERROR,
> 		     "[dri] SAVAGEDRIScreenInit failed because of a version mismatch.\n"
> 		     "[dri] libDRI version = %d.%d.%d but version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v
>retrieving revision 1.14
>diff -u -d -r1.14 sis_dri.c
>--- programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c	21 Apr 2005 21:30:56 -0000	1.14
>+++ programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c	3 May 2005 02:55:54 -0000
>@@ -271,7 +271,7 @@
>   {
>      int major, minor, patch;
>      DRIQueryVersion(&major, &minor, &patch);
>-     if(major != 4 || minor < 0) {
>+     if(major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
>         xf86DrvMsg(pScreen->myNum, X_ERROR,
>                     "[dri] SISDRIScreenInit failed because of a version mismatch.\n"
>                     "\t[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 ffb_dri.c
>--- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c	16 Jun 2004 09:44:00 -0000	1.3
>+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c	3 May 2005 02:55:54 -0000
>@@ -219,7 +219,7 @@
>         {
>       		int major, minor, patch;
> 		DRIQueryVersion(&major, &minor, &patch);
>-		if (major != 4 || minor < 0) {
>+		if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
> 		xf86DrvMsg(pScreen->myNum, X_ERROR,
>                     "[dri] FFBDRIScreenInit failed because of a version mismatch.\n"
> 		    "[dri] libDRI version is %d.%d.%d but version, 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 tdfx_dri.c
>--- programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c	16 Jun 2004 09:44:00 -0000	1.3
>+++ programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c	3 May 2005 02:55:54 -0000
>@@ -308,7 +308,7 @@
>   {
>     int major, minor, patch;
>     DRIQueryVersion(&major, &minor, &patch);
>-    if (major != 4 || minor < 0) {
>+    if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
>       xf86DrvMsg(pScreen->myNum, X_ERROR,
>                  "[dri] TDFXDRIScreenInit failed because of a version mismatch.\n"
>                  "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n"
>Index: programs/Xserver/hw/xfree86/drivers/via/via_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.c,v
>retrieving revision 1.12
>diff -u -d -r1.12 via_dri.c
>--- programs/Xserver/hw/xfree86/drivers/via/via_dri.c	6 Feb 2005 07:12:43 -0000	1.12
>+++ programs/Xserver/hw/xfree86/drivers/via/via_dri.c	3 May 2005 02:55:54 -0000
>@@ -560,7 +560,7 @@
>     {
>         int major, minor, patch;
>         DRIQueryVersion(&major, &minor, &patch);
>-        if (major != 4 || minor < 0) {
>+        if (major != XF86DRI_MAJOR_VERSION || minor < XF86DRI_MINOR_VERSION) {
>             xf86DrvMsg(pScreen->myNum, X_ERROR,
>                     "[dri] VIADRIScreenInit failed because of a version mismatch.\n"
>                     "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n"

Actions: View | Splinter Review

Attachments on bug 3163: 2611 | 2674

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.