cairo: version bump 1.10.2 -> 1.12.16

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 73 insertions, 55 deletions

diff --git a/rules/cairo.in b/rules/cairo.in
index 0e8f25bad..89e9eb3e1 100644
--- a/rules/cairo.in
+++ b/rules/cairo.in
@@ -5,15 +5,18 @@ menuconfig CAIRO
 	select GCCLIBS_GCC_S
 	select XORG_LIB_XT	if CAIRO_XLIB && !GTK_TARGET_HOST_X11
 	select XORG_LIB_XRENDER	if CAIRO_XLIB && !GTK_TARGET_HOST_X11
-
+	select ZLIB		if CAIRO_PS || CAIRO_PDF
 	select GLIB		if CAIRO_GOBJECT
-
 	select DIRECTFB		if CAIRO_DIRECTFB
-
 	select FREETYPE		if CAIRO_FREETYPE
 	select FONTCONFIG	if CAIRO_FREETYPE
-
 	select LIBPNG		if CAIRO_PNG
+	select MESALIB		if CAIRO_GL || CAIRO_GLES2
+	select MESALIB_OPENGL	if CAIRO_GL
+	select MESALIB_GLES2	if CAIRO_GLES2
+	select MESALIB_GLX	if CAIRO_GLX
+	select MESALIB_EGL	if CAIRO_EGL
+	select LIBXCB		if CAIRO_XCB
 
 	select PIXMAN
 
@@ -28,42 +31,64 @@ if CAIRO
 config CAIRO_GOBJECT
 	bool
 
-config CAIRO_PS
+comment "surface backends"
+
+config CAIRO_XLIB
 	bool
-	prompt "PostScript backend"
+	prompt "Xlib"
 
-config CAIRO_PDF
+config CAIRO_XCB
 	bool
-	prompt "PDF backend"
+	prompt "xcb"
 
+config CAIRO_GL
+	bool
+	depends on !CAIRO_GLES2
+	prompt "OpenGL"
 
-config CAIRO_XLIB
+config CAIRO_GLES2
 	bool
-	prompt "Xlib backend"
-	select CAIRO_FREETYPE
+	prompt "OpenGLESv2"
 
 config CAIRO_DIRECTFB
 	bool
-	prompt "directfb backend"
+	prompt "directfb"
 	select CAIRO_FREETYPE
 
-config CAIRO_WIN32
+config CAIRO_PS
+	bool
+	prompt "PostScript"
+
+config CAIRO_PDF
 	bool
-	prompt "Win32 backend"
-	help
-	  Build cairo with the Win 32 backend. Makes only sense on mingw.
+	prompt "PDF"
 
 config CAIRO_SVG
 	bool
-	prompt "SVG backend"
+	prompt "SVG"
 	select CAIRO_PNG
 
+comment "features"
+
 config CAIRO_FREETYPE
 	bool
-	prompt "Freetype font backend"
+	prompt "FreeType font backend"
 
 config CAIRO_PNG
 	bool
 	prompt "PNG support"
 
+if CAIRO_GL || CAIRO_GLES2
+
+config CAIRO_GLX
+	bool
+	depends on !CAIRO_EGL
+	prompt "GLX support"
+
+config CAIRO_EGL
+	bool
+	prompt "EGL support"
+
+endif
+
 endif
diff --git a/rules/cairo.make b/rules/cairo.make
index 8efb83a40..8cb4e336a 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -16,53 +16,65 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
 #
 # Paths and names
 #
-CAIRO_SUFFIX	:= tar.gz
-CAIRO_VERSION	:= 1.10.2
-CAIRO_MD5	:= f101a9e88b783337b20b2e26dfd26d5f
-CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
+CAIRO_VERSION	:= 1.12.16
+CAIRO_MD5	:= a1304edcdc99282f478b995ee5f8f854
 CAIRO		:= cairo-$(CAIRO_VERSION)
+CAIRO_SUFFIX	:= tar.xz
+CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
 CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
 CAIRO_DIR	:= $(BUILDDIR)/$(CAIRO)
+CAIRO_LICENSE	:= LGPLv2.1,MPL
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-CAIRO_PATH	:= PATH=$(CROSS_PATH)
-CAIRO_ENV 	:= $(CROSS_ENV)
-
 #
 # autoconf
 #
-CAIRO_AUTOCONF := \
+CAIRO_CONF_TOOL	:= autoconf
+CAIRO_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-shared \
 	--disable-static \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
 	--disable-gcov \
 	--disable-valgrind \
+	--$(call ptx/endis, PTXCONF_CAIRO_XLIB)-xlib \
 	--disable-xlib-xrender \
-	--disable-xcb \
+	--$(call ptx/endis, PTXCONF_CAIRO_XCB)-xcb \
 	--disable-xlib-xcb \
-	--disable-xcb-shm \
+	--$(call ptx/endis, PTXCONF_CAIRO_XCB)-xcb-shm \
 	--disable-qt \
 	--disable-quartz \
 	--disable-quartz-font \
 	--disable-quartz-image \
+	--disable-win32 \
+	--disable-win32-font \
 	--disable-skia \
 	--disable-os2 \
 	--disable-beos \
 	--disable-drm \
-	--disable-drm-xr \
 	--disable-gallium \
-	--disable-xcb-drm \
-	--disable-gl \
+	--$(call ptx/endis, PTXCONF_CAIRO_PNG)-png \
+	--$(call ptx/endis, PTXCONF_CAIRO_GL)-gl \
+	--$(call ptx/endis, PTXCONF_CAIRO_GLES2)-glesv2 \
+	--disable-cogl \
+	--$(call ptx/endis, PTXCONF_CAIRO_DIRECTFB)-directfb \
 	--disable-vg \
-	--disable-egl \
-	--disable-glx \
+	--$(call ptx/endis, PTXCONF_CAIRO_EGL)-egl \
+	--$(call ptx/endis, PTXCONF_CAIRO_GLX)-glx \
 	--disable-wgl \
 	--disable-script \
+	--$(call ptx/endis, PTXCONF_CAIRO_FREETYPE)-ft \
+	--$(call ptx/endis, PTXCONF_CAIRO_FREETYPE)-fc \
+	--$(call ptx/endis, PTXCONF_CAIRO_PS)-ps \
+	--$(call ptx/endis, PTXCONF_CAIRO_PDF)-pdf \
+	--$(call ptx/endis, PTXCONF_CAIRO_SVG)-svg \
+	--disable-test-surfaces \
 	--disable-tee \
 	--disable-xml \
 	--enable-pthread \
@@ -71,27 +83,8 @@ CAIRO_AUTOCONF := \
 	--disable-trace \
 	--disable-interpreter \
 	--disable-symbol-lookup \
-	--disable-test-surfaces \
-	--$(call ptx/endis, PTXCONF_CAIRO_XLIB)-xlib \
-	--$(call ptx/endis, PTXCONF_CAIRO_WIN32)-win32 \
-	--$(call ptx/endis, PTXCONF_CAIRO_WIN32)-win32-font \
-	--$(call ptx/endis, PTXCONF_CAIRO_SVG)-svg \
-	--$(call ptx/endis, PTXCONF_CAIRO_PNG)-png \
-	--$(call ptx/endis, PTXCONF_CAIRO_DIRECTFB)-directfb \
-	--$(call ptx/endis, PTXCONF_CAIRO_FREETYPE)-ft \
-	--$(call ptx/endis, PTXCONF_CAIRO_FREETYPE)-fc \
-	--$(call ptx/endis, PTXCONF_CAIRO_PS)-ps \
-	--$(call ptx/endis, PTXCONF_CAIRO_PDF)-pdf
-
-ifndef PTXCONF_CAIRO_XLIB
-CAIRO_AUTOCONF += --without-x
-endif
-
-ifdef PTXCONF_HAS_HARDFLOAT
-CAIRO_AUTOCONF += --enable-some-floating-point
-else
-CAIRO_AUTOCONF += --disable-some-floating-point
-endif
+	--$(call ptx/endis, PTXCONF_HAS_HARDFLOAT)-some-floating-point \
+	--$(call ptx/wwo, PTXCONF_CAIRO_XLIB)-x
 
 # ----------------------------------------------------------------------------
 # Target-Install