Add additional diff

diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index a210615..9ad2f75 100644 (file)
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -146,7 +146,11 @@ typedef struct {
 
 typedef struct {
   unsigned long base_id;
+#ifdef _F_PUT_ON_PIXMAP_
+  unsigned int type; 
+#else
   unsigned char type; 
+#endif
   char *name;
   int nEncodings;
   XvEncodingPtr pEncodings;  

diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 12b4c51..ebb6dbb 100644 (file)
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -1107,6 +1107,12 @@ XvdiMatchPort(
 
   if (pa->pScreen != pDraw->pScreen) return BadMatch;
 
+#ifdef _F_PUT_ON_PIXMAP_
+  if (!((pDraw->type == DRAWABLE_PIXMAP && pa->type & XvPixmapMask) ||
+        (pDraw->type == DRAWABLE_WINDOW && pa->type & XvWindowMask)))
+    return BadMatch;
+#endif
+
   nf = pa->nFormats;
   pf = pa->pFormats;
 

diff --git a/debian/changelog b/debian/changelog
index 1096988..2f81f0a 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xorg-server (2:1.9.3-22slp2) unstable; urgency=low
+
+  * fix error of applying patch
+  * Git: 165.213.180.234:slp/pkgs/xorg/server/xorg-server
+  * Tag: xorg-server_1.9.3-22slp2
+
+ -- Boram Park <boram1288.park@samsung.com>  Tue, 14 Feb 2012 19:35:42 +0900
+
+xorg-server (2:1.9.3-21slp2) unstable; urgency=low
+
+  * put video on pixmap
+  * Git: 165.213.180.234:slp/pkgs/xorg/server/xorg-server
+  * Tag: xorg-server_1.9.3-21slp2
+
+ -- Boram Park <boram1288.park@samsung.com>  Tue, 14 Feb 2012 09:51:15 +0900
+
 xorg-server (2:1.9.3-20slp2) unstable; urgency=low
 
   * Add libkms1 into "Depends" section for xserver-xorg-core pkg

diff --git a/debian/rules b/debian/rules
index 41e80f6..af85e92 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,8 @@ CFLAGS += -D_F_NO_GRABTIME_UPDATE_
 CFLAGS += -D_F_COMP_OVL_PATCH
 # enable gesture support
 CFLAGS += -D_F_GESTURE_EXTENSION_
+# put video on pixman
+CFLAGS += -D_F_PUT_ON_PIXMAP_
 ###########################################################################################
 
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index c1d3199..79e7db4 100644 (file)
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -1716,8 +1716,10 @@ xf86XVPutImage(
   int ret = Success;
   Bool clippedAway = FALSE;
 
+#ifndef _F_PUT_ON_PIXMAP_
   if (pDraw->type != DRAWABLE_WINDOW)
       return BadAlloc;
+#endif
 
   if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
 
@@ -1744,6 +1746,10 @@ xf86XVPutImage(
      RegionUninit(&VPReg);
   }
 
+#ifdef _F_PUT_ON_PIXMAP_
+  if (pDraw->type == DRAWABLE_WINDOW)
+  {
+#endif
   /* If we are changing windows, unregister our port in the old window */
   if(portPriv->pDraw && (portPriv->pDraw != pDraw))
      xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
@@ -1751,6 +1757,9 @@ xf86XVPutImage(
   /* Register our port with the new window */
   ret =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
   if(ret != Success) goto PUT_IMAGE_BAILOUT;
+#ifdef _F_PUT_ON_PIXMAP_
+  }
+#endif
 
   if(!RegionNotEmpty(&ClipRegion)) {
      clippedAway = TRUE;