summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-02-26 20:51:58 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-02-26 20:51:58 +0100
commita32b5466ba4179b5dcc72ec80dd0745d8301f5e7 (patch)
tree9fca85c790f06cc35b5efaf6008565a8b1a04781
parent8c769691094121b098709c66001c5aca6d34f0bb (diff)
parentbc0da7eef3742cab7ed9c2efc4a42a85cc4ea767 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/cairo/Makefile10
-rw-r--r--package/cairo/patches/patch-Makefile_in8
-rw-r--r--package/cairo/patches/patch-configure101
3 files changed, 108 insertions, 11 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index a3cba33f8..146876d44 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= cairo
-PKG_VERSION:= 1.12.16
-PKG_RELEASE:= 4
-PKG_HASH:= 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
+PKG_VERSION:= 1.14.0
+PKG_RELEASE:= 1
+PKG_HASH:= 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs/image
PKG_DEPENDS:= fontconfig libfreetype libx11 pixman
@@ -35,8 +35,6 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-
HOST_CONFIGURE_ARGS+= --enable-ft=yes \
--enable-png=yes \
--enable-fc=yes \
@@ -88,8 +86,6 @@ else
CONFIGURE_ARGS+= --enable-tee=no
endif
-
-
CONFIGURE_ARGS+= --enable-ft=yes \
--enable-fc=yes \
--enable-xlib=yes \
diff --git a/package/cairo/patches/patch-Makefile_in b/package/cairo/patches/patch-Makefile_in
index 266149788..8716b0820 100644
--- a/package/cairo/patches/patch-Makefile_in
+++ b/package/cairo/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
---- cairo-1.12.16.orig/Makefile.in 2013-08-26 19:00:44.000000000 +0200
-+++ cairo-1.12.16/Makefile.in 2014-02-10 14:44:58.000000000 +0100
-@@ -80,7 +80,7 @@ EXTRA_PROGRAMS =
+--- cairo-1.14.0.orig/Makefile.in 2014-10-14 03:47:28.000000000 +0200
++++ cairo-1.14.0/Makefile.in 2015-02-26 11:39:05.000000000 +0100
+@@ -63,7 +63,7 @@ EXTRA_PROGRAMS =
TESTS =
check_PROGRAMS =
# libpng is required for our test programs
@@ -9,7 +9,7 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
+@@ -417,7 +417,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
# $(srcdir)/build/Makefile.win32.features-h \
# $(NULL)
ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
diff --git a/package/cairo/patches/patch-configure b/package/cairo/patches/patch-configure
new file mode 100644
index 000000000..9e0f39f0d
--- /dev/null
+++ b/package/cairo/patches/patch-configure
@@ -0,0 +1,101 @@
+--- cairo-1.14.0.orig/configure 2014-10-14 03:47:29.000000000 +0200
++++ cairo-1.14.0/configure 2015-02-26 13:27:59.000000000 +0100
+@@ -18371,7 +18371,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -18418,7 +18418,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -18469,7 +18469,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -18516,7 +18516,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -18585,7 +18585,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -18641,7 +18641,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -20089,7 +20089,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -20136,7 +20136,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -33208,7 +33208,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -33327,7 +33327,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false ; then
+ cairo_cc_flag=no
+ fi
+
+@@ -33408,7 +33408,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "x$cairo_cc_stderr" != "x"; then
++ if false; then
+ cairo_cc_flag=no
+ fi
+