debian/changelog | 8 ++++++-- fb/fb.h | 3 ++- fb/fbpict.c | 11 ++++++----- fb/fbtrap.c | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-)
New commits: commit 873776392b255f76545bf32ef053b41d5b4edc53 Author: Brice Goglin <[email protected]> Date: Mon Nov 30 20:10:30 2009 +0100 Prepare Changelog for upload diff --git a/debian/changelog b/debian/changelog index 8ee0aed..a89107f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.7.2-2) UNRELEASED; urgency=low +xorg-server (2:1.7.2-2) experimental; urgency=low [ Julien Cristau ] * debian/rules: upstream build system got fixed, no need to remove @@ -9,7 +9,7 @@ xorg-server (2:1.7.2-2) UNRELEASED; urgency=low [ Brice Goglin ] * Cherry pick upstream commit to fix the ABI. - -- Brice Goglin <[email protected]> Mon, 30 Nov 2009 20:07:12 +0100 + -- Brice Goglin <[email protected]> Mon, 30 Nov 2009 20:10:27 +0100 xorg-server (2:1.7.2-1) experimental; urgency=low commit 4bd66c903e6b17b4d803b84d3f4e509217cb03af Author: Brice Goglin <[email protected]> Date: Mon Nov 30 20:10:07 2009 +0100 Update Changelog diff --git a/debian/changelog b/debian/changelog index 441eb83..8ee0aed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ xorg-server (2:1.7.2-2) UNRELEASED; urgency=low + [ Julien Cristau ] * debian/rules: upstream build system got fixed, no need to remove configure-generated files. * Steal input_id helper from udev, install it in /lib/xorg. Thanks, Martin Pitt! - -- Julien Cristau <[email protected]> Sat, 28 Nov 2009 17:07:07 +0100 + [ Brice Goglin ] + * Cherry pick upstream commit to fix the ABI. + + -- Brice Goglin <[email protected]> Mon, 30 Nov 2009 20:07:12 +0100 xorg-server (2:1.7.2-1) experimental; urgency=low commit 2730f0bd8150b03a7662179d17f35243597ba1e2 Author: Aaron Plattner <[email protected]> Date: Sun Nov 29 12:06:26 2009 -0800 Restore ABI by reintroducing the "is_src" paramter to image_from_pict. Restores old ABI after 196aff9b18381d700fb28027186cce6e68ad587c. Signed-off-by: Aaron Plattner <[email protected]> Tested-by: Julien Cristau <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> 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; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
