Commit 58131720 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

xdriver_xf86-video-ati: Version bump 6.14.6 



Signed-off-by: default avatarBernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1716776e

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-0001-noxaa.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
XAA support was removed from xorg xserver

http://cgit.freedesktop.org/xorg/xserver/commit/?id=e191e296e6e7861978ea4a0ae9aa7b780e52732b



Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>



diff -uNr xf86-video-ati-6.14.6.org/configure.ac xf86-video-ati-6.14.6/configure.ac

--- xf86-video-ati-6.14.6.org/configure.ac	2012-06-29 15:46:11.000000000 +0200

+++ xf86-video-ati-6.14.6/configure.ac	2014-03-29 17:21:35.805208243 +0100

@@ -163,8 +163,6 @@

 AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)

 AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes)

 

-AC_DEFINE(USE_XAA, 1, [Build support for XAA])

-

 # Properly handle EXA.

 AC_MSG_CHECKING([whether to enable EXA support])

 if test "x$EXA" = xyes; then

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-0002-mibstore.patch

0 → 100644
+33 −0
Original line number Diff line number Diff line 
patch adapted from upstream:

http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=e8cb0b721e6ea251f85c799ca0563bfa59a2d37c



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 17:27:54.712440644 +0100

@@ -3753,10 +3753,6 @@

     RADEONInitMemMapRegisters(pScrn, info->ModeReg, info);

     RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);

 

-    /* Backing store setup */

-    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,

-		   "Initializing backing store\n");

-    miInitializeBackingStore(pScreen);

     xf86SetBackingStore(pScreen);

 

     /* DRI finalisation */

diff -uNr xf86-video-ati-6.14.6.org/src/radeon_kms.c xf86-video-ati-6.14.6/src/radeon_kms.c

--- xf86-video-ati-6.14.6.org/src/radeon_kms.c	2012-06-29 15:45:35.000000000 +0200

+++ xf86-video-ati-6.14.6/src/radeon_kms.c	2014-03-29 17:28:02.328340925 +0100

@@ -1036,10 +1036,6 @@

 #endif

 

     pScrn->vtSema = TRUE;

-    /* Backing store setup */

-    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,

-		   "Initializing backing store\n");

-    miInitializeBackingStore(pScreen);

     xf86SetBackingStore(pScreen);

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-0003-DamageUnregister.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
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;

     }

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk

+2 −1
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ 
#

################################################################################



XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.4

XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.6

XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2

XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver

XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT

XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING

XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES

XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto



$(eval $(autotools-package))