buildrootschalter/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-0003-DamageUnregister.patch
Bernd Kuhls 581317201d xdriver_xf86-video-ati: Version bump 6.14.6
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-29 23:15:31 +01:00

29 lines
977 B
Diff

Fix compile error, inspired by
http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/commit/?id=e26dec8f5278df74a102493bf6d2d8444dab5d6d
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
diff -uNr xf86-video-ati-6.14.6.org/src/radeon_driver.c xf86-video-ati-6.14.6/src/radeon_driver.c
--- xf86-video-ati-6.14.6.org/src/radeon_driver.c 2012-06-25 10:19:41.000000000 +0200
+++ xf86-video-ati-6.14.6/src/radeon_driver.c 2014-03-29 18:03:47.401381113 +0100
@@ -99,6 +99,7 @@
#endif
#include "xf86cmap.h"
#include "vbe.h"
+#include <xorgVersion.h>
#include "shadow.h"
/* vgaHW definitions */
@@ -6440,7 +6437,11 @@
if (info->dri && info->dri->pDamage) {
PixmapPtr pPix = pScreen->GetScreenPixmap(pScreen);
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
+ DamageUnregister(info->dri->pDamage);
+#else
DamageUnregister(&pPix->drawable, info->dri->pDamage);
+#endif
DamageDestroy(info->dri->pDamage);
info->dri->pDamage = NULL;
}