Commit Graph

36 Commits

Author SHA1 Message Date
Christopher Larson 89a5d5ec5b cairo: add/use packageconfig for valgrind support
It was currently autodetecting.

(From OE-Core master rev: 68fc138d172d491e16d5e6f2fc21fc779c04b92f)

(From OE-Core rev: f6496a471d8944357067c7573d23f612f3af1f72)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-09 11:04:13 +00:00
Ross Burton 7612323dba cairo: add explicit dependency on zlib
In normal use this is pulled in through libpng, but it's exposed in the headers
of cairo-pdf and cairo-ps and a build from sstate can end up without zlib being
present.

(From OE-Core master rev: 8413bf1ce95802bff032b4592ca1aa4728d62cbf)

(From OE-Core rev: 252896140bb107315e58bbd82b9a73528da9b860)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 16:59:56 +00:00
Ross Burton e0b4d0e6db cairo: drop transform patch, it's been rejected upstream
This fix was rejected by upstream, the correct fix is actually to fix libpng.

(From OE-Core rev: f7f8ec1197ec64620c80e13214dc395ab3e12afc)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-22 14:45:03 +01:00
Ross Burton 9e1753e6b5 cairo: fix builds with libpng 1.6
libpng 1.6 emits more warnings than before, and is also stricter with function
ordering.  Fix the function ordering when reading PNGs, and stop treating all
warnings as errors.

(From OE-Core rev: 55d00b750f5c45e583abef406c96416cd6a8caa7)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-16 12:39:49 +01:00
Saul Wold 30ad607095 cairo: explicity disable lzo
By explicitly disabling the LZO check, we ensure a deterministic build

[YOCTO #4076]

(From OE-Core rev: 7d855cb624f9330e185ff0f03b5b317d805eda09)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 11:41:13 +00:00
Constantin Musca 7e6d1ab31d cairo: upgrade to 1.12.14
(From OE-Core rev: b4c5a95c4c5266c4b3a26addd4ac87bc4a482604)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-22 06:09:21 -08:00
Constantin Musca 7d8a50eecc cairo: upgrade to 1.12.12
(From OE-Core rev: d5cd3638d339e2154696792160f93b155cb7b086)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-12 13:22:43 +00:00
Constantin Musca 929ef59abb cairo: upgrade to 1.12.10
(From OE-Core rev: 5910cf254635545040df62d9db898abcf17e00d4)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-25 12:42:48 +00:00
Constantin Musca c13e458b22 cairo: use directfb instead of gtk-directfb
- we now have directfb as DISTRO_FEATURE
- DirectFB is not supported by gtk versions >= 2.18

(From OE-Core rev: 6223aa118ed7a2726ed73c06246423795d53af5e)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-25 12:42:47 +00:00
Noor Ahsan e38ce33960 cairo: Adds libxext in X11DEPENDS.
* cairo was giving redefinition error of struct _XLinearGradient,
struct _XCircle and struct _XRadialGradient.
* cario now depends on libxext. Adding that dependency resolved
above errors.
* Verified it on P2020RDB.
* Bump PR.

(From OE-Core rev: 409a739dd89ea256a49c69452dc29439fc3ee64e)

Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 11:09:43 +00:00
Marko Lindqvist 871040712c cairo: update to upstream version 1.12.8
(From OE-Core rev: 060a9d982bf5e46d30a52c3bc6f17263f750a013)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-03 13:52:05 +00:00
Martin Jansa 2c5079be86 recipes: bump PR to rebuild after libffi5 -> libffi6
(From OE-Core rev: 211200fb98a72ba815e7c411fbebfd781879064c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-19 17:56:26 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Saul Wold 6362e9c01e cairo: Update to 1.12.2
Clean up some packaging issues, cairo-sphinx was installed
and is a testing tool that does not need to be packaged

(From OE-Core rev: 6a0dac89932b41502bb55a2dae07d835ca3c6245)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:06 +01:00
Martin Jansa 009fa28404 cairo: import native support from meta-oe
(From OE-Core rev: d8f4551d96c952cb62e8d96f9d5d491be9151279)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:04 +01:00
Richard Purdie 06f2f8ce0a meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:

sed \
 -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
 -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
 -i `grep -ril getVar *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:22:56 -08:00
Paul Eggleton 320558f494 More quoting fixes
(From OE-Core rev: 17f2d5d70ad323cea4fb149154bc38844661fa3a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-29 13:12:13 +00:00
Martin Jansa 0761649736 recipes: bump PR to rebuild .la files without libz.la
(From OE-Core rev: 1da6a2dbd5e7aeea6cd45ca05590bdd50b67bf89)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-21 17:00:47 +00:00
Khem Raj a142cbd47e zlib: Upgrade 1.2.5 -> 1.2.6
Dont use autotools, it really not so autoconf like.
the configure script gets updated with every release of zlib
and we overwrite that. Instead use the upstream provided
configure

copyright year was changed in zlib.h which caused change in
LIC_FILE_CHECKSUM

fix.inverted.LFS.logic.patch is already applied upstream so drop it

Drop the configure.ac and Makefile.am scripts since we do not
autoreconf anymore and do not inherit autotools anymore

Bump PR for depending recipes so a rebuild it ensues so that
they dont depend on .la anymore
and add missing dependencies discovered during incremental
build

(From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-10 14:38:44 +00:00
Koen Kooi 16d911d191 cairo 1.10.2: enable tee backend
This is needed for firefox:

| checking CAIRO_LIBS... -lcairo -lpixman-1 -lfreetype -lfontconfig
| checking for cairo-tee >= 1.10... Package cairo-tee was not found in the pkg-config search path. Perhaps you should add the directory containing `cairo-tee.pc' to the PKG_CONFIG_PATH environment variable No package 'cairo-tee' found
| configure: error: Library requirements (cairo-tee >= 1.10) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.

(From OE-Core rev: 935ae84757ca623f93b1465088e27107bc226dee)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-16 12:24:56 +00:00
Xiaofeng Yan e2948feae8 cairo.inc: Change configuration of directfb to gtk-directfb
"direcdtfb" is a wrong configuration in PACKAGECONFIG. It should be "gtk-directfb".
PACKAGECONFIG can't select directfb as backend rightly, or else.

[YOCTO #1900]

(From OE-Core rev: 458ffd3f47b99ee89e6cb8015d68f9820f86e3e7)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-16 12:24:55 +00:00
Xiaofeng Yan f1a487873c cairo: add directfb DISTRO_FEATURE
cairo run over x11 at current OE-core. If cairo want to run over directfb, then \
the configuration related to x11 should be disabled and directfb should be enabled.

[YOCTO #1674]

(From OE-Core rev: dd5b44034014ba1962cfca1bf7430f8c8dc5243c)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-13 12:28:09 +00:00
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Richard Purdie eb509c6c3d cairo: Disable bfd symbol loopup since we don't list it in DEPENDS
(From OE-Core rev: ac8b7e275a8789b6605ef84a3b128aea2518b596)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-25 17:53:31 +01:00
Phil Blundell 3c1701b7c9 cairo: only use x11 if selected in DISTRO_FEATURES
This makes it possible to build cairo-using apps without X11.

(From OE-Core rev: ba22cfac56120d001a53d33aee3b8eb3feda2786)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:19 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Richard Purdie a272d989a9 cairo: Clean up packaging and fix warnings
There were a number of QA errors being reported when packaging cairo. This patch
ensures the debug files go in the -dbg package, the .so development links go into
the -dev package, .a files into -staticdev.

It also switches back to relying on debian package naming for the library name.
Since this is working correctly now the files are in the correct packages, we
can simplify the recipe and there is no change in the resulting package names
from a package feed perspective.

(From OE-Core rev: 9e8bc7b5834578f325c5777bf196dc834ca406c3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:25 +01:00
Beth Flanagan 62e3f0ff7b License Field Cleanup: Non-standard field names
I've cleaned up some odd license fields, fixed some license
names and corrected some incorrect licenses. LICENSE really needs
a pass through by the maintainers as some of the licensing is
incorrect.

Also, every license with Artistic should be gone through and noted as
which version of Artistic.

(From OE-Core rev: 4786ecdf7cd427089464dcb62579110d494e7cd7)

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 18:27:22 +01:00
Beth Flanagan fe3cc9a8fa cairo_1.10.2: Fix DEPENDS to include glib-2.0
The autobuilder picked up cairo having a dependency on glib-2.0. Added glib-2.0 to DEPENDS.

(From OE-Core rev: 65010151368c255bef7b2aefc47de48f658cf15b)

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-15 01:18:51 +00:00
Mark Hatle 9ee3c77f4e recipes-graphics: Add more detailed SUMMARY and DESCRIPTIONS
Add more detailed SUMMARY and DESCRIPTIONS to various graphics and
graphics related components.  I've recently gotten question from users
what something is, or why it was needed.. this should go a long way toward
answering those questions.

Many of the descriptions were taken directly from the upstream location,
where one was not available the Debian packages were consulted for
information.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-03 08:49:22 -08:00
Yu Ke 82c8fde5a1 cairo: upgrade to 1.10.2
Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:03 -08:00
Koen Kooi 0e8f0f0a03 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-30 10:03:10 +00:00
Mark Hatle cda749d2b8 recipes-graphics: Add SUMMARY and update DESCRIPTION
Add the missing SUMMARY fields and update DESCRIPTION fields if necessary

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-12-16 15:53:08 +00:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Yu Ke e9d144f77e cairo: upgrade from 1.8.10 to 1.10.0
several chagnes are made:

- hardcoded_libtool.patch is removed, because the code (dolt logic) it
  applys to have been removed. dolt is originally introduced to
  accelerate libtool, it is later removed by commit 9de25a0297c due to
  libtool is fast enough. so this patch can be removed too.

- explicitly specify the package name as libcairo2. In 1.8.10, the debian
  rename hook (meta/classes/debian.bbclass:debian_package_name_hook )
  will automatically rename the package to libcairo2. When upgrade to
  1.10.0, the name changes to cairo, because the package contains not
  only library, but also bin executable. This name change will cause
  dependency  failure to thos package which depends on libcairo-1.8.10.
  so it is necessary to keep name as libcairo2 by explicitly specifing.

- specify extra package: libcairo-gobject2, libcairo-script-interpreter2
  and cairo-perf-utils. it is newly added in 1.10.0. The name schema is
  from Debian.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-11-22 10:33:08 -08:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00