diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-07 07:49:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-07 07:49:55 +0000 |
| commit | 143921f2eb615190ed77e57a6f93f02ffb325c91 (patch) | |
| tree | 19c73ab0992ee863cc67e7b98da84d2347a77ef7 /pixman | |
| parent | e2b908c356746281aba48128da7dc15a28f5a773 (diff) | |
| parent | de1c6801fc854692d39fb2f8d53bf54ab25a1287 (diff) | |
| download | vcxsrv-143921f2eb615190ed77e57a6f93f02ffb325c91.tar.gz vcxsrv-143921f2eb615190ed77e57a6f93f02ffb325c91.tar.bz2 vcxsrv-143921f2eb615190ed77e57a6f93f02ffb325c91.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/Makefile.am | 7 | ||||
| -rw-r--r-- | pixman/pixman/pixman-arm-neon-asm.S | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pixman/Makefile.am b/pixman/Makefile.am index 7eb9f59ac..ccfdbe510 100644 --- a/pixman/Makefile.am +++ b/pixman/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)"
diff --git a/pixman/pixman/pixman-arm-neon-asm.S b/pixman/pixman/pixman-arm-neon-asm.S index 6cca0f2cc..fae51aa7c 100644 --- a/pixman/pixman/pixman-arm-neon-asm.S +++ b/pixman/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
|