Merge branch 'master' of git+ssh://www.openadk.org/git/openadk

package/pixman/Makefile

@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pixman
-PKG_VERSION:=		0.30.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		ae7ac97921dfa59086ca2231621a79c7
-PKG_DESCR:=		Pixel manipulation library
+PKG_VERSION:=		0.32.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		eba449138b972fbf4547a8c152fea162
+PKG_DESCR:=		pixel manipulation library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libpng
 PKG_SITES:=		http://www.cairographics.org/releases/

package/pixman/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- pixman-0.32.4.orig/Makefile.in	2013-11-18 03:11:20.000000000 +0100
++++ pixman-0.32.4/Makefile.in	2014-03-30 21:54:18.000000000 +0200
+@@ -369,7 +369,7 @@ target_alias = @target_alias@
+ 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 = 3892336E