cairo: update to 1.18.2

package/cairo/Makefile

@@ -4,91 +4,34 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.14.6
+PKG_VERSION:=		1.18.2
 PKG_RELEASE:=		1
-PKG_HASH:=		613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252
+PKG_HASH:=		a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a
 PKG_DESCR:=		graphics library
 PKG_SECTION:=		libs/image
 PKG_DEPENDS:=		fontconfig libfreetype libx11 pixman
-PKG_DEPENDS+=		libxrender
+PKG_DEPENDS+=		libxrender libpng
 PKG_BUILDDEP:=		pixman freetype fontconfig libX11 libXrender glib
-PKG_BUILDDEP+=		libXext
+PKG_BUILDDEP+=		libXext libpng
 HOST_BUILDDEP:=		libpng-host pixman-host freetype-host fontconfig-host
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 PKG_OPTS:=		dev
 
-PKG_FLAVOURS_CAIRO:=	WITH_PS WITH_PDF WITH_XML WITH_PNG WITH_TEE WITH_SVG WITH_XRENDER
-PKGFD_WITH_PS:=		postscript support
-PKGFD_WITH_PDF:=	pdf support
-PKGFD_WITH_XML:=	xml support
-PKGFD_WITH_PNG:=	png support
-PKGFB_WITH_PNG:=	libpng
-PKGFS_WITH_PNG:=	libpng
-PKGFD_WITH_TEE:=	tee support
-PKGFD_WITH_SVG:=	svg support
-PKGFD_WITH_XRENDER:=	xorg xrender support
-
 include ${ADK_TOPDIR}/mk/host.mk
 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_STYLE:=		auto
-HOST_CONFIGURE_ARGS+=	--enable-ft=yes \
-			--enable-png=yes \
-			--enable-fc=yes \
-			--enable-tee=no \
-			--enable-xlib=no \
-			--enable-pdf=no \
-			--enable-quartz=no \
-			--disable-test-surfaces \
-			--disable-full-testing
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_XRENDER),)
-CONFIGURE_ARGS+=	--enable-xlib-xrender=yes
-else
-CONFIGURE_ARGS+=	--enable-xlib-xrender=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_SVG),)
-CONFIGURE_ARGS+=	--enable-svg=yes \
-			--enable-png=yes
-else
-CONFIGURE_ARGS+=	--enable-svg=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_PDF),)
-CONFIGURE_ARGS+=	--enable-pdf=yes
-else
-CONFIGURE_ARGS+=	--enable-pdf=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_PS),)
-CONFIGURE_ARGS+=	--enable-ps=yes
-else
-CONFIGURE_ARGS+=	--enable-ps=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_PNG)$(ADK_PACKAGE_CAIRO_WITH_SVG),)
-CONFIGURE_ARGS+=	--enable-png=yes
-else
-CONFIGURE_ARGS+=	--enable-png=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_XML),)
-CONFIGURE_ARGS+=	--enable-xml=yes
-else
-CONFIGURE_ARGS+=	--enable-xml=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_TEE),)
-CONFIGURE_ARGS+=	--enable-tee=yes
-else
-CONFIGURE_ARGS+=	--enable-tee=no
-endif
+MESON_FLAGS+=		-Dtests=disabled
 
-CONFIGURE_ARGS+=	--enable-ft=yes \
-			--enable-fc=yes \
-			--enable-xlib=yes \
-			--enable-quartz=no \
-			--disable-test-surfaces \
-			--disable-full-testing
+HOST_STYLE:=		meson
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
 
 cairo-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo

package/cairo/patches/patch-Makefile_in

@@ -1,20 +0,0 @@
---- 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
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
-+@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -417,7 +417,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
- #	$(srcdir)/build/Makefile.win32.features-h \
- #	$(NULL)
- ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
--DIST_SUBDIRS = src doc util boilerplate test perf
-+DIST_SUBDIRS = src doc util boilerplate perf
- SUBDIRS = src doc util $(am__append_1)
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--enable-gtk-doc \

package/cairo/patches/patch-configure

@@ -1,101 +0,0 @@
---- 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
-