summaryrefslogtreecommitdiff
path: root/cairo
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-04-10 14:06:19 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-04-10 14:06:44 +0200
commit619b314317ae370fbff54900524adbae397cb860 (patch)
treead6f747a5c8eebf7d70db5f4dc980a183d243e06 /cairo
parentdcf24756e5b866a62639ade71df4352f1b8471b1 (diff)
Upgrade pixman to 0.24.4
Diffstat (limited to 'cairo')
-rw-r--r--cairo/pixman-0.24.4.android.patch (renamed from cairo/pixman-0.24.0.android.patch)4
-rw-r--r--cairo/pixman-0.24.4.patch (renamed from cairo/pixman-0.24.0.patch)24
-rw-r--r--cairo/pixman/makefile.mk4
3 files changed, 16 insertions, 16 deletions
diff --git a/cairo/pixman-0.24.0.android.patch b/cairo/pixman-0.24.4.android.patch
index f9a52f02c4d1..ae0626eaa02b 100644
--- a/cairo/pixman-0.24.0.android.patch
+++ b/cairo/pixman-0.24.4.android.patch
@@ -1,5 +1,5 @@
---- misc/pixman-0.24.0/ltmain.sh
-+++ misc/build/pixman-0.24.0/ltmain.sh
+--- misc/pixman-0.24.4/ltmain.sh
++++ misc/build/pixman-0.24.4/ltmain.sh
@@ -3228,6 +3228,10 @@
fi
else
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.4.patch
index 39122cde00eb..c16ac84b8838 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.4.patch
@@ -1,5 +1,5 @@
---- misc/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:44.653987145 +0100
-+++ misc/build/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:37.288130250 +0100
+--- misc/pixman-0.24.4/Makefile.win32.common 2011-12-16 15:30:44.653987145 +0100
++++ misc/build/pixman-0.24.4/Makefile.win32.common 2011-12-16 15:30:37.288130250 +0100
@@ -1 +1,54 @@
-dummy
+LIBRARY = pixman-1
@@ -56,8 +56,8 @@
+
+clean: inform
+ @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
---- misc/pixman-0.24.0/Makefile.in 2011-11-06 22:11:25.000000000 +0100
-+++ misc/build/pixman-0.24.0/Makefile.in 2011-12-16 09:06:45.317211035 +0100
+--- 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@
@@ -67,8 +67,8 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pixman-1.pc
GPGKEY = 6FF7C1A8
---- misc/pixman-0.24.0/config.sub 2008-08-30 00:27:25.000000000 +0200
-+++ misc/build/pixman-0.24.0/config.sub 2011-12-16 09:05:14.595773609 +0100
+--- 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/'`
@@ -87,8 +87,8 @@
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
---- misc/pixman-0.24.0/configure 2011-11-06 22:11:27.000000000 +0100
-+++ misc/build/pixman-0.24.0/configure 2011-12-16 09:06:16.482898083 +0100
+--- 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 @@
@@ -112,8 +112,8 @@
{ $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
---- misc/pixman-0.24.0/pixman/pixman-utils.c
-+++ misc/build/pixman-0.24.0/pixman/pixman-utils.c
+--- 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>
@@ -122,8 +122,8 @@
#include "pixman-private.h"
---- misc/pixman-0.24.0/pixman/pixman-mmx.c 2011-11-06 13:47:42.000000000 -0700
-+++ misc/build/pixman-0.24.0/pixman/pixman-mmx.c 2011-12-19 00:41:42.280402800 -0700
+--- 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 */
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index f4dab40f744a..307f85212aff 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -43,10 +43,10 @@ all:
# --- Files --------------------------------------------------------
-PIXMANVERSION=0.24.0
+PIXMANVERSION=0.24.4
TARFILE_NAME=pixman-$(PIXMANVERSION)
-TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7
+TARFILE_MD5=c63f411b3ad147db2bcce1bf262a0e02
ADDITIONAL_FILES=Makefile.win32.common