ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ configure.ac | 18 +++++++++++------- debian/changelog | 8 ++++++-- 3 files changed, 55 insertions(+), 9 deletions(-)
New commits: commit 8e5d4f77cab940b94c9595e3bd1ab3dc8465180e Author: Timo Aaltonen <[email protected]> Date: Fri Dec 4 15:09:15 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 1792894..2860488 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +commit aea5ace1ee331fab0b72885ce0d5d3fc235e0708 +Author: Peter Hutterer <[email protected]> +Date: Thu Dec 3 11:57:16 2009 +1000 + + xserver 1.7.3 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit f41e87f32e7525e7425d7b300699dccd994b5002 +Author: Gaetan Nadon <[email protected]> +Date: Sat Nov 28 21:32:47 2009 -0500 + + configure.ac: error while checking for XDMXCONFIG_DEP + + Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4 + The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES] + was not quoted. + + Signed-off-by: Gaetan Nadon <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + Tested-by: Julien Cristau <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + (cherry picked from commit 91c1bd78f7240c92702828f8e5a6b6ce944b9e36) + (cherry picked from commit b8623569a3acff31cb18a9f6046e60d0637cc0e0) + +commit c0de621b42bd69e883e15082c7fd35709d545d55 +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]> + (cherry picked from commit 155e61a9f0429bf28ce493c0fe7a2d076cb7e137) + commit 1fff1b37a91c989c046d96d961862d592a307496 Author: Peter Hutterer <[email protected]> Date: Fri Nov 27 14:58:57 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 48848d8..3e51c77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -xorg-server (2:1.7.2-3) UNRELEASED; urgency=low +xorg-server (2:1.7.3-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Enable GLX 1.4 on DRI2 and swrast (from upstream, via F12). - -- Julien Cristau <[email protected]> Wed, 02 Dec 2009 21:52:45 +0100 + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen <[email protected]> Fri, 04 Dec 2009 15:08:55 +0200 xorg-server (2:1.7.2-2) experimental; urgency=low commit aea5ace1ee331fab0b72885ce0d5d3fc235e0708 Author: Peter Hutterer <[email protected]> Date: Thu Dec 3 11:57:16 2009 +1000 xserver 1.7.3 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 1038734..0c98bf2 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.7.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2009-11-27" +AC_INIT([xorg-server], 1.7.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2009-12-3" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE commit f41e87f32e7525e7425d7b300699dccd994b5002 Author: Gaetan Nadon <[email protected]> Date: Sat Nov 28 21:32:47 2009 -0500 configure.ac: error while checking for XDMXCONFIG_DEP Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4 The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES] was not quoted. Signed-off-by: Gaetan Nadon <[email protected]> Reviewed-by: Dan Nicholson <[email protected]> Tested-by: Julien Cristau <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 91c1bd78f7240c92702828f8e5a6b6ce944b9e36) (cherry picked from commit b8623569a3acff31cb18a9f6046e60d0637cc0e0) diff --git a/configure.ac b/configure.ac index 8500db4..1038734 100644 --- a/configure.ac +++ b/configure.ac @@ -1808,11 +1808,15 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"]) AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes]) dnl DMX DDX -PKG_CHECK_MODULES([DMXMODULES], - [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], - PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes], - [have_dmx=no]), - [have_dmx=no]) +PKG_CHECK_MODULES( + [DMXMODULES], + [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], + [PKG_CHECK_MODULES( + [XDMXCONFIG_DEP], + [xaw7 xmu xt xpm x11], + [have_dmx=yes], + [have_dmx=no])], + [have_dmx=no]) AC_MSG_CHECKING([whether to build Xdmx DDX]) if test "x$DMX" = xauto; then DMX="$have_dmx" commit c0de621b42bd69e883e15082c7fd35709d545d55 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]> (cherry picked from commit 155e61a9f0429bf28ce493c0fe7a2d076cb7e137) 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]
