pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 Makefile.am          |   12 +++++++-----
 configure.ac         |    4 ++--
 pixman/pixman-pict.c |   29 ++++++++++++++++-------------
 3 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 6df6a43dc7119a510cf9db2e62fcc970a539e5a3
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Feb 6 17:31:32 2009 -0500

    Bump version number pre release

diff --git a/configure.ac b/configure.ac
index 0dd055e..fa64800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
 #
 
 m4_define([pixman_major], 0)
-m4_define([pixman_minor], 13)
-m4_define([pixman_micro], 3)
+m4_define([pixman_minor], 14)
+m4_define([pixman_micro], 0)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit 6e6c7ac5e0bce2e1893675eb45a8d98876085794
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Feb 6 17:30:24 2009 -0500

    Comment out SrcScaledNearest optimization that hasn't been tested much

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 42a0454..6c43208 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1208,18 +1208,18 @@ fbCompositeSrc_8888xx888 (pixman_op_t op,
 }
 
 static void
-fbCompositeSrcScaleNearest (pixman_op_t op,
-		      pixman_image_t * pSrc,
-		      pixman_image_t * pMask,
-		      pixman_image_t * pDst,
-		      int16_t      xSrc,
-		      int16_t      ySrc,
-		      int16_t      xMask,
-		      int16_t      yMask,
-		      int16_t      xDst,
-		      int16_t      yDst,
-		      uint16_t     width,
-		      uint16_t     height)
+fbCompositeSrcScaleNearest (pixman_op_t     op,
+			    pixman_image_t *pSrc,
+			    pixman_image_t *pMask,
+			    pixman_image_t *pDst,
+			    int16_t         xSrc,
+			    int16_t         ySrc,
+			    int16_t         xMask,
+			    int16_t         yMask,
+			    int16_t         xDst,
+			    int16_t         yDst,
+			    uint16_t        width,
+			    uint16_t        height)
 {
     uint32_t       *dst;
     uint32_t       *src;
@@ -1941,6 +1941,7 @@ pixman_image_composite (pixman_op_t      op,
     if(op == PIXMAN_OP_DST)
         return;
 
+#if 0
     if (pSrc->type == BITS
         && srcTransform
         && !pMask
@@ -1961,7 +1962,9 @@ pixman_image_composite (pixman_op_t      op,
             pSrc->common.transform->matrix[2][2] == pixman_fixed_1) {
             func = fbCompositeSrcScaleNearest;
         }
-    } else if ((pSrc->type == BITS || pixman_image_can_get_solid (pSrc)) && (!pMask || pMask->type == BITS)
+    } else
+#endif
+    if ((pSrc->type == BITS || pixman_image_can_get_solid (pSrc)) && (!pMask || pMask->type == BITS)
         && !srcTransform && !maskTransform
         && !maskAlphaMap && !srcAlphaMap && !dstAlphaMap
         && (pSrc->common.filter != PIXMAN_FILTER_CONVOLUTION)
commit e651118b67111d36193f55a752d13e66df5ca953
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Feb 6 17:29:04 2009 -0500

    Fix release targets to remove all hashfiles before generating tar balls

diff --git a/Makefile.am b/Makefile.am
index 2cf692d..3fbff14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,8 @@ $(gpg_file): $(sha1_tgz)
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
+HASHFILES = $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(md5_tbz2)
+
 release-verify-newer:
 	@echo -n "Checking that no $(VERSION) release already exists at $(RELEASE_XORG_HOST)..."
 	@ssh $(RELEASE_XORG_HOST) test ! -e $(RELEASE_XORG_DIR)/$(tar_gz) \
@@ -61,16 +63,16 @@ release-verify-newer:
 	@echo "Good."
 
 release-remove-old:
-	$(RM) $(tar_gz) $(tar_bz2) $(sha1_tgz) $(gpg_file)
+	$(RM) $(tar_gz) $(tar_bz2) $(HASHFILES) $(gpg_file)
 
 ensure-prev:
 	@if [[ "$(PREV)" == "" ]]; then							\
 		echo ""							          &&	\
 		echo "You must set the PREV variable on the make command line to" &&	\
-		echo "the last version."				  &&	\
+		echo "the last version."				  	  &&	\
 		echo ""								  &&	\
 		echo "For example:"						  &&	\
-		echo "      make PREV=0.7.3"				  &&	\
+		echo "      make PREV=0.7.3"				  	  &&	\
 		echo ""								  &&	\
 		false;									\
 	fi
@@ -80,13 +82,13 @@ release-check: ensure-prev release-verify-newer release-remove-old distcheck
 release-tag:
 	git-tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
 
-release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(gpg_file)
+release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(gpg_file)
 	mkdir -p releases
 	scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
 	scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
 	ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 
-release-publish-message: $(sha1_tgz) $(md5_tgz) $(sha1_tbz2) $(md5_tbz2) ensure-prev
+release-publish-message: $(HASHFILES) ensure-prev
 	@echo "Please follow the instructions in RELEASING to push stuff out and"
 	@echo "send out the announcement mails.  Here is the excerpt you need:"
 	@echo ""