diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-03-03 08:24:52 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-03-03 08:24:52 +0000 |
| commit | 3ac18ed56004de1658d4ec34cf04c2eb16177bf6 (patch) | |
| tree | 0884036db6b76c0635d07aeec575db11ef34fd44 /rules/cairo.make | |
| parent | 6cf69d8b35e17e5fbed8b5abd1ebe4cb4205d7ae (diff) | |
| download | ptxdist-3ac18ed56004de1658d4ec34cf04c2eb16177bf6.tar.gz ptxdist-3ac18ed56004de1658d4ec34cf04c2eb16177bf6.tar.xz | |
* pixman, cairo, cairomm: update to latest stable
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9907 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/cairo.make')
| -rw-r--r-- | rules/cairo.make | 73 |
1 files changed, 45 insertions, 28 deletions
diff --git a/rules/cairo.make b/rules/cairo.make index edfd0c923..b9744abcc 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo # Paths and names # CAIRO_SUFFIX := tar.gz -CAIRO_VERSION := 1.4.10 +CAIRO_VERSION := 1.8.6 CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) CAIRO := cairo-$(CAIRO_VERSION) CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX) @@ -65,29 +65,42 @@ CAIRO_ENV := $(CROSS_ENV) # CAIRO_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-quartz \ + --enable-shared \ + --enable-static \ + --disable-gtk-doc \ + --disable-gcov \ + --disable-xlib-xrender \ --disable-xcb \ + --disable-quartz \ + --disable-quartz-font \ + --disable-quartz-image \ + --disable-os2 \ --disable-beos \ --disable-glitz \ + --enable-pthread \ --disable-svg \ - --disable-atsui + --disable-test-surfaces -ifdef PTXCONF_CAIRO_PS -CAIRO_AUTOCONF += --enable-ps +ifdef PTXCONF_CAIRO_XLIB +CAIRO_AUTOCONF += --enable-xlib else -CAIRO_AUTOCONF +=--disable-ps +CAIRO_AUTOCONF += --disable-xlib endif -ifdef PTXCONF_CAIRO_PDF -CAIRO_AUTOCONF += --enable-pdf +ifdef PTXCONF_CAIRO_WIN32 +CAIRO_AUTOCONF += \ + --enable-win32 \ + --enable-win32-font else -CAIRO_AUTOCONF +=--disable-pdf +CAIRO_AUTOCONF += \ + --disable-win32 \ + --disable-win32-font endif -ifdef PTXCONF_CAIRO_XLIB -CAIRO_AUTOCONF += --enable-xlib +ifdef PTXCONF_CAIRO_PNG +CAIRO_AUTOCONF += --enable-png else -CAIRO_AUTOCONF += --disable-xlib +CAIRO_AUTOCONF += --disable-png endif ifdef PTXCONF_CAIRO_DIRECTFB @@ -96,28 +109,32 @@ else CAIRO_AUTOCONF += --disable-directfb endif -ifdef PTXCONF_CAIRO_WIN32 -CAIRO_AUTOCONF += \ - --enable-win32 \ - --enable-win32-font +ifdef PTXCONF_CAIRO_FREETYPE +CAIRO_AUTOCONF += --enable-ft else -CAIRO_AUTOCONF += \ - --disable-win32 \ - --disable-win32-font +CAIRO_AUTOCONF += --disable-ft endif -ifdef PTXCONF_CAIRO_FREETYPE -CAIRO_AUTOCONF += --enable-freetype +ifdef PTXCONF_CAIRO_PS +CAIRO_AUTOCONF += --enable-ps else -CAIRO_AUTOCONF += --disable-freetype +CAIRO_AUTOCONF += --disable-ps endif -ifdef PTXCONF_CAIRO_PNG -CAIRO_AUTOCONF += --enable-png +ifdef PTXCONF_CAIRO_PDF +CAIRO_AUTOCONF += --enable-pdf else -CAIRO_AUTOCONF += --disable-png +CAIRO_AUTOCONF += --disable-pdf endif +ifdef PTXCONF_HAS_HARDFLOAT +CAIRO_AUTOCONF += --enable-some-floating-point +else +CAIRO_AUTOCONF += --disable-some-floating-point +endif + +# --with-x use the X Window System + $(STATEDIR)/cairo.prepare: @$(call targetinfo, $@) @$(call clean, $(CAIRO_DIR)/config.cache) @@ -166,9 +183,9 @@ $(STATEDIR)/cairo.targetinstall: @$(call install_fixup,cairo,DEPENDS,) @$(call install_fixup,cairo,DESCRIPTION,missing) - @$(call install_copy, cairo, 0, 0, 0644, $(CAIRO_DIR)/src/.libs/libcairo.so.2.11.5, /usr/lib/libcairo.so.2.11.5) - @$(call install_link, cairo, libcairo.so.2.11.5, /usr/lib/libcairo.so.2) - @$(call install_link, cairo, libcairo.so.2.11.5, /usr/lib/libcairo.so) + @$(call install_copy, cairo, 0, 0, 0644, $(CAIRO_DIR)/src/.libs/libcairo.so.2.10800.6, /usr/lib/libcairo.so.2.10800.6) + @$(call install_link, cairo, libcairo.so.2.10800.6, /usr/lib/libcairo.so.2) + @$(call install_link, cairo, libcairo.so.2.10800.6, /usr/lib/libcairo.so) @$(call install_finish,cairo) |