Add missing compat-api.h to patch, bug #430506.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 132 insertions, 38 deletions

diff --git a/x11-drivers/xf86-video-vmware/ChangeLog b/x11-drivers/xf86-video-vmware/ChangeLog
index 4037891e03bc..c188ef721f32 100644
--- a/x11-drivers/xf86-video-vmware/ChangeLog
+++ b/x11-drivers/xf86-video-vmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-vmware
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.67 2012/08/08 23:35:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.68 2012/08/09 11:49:52 chithanh Exp $
+
+  09 Aug 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch:
+  Add missing compat-api.h to patch, bug #430506.
 
 *xf86-video-vmware-12.0.2-r1 (08 Aug 2012)
 
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 3b78be724a52..833e5ecdc12f 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,4 +1,4 @@
-AUX xf86-video-vmware-12.0.2-xorg-server-1.13.patch 16501 SHA256 f2ae0be1a311e6ac1a9264fb9cee548598f1a4c9dc227c705514de5ef791f647 SHA512 3372e0ed4afb187f391cdbabcbe35099732e027873e16b1324139da97541ad5bd7f0d334cf2214d47d446e697a59661929d33608a3201ab3cffbe153ff201604 WHIRLPOOL ab12afe5fe3dcacc682a2a7f4b7b1e128a06d96bee65ec855beabd9281387c172f5f1f48aa235820e8cf5b702a90c2120b4d9154a82b8292b6bd068d3880f31d
+AUX xf86-video-vmware-12.0.2-xorg-server-1.13.patch 19856 SHA256 22363b8decf438db2eace2e2d7768517d2a5b4c48669cf40e55239dfbeb32ea6 SHA512 d4d5f58973c8ff463d3acc5166a23b932d9f5f47154f68ad23e74dc836d0681bf6fbc696f1de526fd18cad9d4fb4648d543d32db078e273a21e59ad88566bad0 WHIRLPOOL 3ff992b6ead7f768c374d1318aafc1962e1fb800f11f8da075e5283545e2704202f41e236f6687fd6d932dea7b63aea92285d792286448bb4499fdfd375d9f9c
 DIST xf86-video-vmware-11.0.3.tar.bz2 313656 SHA256 b24a7cb2d87e416561e25122eab2cd48fc64a2ba105238456eefef16f29f38a3
 DIST xf86-video-vmware-11.1.0.tar.bz2 336334 SHA256 c97503e97f741e64b57ee0e4399323f9c0151fffa55e6f4b90f04f5921b9406a
 DIST xf86-video-vmware-12.0.0.tar.bz2 351064 SHA256 0319f261a8f8e7694dfafa7fcdfbe1db73143e2401b155e1fddf5a1770db92c2
@@ -10,5 +10,5 @@ EBUILD xf86-video-vmware-12.0.0.ebuild 440 SHA256 d35940793249452ae2bb7abbb7f6d8
 EBUILD xf86-video-vmware-12.0.1.ebuild 461 SHA256 2ebbb15115f4f121411d60f9504bcc358684f64a500c4ad4ccf76ce8d6ebc4cb SHA512 7041eb984c539f69527e956d776e5f12191eb5ce3a769ccc4e407f8855e2efcd62579ef503d584bc61080adfe7563b07f3fb0ca89bee6116e18ed5042f608a07 WHIRLPOOL df5e1b8a2e91aaeb1f3affb6c20ebee45f4e302e2ec5ef5ca3492b4e1535052067f15970cc39babef9df1c7fe10b451b57c50592fcc1a1a4d50cb8439b58ffbf
 EBUILD xf86-video-vmware-12.0.2-r1.ebuild 520 SHA256 201e7d27d5db1dd93d9f8b531981de5b70e8320ddc019d175ea6e6aae0d3729b SHA512 222246c98f80ed3cf824361341634522f85701100dbb8042d840467d238c6d05517f5eaf95cfeb7ca1b1cbe18206e9f8cc6730e7ad64ed27d3fbdb505994a6ba WHIRLPOOL 61c8de3aaa2e2a25f1e728b289dffe0bd7e7bdf74cfc62cb2a2c896581f2d384ae1df2d077ccbd9061e95cf109b858dfabc2ece31a81c26dfdeb9091e86ee432
 EBUILD xf86-video-vmware-12.0.2.ebuild 454 SHA256 8e6a9bd764a7c41d96660a2717ffcc7bad425c79615df79421e6b7442232e51a SHA512 2c7a37a2b3897035713e1883bafc3b897d4e62ff38afd09e2962d77e3d968f5b1a46b86ad68eb31f3ec1f5fa5215edc65358c935956753f73f707ba7a5d05eff WHIRLPOOL 009fb61bfde383546c6e6ac8e61d6c479700b0895e851d9a092e95d4579903ff995a837930e7914664729a03727e11558027e28b1f98229aeb23ad2aa6bfd7a3
-MISC ChangeLog 10299 SHA256 38dc9fedf7f1e0270b4a11ce13520759a1e0cd731c301c3b1dc058f493deb24d SHA512 0999af6e3964124acd8759d1c5250787990dbe3f90b93701c55afce4fd7d4760cdbafed7c80307865f52a92df67c646f484f40f2f2f99755dabfae94a72509c4 WHIRLPOOL ea0fdb503eaa177c105231f9e014004684e7eb6c4e3512e784003faceef9292a1e1e5d8918a0da7bc7cc79db0673515149f3ad50b52ca377332f8a15f46ea428
+MISC ChangeLog 10476 SHA256 10075525f6f0f0878d332e14451b6eb892d92cbc5bd2592779f1050f217a96ee SHA512 bd9103e21c62c50cc4901aa9417ec9a081dec1dbfcf902b8baef3427191e34610b6d4100ece1880f8fd1f85d2c07b04f2adb4626deee92d59c2d773eac1504c6 WHIRLPOOL dcc5dc2d68f6071bcb52d9b668864423a3fa5c0b933db5a478283ac31e318b6d64709326c5047b24633057eebecf1501782aa89155e4c2bcf8fa203f70821743
 MISC metadata.xml 254 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253 SHA512 6d59e8be0228a3a61b27b0984a3ec1a98d5288106c62d9b5fcec735138f3671aec4217de6220c7c978e255242d0db6f71abccae79cc385ce06a6b3d895d00f06 WHIRLPOOL 64bff93fcf13f4db3f1adb4a3d07352faf3d1d2af0ae4fca3411e9b31e40f6494cca8373f83ef0daac2bfaeed1c20bb6af06507d3ae50f3fece86dc7c80c41fa
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch
index 358c10bcb9fa..a45b4ab60a20 100644
--- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch
+++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-12.0.2-xorg-server-1.13.patch
@@ -1,18 +1,6 @@
-From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 06 Jun 2012 08:58:01 +0000
-Subject: vmware: port vmware driver to new compat API
-
-This is a port of the vmware driver to the new compat API.
-
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff -ur a/saa/saa.c b/saa/saa.c
+diff -urN a/saa/saa.c b/saa/saa.c
 --- a/saa/saa.c	2012-03-08 17:13:16.000000000 +0100
-+++ b/saa/saa.c	2012-08-09 01:20:23.000000000 +0200
++++ b/saa/saa.c	2012-08-09 01:23:14.000000000 +0200
 @@ -594,7 +594,7 @@
   * screen private, before calling down to the next CloseScreen.
   */
@@ -31,9 +19,9 @@ diff -ur a/saa/saa.c b/saa/saa.c
  }
  
  struct saa_driver *
-diff -ur a/saa/saa.h b/saa/saa.h
+diff -urN a/saa/saa.h b/saa/saa.h
 --- a/saa/saa.h	2012-03-08 17:13:16.000000000 +0100
-+++ b/saa/saa.h	2012-08-09 01:20:23.000000000 +0200
++++ b/saa/saa.h	2012-08-09 01:23:14.000000000 +0200
 @@ -44,6 +44,8 @@
  #include <damage.h>
  #include <picturestr.h>
@@ -52,10 +40,112 @@ diff -ur a/saa/saa.h b/saa/saa.h
  
  extern _X_EXPORT Bool
  saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
-Nur in b/src: compat-api.h.
-diff -ur a/src/Makefile.am b/src/Makefile.am
+diff -urN a/src/compat-api.h b/src/compat-api.h
+--- a/src/compat-api.h	1970-01-01 01:00:00.000000000 +0100
++++ b/src/compat-api.h	2012-08-09 01:20:23.000000000 +0200
+@@ -0,0 +1,99 @@
++/*
++ * Copyright 2012 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Author: Dave Airlie <airlied@redhat.com>
++ */
++
++/* this file provides API compat between server post 1.13 and pre it,
++   it should be reused inside as many drivers as possible */
++#ifndef COMPAT_API_H
++#define COMPAT_API_H
++
++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
++#endif
++
++#ifndef XF86_HAS_SCRN_CONV
++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
++#endif
++
++#ifndef XF86_SCRN_INTERFACE
++
++#define SCRN_ARG_TYPE int
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
++
++#define SCREEN_ARG_TYPE int
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
++
++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++
++#define VT_FUNC_ARGS_DECL int arg, int flags
++#define VT_FUNC_ARGS pScrn->scrnIndex, 0
++
++#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
++#else
++#define SCRN_ARG_TYPE ScrnInfoPtr
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
++
++#define SCREEN_ARG_TYPE ScreenPtr
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
++
++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS pScreen
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
++
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++#define SWITCH_MODE_ARGS(arg, m) arg, m
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS pScrn
++
++#define XF86_SCRN_ARG(x) (x)
++
++#endif
++
++#endif
+diff -urN a/src/Makefile.am b/src/Makefile.am
 --- a/src/Makefile.am	2012-03-14 00:06:41.000000000 +0100
-+++ b/src/Makefile.am	2012-08-09 01:20:23.000000000 +0200
++++ b/src/Makefile.am	2012-08-09 01:23:14.000000000 +0200
 @@ -37,6 +37,7 @@
  vmware_drv_la_SOURCES = \
  	bits2pixels.c \
@@ -64,9 +154,9 @@ diff -ur a/src/Makefile.am b/src/Makefile.am
  	guest_os.h \
  	includeCheck.h \
  	svga_escape.h \
-diff -ur a/src/vmware.c b/src/vmware.c
+diff -urN a/src/vmware.c b/src/vmware.c
 --- a/src/vmware.c	2012-03-21 19:57:59.000000000 +0100
-+++ b/src/vmware.c	2012-08-09 01:20:23.000000000 +0200
++++ b/src/vmware.c	2012-08-09 01:23:14.000000000 +0200
 @@ -901,8 +901,8 @@
                                                           pScrn->pScreen->rootDepth),
                                             (pointer)(pVMWARE->FbBase + pScrn->fbOffset));
@@ -195,9 +285,9 @@ diff -ur a/src/vmware.c b/src/vmware.c
  {
      return MODE_OK;
  }
-diff -ur a/src/vmware_common.h b/src/vmware_common.h
+diff -urN a/src/vmware_common.h b/src/vmware_common.h
 --- a/src/vmware_common.h	2012-03-08 17:13:16.000000000 +0100
-+++ b/src/vmware_common.h	2012-08-09 01:20:23.000000000 +0200
++++ b/src/vmware_common.h	2012-08-09 01:23:14.000000000 +0200
 @@ -32,6 +32,8 @@
  #include <X11/extensions/panoramiXproto.h>
  #include <xf86.h>
@@ -207,9 +297,9 @@ diff -ur a/src/vmware_common.h b/src/vmware_common.h
  xXineramaScreenInfo *
  VMWAREParseTopologyString(ScrnInfoPtr pScrn,
                            const char *topology,
-diff -ur a/src/vmware.h b/src/vmware.h
+diff -urN a/src/vmware.h b/src/vmware.h
 --- a/src/vmware.h	2012-03-08 17:13:16.000000000 +0100
-+++ b/src/vmware.h	2012-08-09 01:20:23.000000000 +0200
++++ b/src/vmware.h	2012-08-09 01:23:14.000000000 +0200
 @@ -177,7 +177,7 @@
  #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
  
@@ -219,9 +309,9 @@ diff -ur a/src/vmware.h b/src/vmware.h
  }
  
  #define MIN(a,b) ((a)<(b)?(a):(b))
-diff -ur a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+diff -urN a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
 --- a/vmwgfx/vmwgfx_dri2.c	2012-03-08 17:13:16.000000000 +0100
-+++ b/vmwgfx/vmwgfx_dri2.c	2012-08-09 01:20:23.000000000 +0200
++++ b/vmwgfx/vmwgfx_dri2.c	2012-08-09 01:23:14.000000000 +0200
 @@ -83,7 +83,7 @@
  dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format)
  {
@@ -240,9 +330,9 @@ diff -ur a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
      modesettingPtr ms = modesettingPTR(pScrn);
      DRI2InfoRec dri2info;
      int major, minor;
-diff -ur a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+diff -urN a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
 --- a/vmwgfx/vmwgfx_driver.c	2012-03-08 17:13:16.000000000 +0100
-+++ b/vmwgfx/vmwgfx_driver.c	2012-08-09 01:20:23.000000000 +0200
++++ b/vmwgfx/vmwgfx_driver.c	2012-08-09 01:23:14.000000000 +0200
 @@ -107,14 +107,13 @@
   */
  
@@ -443,9 +533,9 @@ diff -ur a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
  {
      return MODE_OK;
  }
-diff -ur a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
+diff -urN a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
 --- a/vmwgfx/vmwgfx_driver.h	2012-03-08 17:13:16.000000000 +0100
-+++ b/vmwgfx/vmwgfx_driver.h	2012-08-09 01:20:23.000000000 +0200
++++ b/vmwgfx/vmwgfx_driver.h	2012-08-09 01:23:14.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <xa_tracker.h>
  #include <xf86Module.h>
@@ -467,9 +557,9 @@ diff -ur a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
      Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
      Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);
  
-diff -ur a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+diff -urN a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
 --- a/vmwgfx/vmwgfx_saa.c	2012-03-21 19:57:59.000000000 +0100
-+++ b/vmwgfx/vmwgfx_saa.c	2012-08-09 01:20:23.000000000 +0200
++++ b/vmwgfx/vmwgfx_saa.c	2012-08-09 01:23:14.000000000 +0200
 @@ -460,7 +460,7 @@
      struct vmwgfx_saa *vsaa =
  	to_vmwgfx_saa(saa_get_driver(pScreen));
@@ -488,9 +578,9 @@ diff -ur a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
  
      /*
       * Make dri2 drawables up to date, or add them to the flush list
-diff -ur a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+diff -urN a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
 --- a/vmwgfx/vmwgfx_tex_video.c	2012-03-08 17:13:16.000000000 +0100
-+++ b/vmwgfx/vmwgfx_tex_video.c	2012-08-09 01:20:23.000000000 +0200
++++ b/vmwgfx/vmwgfx_tex_video.c	2012-08-09 01:23:14.000000000 +0200
 @@ -638,7 +638,7 @@
            DrawablePtr pDraw)
  {