[arch-commits] Commit in xorg-server/repos (3 files)

Ionut Biru ibiru at archlinux.org
Mon Nov 30 04:15:14 EST 2009


    Date: Monday, November 30, 2009 @ 04:15:14
  Author: ibiru
Revision: 60008

Merged revisions 60006 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk

........
  r60006 | jgc | 2009-11-30 09:48:24 +0200 (Mon, 30 Nov 2009) | 2 lines
  
  upgpkg: xorg-server 1.7.2-2
      Fix ABI break introduced in 1.7.2
........

Added:
  xorg-server/repos/extra-i686/fix-abi-break.patch
    (from rev 60006, xorg-server/trunk/fix-abi-break.patch)
Modified:
  xorg-server/repos/extra-i686/	(properties)
  xorg-server/repos/extra-i686/PKGBUILD

---------------------+
 PKGBUILD            |    7 +++-
 fix-abi-break.patch |   85 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)


Property changes on: xorg-server/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-59978
   + /xorg-server/trunk:1-60007

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-30 07:48:39 UTC (rev 60007)
+++ extra-i686/PKGBUILD	2009-11-30 09:15:14 UTC (rev 60008)
@@ -3,7 +3,7 @@
 
 pkgname=xorg-server
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -21,6 +21,7 @@
         xserver-1.7.1-libcrypto.patch
         xserver-1.7.1-sigaction.patch
         xserver-1.7.1-gamma-kdm-fix.patch
+        fix-abi-break.patch
         xvfb-run
         xvfb-run.1)
 md5sums=('5c087e0f555203065fd90d02ef5f736e'
@@ -28,6 +29,7 @@
          '957d429cad03ac87281b7e40d963497c'
          '9de9025a8c93b57188fce137b3262d1e'
          '8eae23916552e609c36ecae1827c2e9d'
+         'e7e2ed598b96b1bbaf926657db85967e'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b')
 
@@ -45,6 +47,9 @@
   # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
 
+  # http://cgit.freedesktop.org/xorg/xserver/commit/?id=155e61a9f0429bf28ce493c0fe7a2d076cb7e137
+  patch -Np1 -i "${srcdir}/fix-abi-break.patch" || return 1
+
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 

Copied: xorg-server/repos/extra-i686/fix-abi-break.patch (from rev 60006, xorg-server/trunk/fix-abi-break.patch)
===================================================================
--- extra-i686/fix-abi-break.patch	                        (rev 0)
+++ extra-i686/fix-abi-break.patch	2009-11-30 09:15:14 UTC (rev 60008)
@@ -0,0 +1,85 @@
+From 155e61a9f0429bf28ce493c0fe7a2d076cb7e137 Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner at nvidia.com>
+Date: Sun, 29 Nov 2009 20:06:26 +0000
+Subject: Restore ABI by reintroducing the "is_src" paramter to image_from_pict.
+
+Restores old ABI after 196aff9b18381d700fb28027186cce6e68ad587c.
+
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+Tested-by: Julien Cristau <jcristau at debian.org>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/fb/fb.h b/fb/fb.h
+index 6c9f8a1..37de71e 100644
+--- a/fb/fb.h
++++ b/fb/fb.h
+@@ -2080,7 +2080,8 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
+ 
+ extern _X_EXPORT pixman_image_t *
+ image_from_pict (PicturePtr pict,
+-		 Bool       has_clip);
++		 Bool       has_clip,
++		 Bool       is_src);
+ extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
+ 
+ #endif /* _FB_H_ */
+diff --git a/fb/fbpict.c b/fb/fbpict.c
+index 8057e90..8fdaa58 100644
+--- a/fb/fbpict.c
++++ b/fb/fbpict.c
+@@ -163,9 +163,9 @@ fbComposite (CARD8      op,
+     if (pMask)
+ 	miCompositeSourceValidate (pMask, xMask, yMask, width, height);
+     
+-    src = image_from_pict (pSrc, TRUE);
+-    mask = image_from_pict (pMask, TRUE);
+-    dest = image_from_pict (pDst, TRUE);
++    src = image_from_pict (pSrc, TRUE, TRUE);
++    mask = image_from_pict (pMask, TRUE, TRUE);
++    dest = image_from_pict (pDst, TRUE, FALSE);
+ 
+     if (src && dest && !(pMask && !mask))
+     {
+@@ -361,7 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
+     
+     if (pict->alphaMap)
+     {
+-	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
++	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE, TRUE);
+ 	
+ 	pixman_image_set_alpha_map (
+ 	    image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
+@@ -395,7 +395,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
+ 
+ pixman_image_t *
+ image_from_pict (PicturePtr pict,
+-		 Bool has_clip)
++		 Bool has_clip,
++		 Bool is_src)
+ {
+     pixman_image_t *image = NULL;
+ 
+diff --git a/fb/fbtrap.c b/fb/fbtrap.c
+index 830603a..b1e1eff 100644
+--- a/fb/fbtrap.c
++++ b/fb/fbtrap.c
+@@ -40,7 +40,7 @@ fbAddTraps (PicturePtr	pPicture,
+ 	    int		ntrap,
+ 	    xTrap	*traps)
+ {
+-    pixman_image_t *image = image_from_pict (pPicture, FALSE);
++    pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
+ 
+     if (!image)
+ 	return;
+@@ -56,7 +56,7 @@ fbRasterizeTrapezoid (PicturePtr    pPicture,
+ 		      int	    x_off,
+ 		      int	    y_off)
+ {
+-    pixman_image_t *image = image_from_pict (pPicture, FALSE);
++    pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
+ 
+     if (!image)
+ 	return;
+--
+cgit v0.8.3-6-g21f6



More information about the arch-commits mailing list