pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 Makefile.am                  |    7 +++----
 pixman/pixman-arm-neon-asm.S |    5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit a2153222677327be43251012f462d19a7e98ce14
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Sun Apr 3 20:32:30 2011 -0400

    ARM: Tiny improvement in over_n_8888_8888_ca_process_pixblock_head
    
    Instead of two
    
    	mvn d24, d24
    	mvn d25, d25
    
    use just one
    
    	mvn q12, q12
    
    Also move another vmvn instruction into the created pipeline bubble,
    as pointed out by Siarhei.

diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
index 71b30ac..1d3e64e 100644
--- a/pixman/pixman-arm-neon-asm.S
+++ b/pixman/pixman-arm-neon-asm.S
@@ -1358,11 +1358,10 @@ generate_composite_function \
      *
      * output: updated dest in {d28, d29, d30, d31}
      */
-    vmvn.8      d24, d24
-    vmvn.8      d25, d25
+    vmvn.8      q12, q12
+    vmvn.8      d26, d26
     vmull.u8    q8,  d24, d4
     vmull.u8    q9,  d25, d5
-    vmvn.8      d26, d26
     vmvn.8      d27, d3
     vmull.u8    q10, d26, d6
     vmull.u8    q11, d27, d7
commit 44f99735d9c6a897078db12172d9d2d07b204f37
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Sat Apr 2 14:12:12 2011 -0400

    Makefile.am: Put development releases in "snapshots" directory
    
    Up until now, all pixman release, both snapshots and releases were
    uploaded to the "releases" directory on www.cairographics.org, but
    it's better to development snapshots in the "snapshots" directory.
    
    This patch changes Makefile.am to do that.

diff --git a/Makefile.am b/Makefile.am
index f479a66..658a375 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,10 @@ snapshot:
 
 GPGKEY=6FF7C1A8
 USERNAME=$$USER
-RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
+RELEASE_OR_SNAPSHOT = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
 RELEASE_CAIRO_HOST =	$(USERNAME)@cairographics.org
-RELEASE_CAIRO_DIR =	/srv/cairo.freedesktop.org/www/releases
-RELEASE_CAIRO_URL = 	http://cairographics.org/releases
+RELEASE_CAIRO_DIR =	/srv/cairo.freedesktop.org/www/$(RELEASE_OR_SNAPSHOT)s
+RELEASE_CAIRO_URL = 	http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s
 RELEASE_XORG_URL =	http://xorg.freedesktop.org/archive/individual/lib
 RELEASE_XORG_HOST =	$(USERNAME)@xorg.freedesktop.org
 RELEASE_XORG_DIR =	/srv/xorg.freedesktop.org/archive/individual/lib
@@ -83,7 +83,6 @@ release-tag:
 	git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
 
 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)"