[pkgsrc/trunk]: pkgsrc/x11/xf86-video-ati6 miInitializeBackingStore is gone i...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2689a9da46c3
branches:  trunk
changeset: 649821:2689a9da46c3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Apr 10 16:03:01 2015 +0000

description:
miInitializeBackingStore is gone in newer server

diffstat:

 x11/xf86-video-ati6/distinfo                           |   5 +++--
 x11/xf86-video-ati6/patches/patch-src_radeon__driver.c |  13 ++++++++++---
 x11/xf86-video-ati6/patches/patch-src_radeon__kms.c    |  14 ++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 88a3943ccdaf -r 2689a9da46c3 x11/xf86-video-ati6/distinfo
--- a/x11/xf86-video-ati6/distinfo      Fri Apr 10 14:27:30 2015 +0000
+++ b/x11/xf86-video-ati6/distinfo      Fri Apr 10 16:03:01 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/04/02 22:16:46 tnn Exp $
+$NetBSD: distinfo,v 1.7 2015/04/10 16:04:10 tnn Exp $
 
 SHA1 (xf86-video-ati-6.14.6.tar.bz2) = b30383c7e5487c1df403a3af19fce8626d617a8d
 RMD160 (xf86-video-ati-6.14.6.tar.bz2) = e285bff97a23f6e6f8553f1c010c840e6df882a8
@@ -13,10 +13,11 @@
 SHA1 (patch-src_radeon__accelfuncs.c) = f9d0ba2a0b7f62a56eecea117c4339f0e18b1e52
 SHA1 (patch-src_radeon__crtc.c) = c22e5a9c4119a4c6aa3f64f83b326effe270c96c
 SHA1 (patch-src_radeon__dri.c) = 479f58f8493543220b931182ab105309f8c035ab
-SHA1 (patch-src_radeon__driver.c) = e6fead10db8c13fdff531aaa01bfd40e95906172
+SHA1 (patch-src_radeon__driver.c) = 63f0fe13ea5b75a303c1a9f7d807815a96960d8f
 SHA1 (patch-src_radeon__exa.c) = d031dac6fcbcccff6534a04ebdf492dd6a5450e6
 SHA1 (patch-src_radeon__exa__funcs.c) = 9a508251f04a26e857e4290de5a6b48f868df7d9
 SHA1 (patch-src_radeon__exa__render.c) = e3f7d2d0bb15d28224366e11d96c984bf0fdaa93
+SHA1 (patch-src_radeon__kms.c) = 7a3eb0e4c485377d64a4f05d5679ebaf0199a065
 SHA1 (patch-src_radeon__mm__i2c.c) = 25703e33ea93306fa09eeb3ada636d55d2c70537
 SHA1 (patch-src_radeon__render.c) = 919c108ba8bafdcdb4e0fba80da621674a62de8c
 SHA1 (patch-src_radeon__textured__video.c) = 409a187b286a228f632e391d68ee71a14289c574
diff -r 88a3943ccdaf -r 2689a9da46c3 x11/xf86-video-ati6/patches/patch-src_radeon__driver.c
--- a/x11/xf86-video-ati6/patches/patch-src_radeon__driver.c    Fri Apr 10 14:27:30 2015 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_radeon__driver.c    Fri Apr 10 16:03:01 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_radeon__driver.c,v 1.2 2015/04/02 22:16:46 tnn Exp $
+$NetBSD: patch-src_radeon__driver.c,v 1.3 2015/04/10 16:03:01 tnn Exp $
 
 --- src/radeon_driver.c.orig   2012-06-25 08:19:41.000000000 +0000
 +++ src/radeon_driver.c
@@ -11,7 +11,14 @@
      { OPTION_SUBPIXEL_ORDER, "SubPixelOrder",    OPTV_ANYSTR,  {0}, FALSE },
  #endif
      { OPTION_CLOCK_GATING,   "ClockGating",      OPTV_BOOLEAN, {0}, FALSE },
-@@ -3761,7 +3761,8 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_D
+@@ -3756,12 +3756,15 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_D
+     /* Backing store setup */
+     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
+                  "Initializing backing store\n");
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+     miInitializeBackingStore(pScreen);
++#endif
+     xf86SetBackingStore(pScreen);
  
      /* DRI finalisation */
  #ifdef XF86DRI
@@ -21,7 +28,7 @@
          info->dri->pKernelDRMVersion->version_minor >= 19)
      {
        if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -6440,7 +6441,11 @@ static Bool RADEONCloseScreen(CLOSE_SCRE
+@@ -6440,7 +6443,11 @@ static Bool RADEONCloseScreen(CLOSE_SCRE
      if (info->dri && info->dri->pDamage) {
        PixmapPtr pPix = pScreen->GetScreenPixmap(pScreen);
  
diff -r 88a3943ccdaf -r 2689a9da46c3 x11/xf86-video-ati6/patches/patch-src_radeon__kms.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_radeon__kms.c       Fri Apr 10 16:03:01 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_radeon__kms.c,v 1.1 2015/04/10 16:03:01 tnn Exp $
+
+--- src/radeon_kms.c.orig      2012-06-29 13:45:35.000000000 +0000
++++ src/radeon_kms.c
+@@ -1039,7 +1039,9 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_AR
+     /* Backing store setup */
+     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
+                  "Initializing backing store\n");
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+     miInitializeBackingStore(pScreen);
++#endif
+     xf86SetBackingStore(pScreen);
+ 
+