pixman: Changes to 'debian-unstable'
ChangeLog | 32 +++++++++++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 8 +++++++
pixman/pixman-cpu.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
pixman/pixman.h | 12 +++--------
test/composite-traps-test.c | 2 -
6 files changed, 91 insertions(+), 10 deletions(-)
New commits:
commit b60708fb0e2223c41b2c2d46f95519a63582570e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 9 21:16:57 2012 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6935c95..cb3b46d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-pixman (0.24.4-1) UNRELEASED; urgency=low
+pixman (0.24.4-1) unstable; urgency=low
* New upstream release
- Revert "Reject trapezoids where top (botttom) is above (below) the
edges" (closes: #656682)
- -- Julien Cristau <jcristau@debian.org> Thu, 09 Feb 2012 20:49:13 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Feb 2012 21:16:47 +0100
pixman (0.24.2-1) unstable; urgency=low
commit 20446ebc6bcfb6d8ff85330097ebc86fb368f706
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 9 20:52:20 2012 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 6321839..e4b4e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit 8bff730a98dd7e68192743717bf8c9384d5c0c5b
+Author: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed Feb 8 19:03:22 2012 -0500
+
+ Pre-release version bump to 0.24.4
+
+commit c5c866a394c823b2980eff15ce33ce8356010bbe
+Author: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed Jan 25 14:03:05 2012 -0500
+
+ Revert "Reject trapezoids where top (botttom) is above (below) the edges"
+
+ Cairo 1.10 will sometimes generate trapezoids like this, so we can't
+ consider them invalid. Fixes bug 45009, reported by Michael Biebl.
+
+ This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06.
+
+commit 1ceb66750c33c896bdb04b47ed44977112817a86
+Author: Bobby Salazar <bobby8934@gmail.com>
+Date: Thu Jan 26 13:19:18 2012 -0500
+
+ iOS Runtime Detection Support For ARM NEON
+
+ This patch adds runtime detection support for the ARM NEON fast paths
+ for code compiled with the iOS SDK.
+
+commit 7ccb0c45e5f6a0ac23f585e2eda412034c2abe61
+Author: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed Jan 18 16:06:05 2012 -0500
+
+ Post-release version bump to 0.24.3
+
commit 08070759c3eee28fc61a7bb56ed8e3c056410c97
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Jan 18 15:49:24 2012 -0500
diff --git a/debian/changelog b/debian/changelog
index 0632779..6935c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pixman (0.24.4-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - Revert "Reject trapezoids where top (botttom) is above (below) the
+ edges" (closes: #656682)
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Feb 2012 20:49:13 +0100
+
pixman (0.24.2-1) unstable; urgency=low
* New upstream release:
commit 8bff730a98dd7e68192743717bf8c9384d5c0c5b
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Feb 8 19:03:22 2012 -0500
Pre-release version bump to 0.24.4
diff --git a/configure.ac b/configure.ac
index b28fe62..101b9e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 24)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 4)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
commit c5c866a394c823b2980eff15ce33ce8356010bbe
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Jan 25 14:03:05 2012 -0500
Revert "Reject trapezoids where top (botttom) is above (below) the edges"
Cairo 1.10 will sometimes generate trapezoids like this, so we can't
consider them invalid. Fixes bug 45009, reported by Michael Biebl.
This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06.
diff --git a/pixman/pixman.h b/pixman/pixman.h
index ab04103..c57092a 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -906,14 +906,10 @@ struct pixman_triangle
};
/* whether 't' is a well defined not obviously empty trapezoid */
-#define pixman_trapezoid_valid(t) \
- ((t)->left.p1.y != (t)->left.p2.y && \
- (t)->right.p1.y != (t)->right.p2.y && \
- (int) ((t)->bottom - (t)->top) > 0 && \
- (t)->bottom <= (t)->left.p2.y && \
- (t)->bottom <= (t)->right.p2.y && \
- (t)->top >= (t)->left.p1.y && \
- (t)->top >= (t)->right.p1.y)
+#define pixman_trapezoid_valid(t) \
+ ((t)->left.p1.y != (t)->left.p2.y && \
+ (t)->right.p1.y != (t)->right.p2.y && \
+ (int) ((t)->bottom - (t)->top) > 0)
struct pixman_span_fix
{
diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c
index 60affe3..fa6d8a9 100644
--- a/test/composite-traps-test.c
+++ b/test/composite-traps-test.c
@@ -252,6 +252,6 @@ test_composite (int testnum,
int
main (int argc, const char *argv[])
{
- return fuzzer_test_main("composite traps", 40000, 0x4346479C,
+ return fuzzer_test_main("composite traps", 40000, 0xE3112106,
test_composite, argc, argv);
}
commit 1ceb66750c33c896bdb04b47ed44977112817a86
Author: Bobby Salazar <bobby8934@gmail.com>
Date: Thu Jan 26 13:19:18 2012 -0500
iOS Runtime Detection Support For ARM NEON
This patch adds runtime detection support for the ARM NEON fast paths
for code compiled with the iOS SDK.
diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
index 4172e52..92942b2 100644
--- a/pixman/pixman-cpu.c
+++ b/pixman/pixman-cpu.c
@@ -30,6 +30,10 @@
#include <windows.h>
#endif
+#if defined(__APPLE__)
+#include "TargetConditionals.h"
+#endif
+
#include "pixman-private.h"
#ifdef USE_VMX
@@ -244,6 +248,47 @@ pixman_have_arm_neon (void)
#endif /* USE_ARM_NEON */
+#elif (defined (__APPLE__) && defined(TARGET_OS_IPHONE)) /* iOS (iPhone/iPad/iPod touch) */
+
+/* Detection of ARM NEON on iOS is fairly simple because iOS binaries
+ * contain separate executable images for each processor architecture.
+ * So all we have to do is detect the armv7 architecture build. The
+ * operating system automatically runs the armv7 binary for armv7 devices
+ * and the armv6 binary for armv6 devices.
+ */
+
+pixman_bool_t
+pixman_have_arm_simd (void)
+{
+#if defined(USE_ARM_SIMD)
+ return TRUE;
+#else
+ return FALSE;
+#endif
+}
+
+pixman_bool_t
+pixman_have_arm_neon (void)
+{
+#if defined(USE_ARM_NEON) && defined(__ARM_NEON__)
+ /* This is an armv7 cpu build */
+ return TRUE;
+#else
+ /* This is an armv6 cpu build */
+ return FALSE;
+#endif
+}
+
+pixman_bool_t
+pixman_have_arm_iwmmxt (void)
+{
+#if defined(USE_ARM_IWMMXT)
+ return FALSE;
+#else
+ return FALSE;
+#endif
+}
+
#elif defined (__linux__) || defined(__ANDROID__) || defined(ANDROID) /* linux ELF or ANDROID */
static pixman_bool_t arm_has_v7 = FALSE;
commit 7ccb0c45e5f6a0ac23f585e2eda412034c2abe61
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Jan 18 16:06:05 2012 -0500
Post-release version bump to 0.24.3
diff --git a/configure.ac b/configure.ac
index 6e93cf8..b28fe62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 24)
-m4_define([pixman_micro], 2)
+m4_define([pixman_micro], 3)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
Reply to: