summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/cairo/Makefile4
-rw-r--r--package/pixman/Makefile5
-rw-r--r--package/pixman/patches/patch-ltmain_sh14
3 files changed, 12 insertions, 11 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 39667bdd9..b15efd5e2 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cairo
-PKG_VERSION:= 1.8.10
+PKG_VERSION:= 1.10.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= b60a82f405f9400bbfdcf850b1728d25
+PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs
PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 939353eaf..2b136ec07 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -4,11 +4,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= pixman
-PKG_VERSION:= 0.16.2
+PKG_VERSION:= 0.20.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 02bd3669f53c404c19980d5efb6f86fb
+PKG_MD5SUM:= a923c20af88e469ac29ba42cfedb88c2
PKG_DESCR:= Pixel manipulation library
PKG_SECTION:= x11/libs
+PKG_BUILDDEP:= libpng
PKG_SITES:= http://www.cairographics.org/releases/
PKG_SUBPKGS:= PIXMAN PIXMAN_DEV
diff --git a/package/pixman/patches/patch-ltmain_sh b/package/pixman/patches/patch-ltmain_sh
index b38645c65..73aa1dfdd 100644
--- a/package/pixman/patches/patch-ltmain_sh
+++ b/package/pixman/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- pixman-0.16.2.orig/ltmain.sh 2009-04-23 02:27:43.000000000 +0200
-+++ pixman-0.16.2/ltmain.sh 2011-01-14 20:10:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- pixman-0.20.2.orig/ltmain.sh 2010-10-30 23:18:32.000000000 +0200
++++ pixman-0.20.2/ltmain.sh 2011-04-07 15:05:45.000000000 +0200
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"