diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2014-05-24 11:31:04 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2014-05-25 07:55:59 +0200 |
| commit | 9cc06cb301d7dbf29221165834559308ff6d5ad2 (patch) | |
| tree | 2eef4e2ab8397c69d7c4fb2ee1312652627959db /recipes | |
| parent | 42ee2a9ac4c474ba5991d0682fb742beecb57de4 (diff) | |
recipe: pixman: bump to 0.32.4
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/pixman.recipe | 4 | ||||
| -rw-r--r-- | recipes/pixman/0001-Fix-build-on-Android.patch | 22 | ||||
| -rw-r--r-- | recipes/pixman/0002-Enable-CPU-detection-on-Android.patch | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/recipes/pixman.recipe b/recipes/pixman.recipe index 2c616c10..06459672 100644 --- a/recipes/pixman.recipe +++ b/recipes/pixman.recipe @@ -5,9 +5,9 @@ import shutil class Recipe(recipe.Recipe): name = 'pixman' - version = '0.30.2' + version = '0.32.4' stype = SourceType.TARBALL - url = 'http://cairographics.org/releases/pixman-0.30.2.tar.gz' + url = 'http://cairographics.org/releases/pixman-0.32.4.tar.gz' licenses = [License.MIT] autoreconf = True patches = ['pixman/0001-Fix-build-on-Android.patch', diff --git a/recipes/pixman/0001-Fix-build-on-Android.patch b/recipes/pixman/0001-Fix-build-on-Android.patch index c2c792e2..1b48618d 100644 --- a/recipes/pixman/0001-Fix-build-on-Android.patch +++ b/recipes/pixman/0001-Fix-build-on-Android.patch @@ -1,4 +1,4 @@ -From edcf449bd33c087ffa40cb05de4b7ed74f3eec61 Mon Sep 17 00:00:00 2001 +From b2f4b19eb346329c4c45dde99914bc5b6bed9f44 Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey <ylatuya@gmail.com> Date: Mon, 28 Oct 2013 18:19:29 +0100 Subject: [PATCH 1/2] Fix build in Android @@ -9,19 +9,19 @@ Subject: [PATCH 1/2] Fix build in Android 2 files changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 3654d62..271d02d 100644 +index e682dd2..a6bffbe 100644 --- a/configure.ac +++ b/configure.ac -@@ -934,6 +934,7 @@ if test $ac_cv_tls = none ; then - PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"]) - PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) - PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"]) -+ PIXMAN_CHECK_PTHREAD([CFLAGS=""; LDFLAGS="-lc"]) +@@ -985,6 +985,7 @@ AC_MSG_CHECKING(for pthreads) + PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"]) + PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) + PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"]) ++PIXMAN_CHECK_PTHREAD([CFLAGS=""; LDFLAGS="-lc"]) - if test $support_for_pthread_setspecific = yes; then - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + if test $support_for_pthreads = yes; then + AC_DEFINE([HAVE_PTHREADS], [], [Whether pthreads is supported]) diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c -index f31171f..9b01e68 100644 +index 4a3a835..972f141 100644 --- a/pixman/pixman-utils.c +++ b/pixman/pixman-utils.c @@ -27,6 +27,7 @@ @@ -33,5 +33,5 @@ index f31171f..9b01e68 100644 #include "pixman-private.h" -- -1.8.1.2 +1.9.0 diff --git a/recipes/pixman/0002-Enable-CPU-detection-on-Android.patch b/recipes/pixman/0002-Enable-CPU-detection-on-Android.patch index 5cf4ef11..e9d15e18 100644 --- a/recipes/pixman/0002-Enable-CPU-detection-on-Android.patch +++ b/recipes/pixman/0002-Enable-CPU-detection-on-Android.patch @@ -1,4 +1,4 @@ -From a267c2d24edeb0255b3d31bc3052965a9f43f4b6 Mon Sep 17 00:00:00 2001 +From 950691e5aec082e4fa69a9a14ba2067c100c7878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> Date: Wed, 22 Aug 2012 15:10:56 +0200 Subject: [PATCH 2/2] Enable CPU detection on Android @@ -9,10 +9,10 @@ Subject: [PATCH 2/2] Enable CPU detection on Android 2 files changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac -index 7eaa0d6..934b68a 100644 +index a6bffbe..fe12101 100644 --- a/configure.ac +++ b/configure.ac -@@ -467,8 +467,13 @@ case $host_os in +@@ -514,8 +514,13 @@ case $host_os in SSE2_LDFLAGS="$HWCAP_LDFLAGS" fi ;; @@ -27,10 +27,10 @@ index 7eaa0d6..934b68a 100644 AC_SUBST(IWMMXT_CFLAGS) AC_SUBST(MMX_CFLAGS) diff --git a/pixman/Makefile.am b/pixman/Makefile.am -index deacf87..108ef93 100644 +index b376d9a..aaa6e6f 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am -@@ -111,6 +111,11 @@ libpixman-iwmmxt.la: libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_DEP +@@ -112,6 +112,11 @@ libpixman-iwmmxt.la: libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_DEP $(AM_V_CCLD)$(libpixman_iwmmxt_la_LINK) libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_LIBADD) $(LIBS) endif @@ -43,5 +43,5 @@ index deacf87..108ef93 100644 if USE_MIPS_DSPR2 noinst_LTLIBRARIES += libpixman-mips-dspr2.la -- -1.8.4 +1.9.0 |