Commit Graph

73 Commits

Author SHA1 Message Date
Thomas Petazzoni
848c5b9480 cairo: improve the Blackfin build fix
Patch cairo-001-blackfin-build-fix.patch was added in commit
d372d0b677 ('cairo: add patch to fix
Blackfin build failure') to take into account the fact that Blackfin
has a non-empty USER_LABEL_PREFIX: C symbol 'foo' corresponds to
assembly symbol '_foo', contrary to most other architectures where
they are the same.

However, the patch was only fixing the relevant macros in
src/cairo-compiler-private.h and did not take into account the
duplicated version of these macros in
util/cairo-script/cairo-script-private.h. This commit fixes that.

This commit is fixing a build failure on Blackfin, for which there was
no recorded autobuilder result because this problem was hidden by the
problem fixed by the previous commit ('cairo: fix build on Blackfin in
test/cairo-test-runner.c').

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-24 08:58:23 +01:00
Thomas Petazzoni
46831ea58a cairo: fix build on Blackfin in test/cairo-test-runner.c
Add a patch for Cairo that ensures <unistd.h> is properly included to
get the prototype of readlink and getppid even on non-MMU platforms.

Fixes:

  http://autobuild.buildroot.net/results/93a97f90345d193b52035b2dc7559a306e11098e/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-24 08:58:01 +01:00
Jerzy Grzegorek
3033bc0c6e package: remove the empty trailing line(s)
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-04 10:39:29 +01:00
Paul Cercueil
9fce881c38 cairo: Patch to fix OpenVG backend on X11-less platforms
Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=72911

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-20 15:51:24 +01:00
Paul Cercueil
5582d5c707 cairo: Build with GLESv2 and VG backends if possible
Signed-Off-By: Paul Cercueil <paul@crapouillou.net>

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 22:00:16 +01:00
Thomas Petazzoni
d372d0b677 cairo: add patch to fix Blackfin build failure
Fixes
http://autobuild.buildroot.org/results/1b1/1b1e4ad2f00de1e0d1cc9045822751c3882c7493/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-07 00:33:39 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Alexandre Belloni
702704014d Fix package headers to comply with coding style
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 17:26:35 +02:00
Samuel Martin
5fa49a6c0f cairo: fix build when toolchain has no thread support
Fixes the build failure visible at
http://autobuild.buildroot.net/results/d49/d491de5a774592929a59f3bfd0b1fd8cbc089ac0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-14 22:03:52 +02:00
Thomas Petazzoni
95a5ed51ba cairo: add missing dependency on xlib_libXext
The X.org backend of Cairo now requires xlib_libXext. See
http://permalink.gmane.org/gmane.comp.lib.cairo/23385.

Fixes:

 http://autobuild.buildroot.org/results/795404665ec74a7ac929fdf8caf1397c9c54d80d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-19 19:22:49 +01:00
Thomas Petazzoni
1bf238751c cairo: bump version to 1.12.10
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-19 19:22:43 +01:00
Peter Korsgaard
1a5ae24549 cairo: script backend needs png
Fixes http://autobuild.buildroot.org/results/7b21c60d7ba1a8df8910d104e21d4545cb37a4c6

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-14 11:17:22 +01:00
Sagaert Johan
526dd5d272 cairo: bump version to 1.12.8
Directfb patch no longer needed.

[Peter: Add options for script/xml backends, support for Xrender backend]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-13 19:56:46 +01:00
Thomas Petazzoni
d5d2f36367 cairo: always enable XCB support when X backend is enabled
cairo depends on xlib_libX11 for its Xlib backend. But xlib_libX11
depends on XCB, so the XCB support can always be built into Cairo.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:41:07 +01:00
Thomas Petazzoni
90c3150d5f cairo: do not depend on xserver-xorg_server, but on the right library
cairo is a X client library, so there is no reason for it to build
depend on the X.org server. What Cairo needs is the xlib_libX11
library.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:39:37 +01:00
Gustavo Zacarias
019a581f89 packages: switch to host-pkgconf
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-29 22:02:55 +01:00
Thomas Petazzoni
85280ef829 cairo: disable trace and trace interpreter
The Cairo tracing and trace interpreter are most likely not that
useful, so disable them. They also require zlib, which isn't a
dependency of Cairo at the moment. This fixes the following build
failure:

  http://autobuild.buildroot.org/results/a91e4e337fd9deb0f9fad433350feb27b2aee556/build-end.log

In the future, if people are interested by the trace and trace
interpreter, we can add a new Config.in knob for them.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-14 20:18:03 +02:00
Stefan Froberg
42136fea75 cairo: Add tee surface backend option (required by firefox)
Signed-off-by: Stefan Froberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-12 18:29:45 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Will Newton
dfa93b47f7 cairo: Bump version to 1.10.2
Update the DirectFB patch as it no longer applied cleanly.

[Peter: drop redundant AUTORECONF = NO line]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-02 14:58:33 +01:00
Peter Korsgaard
fcc7cd3c7b cairo: remove remaining host variables
host support was removed in 7b38fc20ba (cairo: remove host variant),
but it forgot to remove the HOST_CAIRO_CONF_OPT assignment.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-17 16:26:15 +01:00
Thomas Petazzoni
300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Peter Korsgaard
0be744e495 package: apply libtool patch where possible
Now that we have libtool-2.2.x patch support, we can get rid of a bunch
of _LIBTOOL_PATH = NO, fixing (potential) cross link issues.

Notice: php not changed, as it uses a very old 1.5 version for the
embedded sqlite, where our buildroot-libtool-v1.5.patch doesn't apply.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-17 14:02:52 +01:00
Thomas Petazzoni
e014e3da09 cairo: PDF support is needed when SVG support is enabled
As soon as PostScript, PNG or SVG support is enabled, PDF support is
required for Cairo to build properly. Otherwise, you get build
failures such as:

.libs/cairo-type3-glyph-surface.o: In function `_cairo_type3_glyph_surface_set_stream':
/home/thomas/local/buildroot-dl/cairo-1.8.10/src/cairo-type3-glyph-surface.c:337: undefined reference to `_cairo_pdf_operators_set_stream'
/home/thomas/local/buildroot-dl/cairo-1.8.10/src/cairo-type3-glyph-surface.c:337: undefined reference to `_cairo_pdf_operators_set_stream'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-29 22:18:57 +02:00
Thomas Petazzoni
ce408ef0af cairo: bump to 1.8.10
This commit bumps Cairo to 1.8.10 and updates the DirectFB support
patch. The work has been done by Lionel Landwerlin
<llandwerlin@gmail.com>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:13 +02:00
Peter Korsgaard
1a85944235 cairo: ps backend needs pdf
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-22 21:55:42 +02:00
Thomas Petazzoni
7b38fc20ba cairo: remove host variant
Since we no longer need to build pango on the host, cairo on the host
is no longer needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-20 22:34:29 +02:00
Peter Korsgaard
28200ca3f2 cairo: get rid of old patches
Haven't been touches for more than 2 years, so lets get rid of them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-26 21:52:50 +02:00
Thomas Petazzoni
5d772cd069 cairo: convert to autotools infrastructure for host package
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-12-15 19:57:33 +01:00
Thomas Petazzoni
6dc336b293 host-pkgconfig is now host-pkg-config
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-12-15 19:57:31 +01:00
Peter Korsgaard
9e76714747 package: get rid of redundant malloc related configure presets
Those are already in TARGET_CONFIGURE_ARGS. Also get rid of unused
BR2_AC_CV_FUNC_MALLOC_0_NONNULL variable.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-06 19:58:45 +01:00
Peter Korsgaard
3fdf0bffb8 buildroot: silence ./configure step when building with 'make -s'
We have been passing -q to ./configure when using 'make -s' for
packages using Makefile.autotools.in for some time. Do the same
for packages using autotools, but not using the
Makefile.autotools.in infrastructure, taking care to not do it
for packages with hand written configure scripts.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-01 21:24:42 +02:00
Will Newton
422ce6536b package: Remove unnecessary dependencies on uclibc.
A C library will have been built by the toolchain makefiles, so there is no
need for packages to explicitly depend on uclibc.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-09-03 20:22:38 +02:00
Thomas Petazzoni
74ecbaa23d xorg: remove the XSERVER variable
The XSERVER variable used to be defined by package/Makefile.in because
the X server package name was different depending on the type of X
server that was choosen. Nowadays, the name of the package is always
xserver_xorg-server, so there's no point in having this XSERVER
intermediate variable.

This patch makes all packages use xserver_xorg-server directly as a
dependency, and removes the XSERVER variable from package/Makefile.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-24 23:26:48 +02:00
Thomas Petazzoni
6beeb755fa xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none
The BR2_PACKAGE_XSERVER_none option has gone, so use BR2_PACKAGE_XORG7
instead. It is more logical to test if BR2_PACKAGE_XORG7 is set to
know if an X.org server is available, than testing if
BR2_PACKAGE_XSERVER_none is set to know if an X.org server is *not*
available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-24 23:26:47 +02:00
Peter Korsgaard
91149af9f3 package: provide download target for host packages 2009-03-24 10:58:04 +00:00
Peter Korsgaard
e7b38c71ce package: add STAMP_DIR and use for host builds
Move stamp (dependency) files outside the (version specific) source
directories, so other packages can hardcode dependencies on them instead
of having to use <PACKAGE>_VERSION variables.

This is important as the variables in the make rules are evaluated when
the rules is seen, which might be before the dependent makefile is parsed
(and hence <PACKAGE>_VERSION variable is known, screwing up stuff.

The downside of this is that the package isn't automatically rebuilt
when the version changes (E.G. by a svn update) and you now also have to
remove the stamp files next to $(BUILD_DIR)/<PACKAGE>-* to force a rebuild.
2009-03-19 11:06:47 +00:00
Peter Korsgaard
849c45648d pkg-config: rename pkgconfig to pkg-config
This matches upstream tarball, doesn't screw up existing .config's with
BR2_PACKAGE_PKGCONFIG and makes sure the patch gets applied for target
compilation.
2009-03-19 08:30:20 +00:00
Peter Korsgaard
aefadc18d9 cairo: remove unneeded _INSTALL_STAGING_OPT setting 2009-03-18 21:22:08 +00:00
Peter Korsgaard
dd4faf6f6f cairo: add host version 2009-03-18 21:22:04 +00:00
Peter Korsgaard
77754571b2 pkgconfig: add pkgconfig package for target
The host versions shouldn't be visible in Kconfig, so remove the
reference to BR2_PACKAGE_PKGCONFIG everywhere and prefix the host targets
with host-.

At the same time add pkgconfig for the target (E.G. for development) and
let BR2_PACKAGE_PKGCONFIG control that package.

Notice: all defconfigs in the tree have been updated, but make sure to
disable the pkgconfig package (unless you want it) if you use an external
config, otherwise you'll end up with pkgconfig and glib2 in the target.
2009-03-18 19:19:10 +00:00
Peter Korsgaard
01bcd0320e libglib2: build host version for build-time binaries
Build host version of glib in HOST_DIR and use the build-time binaries
from there instead of relying on what is installed on the host.
2009-03-16 15:49:03 +00:00
Peter Korsgaard
bcbd144287 cairo: more fine grained configutation and fix dependencies 2009-03-12 10:21:21 +00:00
Thomas Lundquist
fa2273f409 Easier with one place for configure options for disabling gtk-doc 2009-01-17 10:11:12 +00:00
Thomas Lundquist
caf9ed7bff Better to use the correct --without 2009-01-14 13:36:36 +00:00
Thomas Lundquist
dd771221ff Woops, we do need /dev/null, not a directory with html in it. 2009-01-14 12:26:30 +00:00
Thomas Lundquist
8356803dcf Fix dependencies. 2009-01-12 15:22:41 +00:00
Thomas Lundquist
94b61800c7 May not be the right way to do it but I just don't want those docs. 2009-01-12 10:29:46 +00:00
Peter Korsgaard
cab350013e libpng: fix Makefile.autotools.in fallout
libpng used to have the 'png' Makefile alias, which some packages used
in their dependencies list.

With the move to Makefile.autotools.in this is now gone, so update the
packages to match.
2008-11-02 19:21:17 +00:00
Daniel Laird
ab20262575 package/cairo/cairo.mk: Bounce version and add patches for DirectFB
Update Cairo to 1.6.4
Add DirectFB patches as supplied by DirectFB author Dennis Kropp

Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
2008-10-22 15:01:00 +00:00