Attachment 109788 Details for Bug 80568 – Compilation helper for old code versions, to assist future bisects (though it seems the issue is not bisectable)

Compilation helper for old code versions, to assist future bisects (though it seems the issue is not bisectable)

patch_2_20_0_to_compile_on_modern_x.patch (text/plain), 2.94 KB, created by shachar on 2014-11-21 05:06:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shachar

Created: 2014-11-21 05:06:55 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/src/intel_driver.c b/src/intel_driver.c
>index 78f7ce3..92ef7ee 100644
>--- a/src/intel_driver.c
>+++ b/src/intel_driver.c
>@@ -50,7 +50,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
> #include "xf86cmap.h"
> #include "xf86drm.h"
> #include "compiler.h"
>+#ifdef HAVE_MIBSTORE_H
> #include "mibstore.h"
>+#endif
> #include "mipointer.h"
> #include "micmap.h"
> #include "shadowfb.h"
>@@ -926,7 +928,9 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
> 		return FALSE;
> 	}
> 
>+#ifdef HAVE_MIBSTORE_H
> 	miInitializeBackingStore(screen);
>+#endif
> 	xf86SetBackingStore(screen);
> 	xf86SetSilkenMouse(screen);
> 	miDCInitialize(screen, xf86GetPointerScreenFuncs());
>@@ -1140,8 +1144,7 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL)
> 	}
> 
> 	if (intel->shadow_damage) {
>-		DamageUnregister(&screen->GetScreenPixmap(screen)->drawable,
>-				 intel->shadow_damage);
>+		DamageUnregister(intel->shadow_damage);
> 		DamageDestroy(intel->shadow_damage);
> 		intel->shadow_damage = NULL;
> 	}
>diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
>index 9821612..ac3ec1f 100644
>--- a/src/legacy/i810/i810_driver.c
>+++ b/src/legacy/i810/i810_driver.c
>@@ -58,7 +58,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> #include "xf86cmap.h"
> 
> #include "compiler.h"
>+#ifdef HAVE_MIBSTORE_H
> #include "mibstore.h"
>+#endif
> #include "vgaHW.h"
> #include "mipointer.h"
> #include "micmap.h"
>@@ -1715,7 +1717,9 @@ I810ScreenInit(SCREEN_INIT_ARGS_DECL)
>    }
> #endif
> 
>+#ifdef HAVE_MIBSTORE_H
>    miInitializeBackingStore(screen);
>+#endif
>    xf86SetBackingStore(screen);
>    xf86SetSilkenMouse(screen);
> 
>diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
>index 87a69ba..450f710 100644
>--- a/src/sna/sna_display.c
>+++ b/src/sna/sna_display.c
>@@ -586,7 +586,7 @@ static void sna_mode_disable_shadow(struct sna *sna)
> 
> 	DBG(("%s\n", __FUNCTION__));
> 
>-	DamageUnregister(&sna->front->drawable, sna->mode.shadow_damage);
>+	DamageUnregister(sna->mode.shadow_damage);
> 	DamageDestroy(sna->mode.shadow_damage);
> 	sna->mode.shadow_damage = NULL;
> 
>diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
>index 3871ab6..fa70df3 100644
>--- a/src/sna/sna_driver.c
>+++ b/src/sna/sna_driver.c
>@@ -51,7 +51,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
> #include <mi.h>
> #include <micmap.h>
> #include <mipict.h>
>+#ifdef HAVE_MIBSTORE_H
> #include <mibstore.h>
>+#endif
> 
> #include "compiler.h"
> #include "sna.h"
>@@ -897,7 +899,9 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
> 
> 	xf86SetBlackWhitePixels(screen);
> 
>+#ifdef HAVE_MIBSTORE_H
> 	miInitializeBackingStore(screen);
>+#endif
> 	xf86SetBackingStore(screen);
> 	xf86SetSilkenMouse(screen);
> 	if (!miDCInitialize(screen, xf86GetPointerScreenFuncs()))
>diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
>index 91ef4e0..40c6fa7 100644
>--- a/uxa/uxa-priv.h
>+++ b/uxa/uxa-priv.h
>@@ -44,7 +44,9 @@
> #include "pixmapstr.h"
> #include "windowstr.h"
> #include "servermd.h"
>+#ifdef HAVE_MIBSTORE_H
> #include "mibstore.h"
>+#endif
> #include "colormapst.h"
> #include "gcstruct.h"
> #include "input.h"

Actions: View

Attachments on bug 80568: 101821 | 101823 | 109501 | 109502 | 109507 | 109509 | 109510 | 109667 | 109788 | 112888 | 112956

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.