1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- misc/pixman-0.24.4/Makefile.in 2011-11-06 22:11:25.000000000 +0100
+++ misc/build/pixman-0.24.4/Makefile.in 2011-12-16 09:06:45.317211035 +0100
@@ -272,7 +272,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = pixman demos test
+SUBDIRS = pixman
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pixman-1.pc
GPGKEY = 6FF7C1A8
--- misc/pixman-0.24.4/config.sub 2008-08-30 00:27:25.000000000 +0200
+++ misc/build/pixman-0.24.4/config.sub 2011-12-16 09:05:14.595773609 +0100
@@ -120,7 +120,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -1247,7 +1247,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/pixman-0.24.4/configure 2011-11-06 22:11:27.000000000 +0100
+++ misc/build/pixman-0.24.4/configure 2011-12-16 09:06:16.482898083 +0100
@@ -20202,6 +20202,13 @@
+# getisax is falsely detected when using OOo build script on Linux/FBSD...
+case "$build_os" in
+ linux-gnu*)
+ ;;
+ freebsd*)
+ ;;
+ *)
for ac_func in getisax
do
@@ -20304,6 +20311,8 @@
done
+ ;;
+esac
{ $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
@@ -24552,7 +24552,7 @@
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
- pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
+ pixman_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file compiled with -mlong-branch which is no longer needed.' conftest.err`
pixman_cc_flag=yes
else
$as_echo "$as_me: failed program was:" >&5
--- misc/pixman-0.24.4/pixman/pixman-utils.c
+++ misc/build/pixman-0.24.4/pixman/pixman-utils.c
@@ -27,6 +27,7 @@
#endif
#include <stdio.h>
#include <stdlib.h>
+#include <limits.h>
#include "pixman-private.h"
--- misc/pixman-0.24.4/pixman/pixman-mmx.c 2011-11-06 13:47:42.000000000 -0700
+++ misc/build/pixman-0.24.4/pixman/pixman-mmx.c 2011-12-19 00:41:42.280402800 -0700
@@ -309,7 +309,7 @@
/* Elemental unaligned loads */
-static __inline__ __m64 ldq_u(uint64_t *p)
+static inline __m64 ldq_u(uint64_t *p)
{
#ifdef USE_X86_MMX
/* x86's alignment restrictions are very relaxed. */
@@ -328,7 +328,7 @@
#endif
}
-static __inline__ uint32_t ldl_u(uint32_t *p)
+static inline uint32_t ldl_u(uint32_t *p)
{
#ifdef USE_X86_MMX
/* x86's alignment restrictions are very relaxed. */
|
