Commit Graph

29 Commits

Author SHA1 Message Date
Peter Kjellerstedt 254bfb1071 recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-01 11:17:45 +00:00
Ross Burton cfa8b1ed6f cairo: set license for cairo-doc
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-09 13:39:12 +00:00
Alexander Kanavin 363b2989c8 cairo: enable gtk-doc
(From OE-Core rev: 60c10d8c07c92e3b275a2cc422b9013cbcf3c93a)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-09-09 12:12:23 +01:00
Jussi Kukkonen d818cde5ab cairo: inherit upstream-version-is-even
Even versions are releases, odd are "snapshots".

(From OE-Core rev: 16983a7256411053d6126af9b70710056ae1ce2c)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01 16:22:41 +01:00
Andre McCurdy 603b4de33a cairo.inc: drop obsolete CFLAGS += "-ffat-lto-objects" workaround
LTO support was removed from Cairo in 1.12.18 (and 1.14.0).

  https://bugs.freedesktop.org/show_bug.cgi?id=77060
  http://cgit.freedesktop.org/cairo/commit/?h=1.12&id=213b3b9b8b92944506c712aa4d728903c547f879

(From OE-Core rev: cedc94919995473ba67968a9115023d6061ab045)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-11-16 11:39:39 +00:00
Andre McCurdy 5f9d16bb87 cairo: fix license for cairo-script-interpreter
Without an explicit license, cairo-script-interpreter inherits
the default LICENSE and isn't packaged in builds which blacklist
GPLv3.

(From OE-Core rev: cb8f84218b065fed88a8c36f3c78065e8ab726bf)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-11-16 11:39:32 +00:00
Joshua Lock 0cf9ef0bf1 cairo: make xlib and libxcb dependencies explicit
(From OE-Core rev: 963ee40b6653741af9a22af7a01ad31bd6ca97a9)

Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-15 22:08:03 +01:00
Lei Maohui ccb2feb6fd cairo_1.14.2: Modified the license of cairo-trace.
Because the license of cairo-trace is GPLv3(util/cairo-trace/COPYING).
So pickup cairo-trace,and modified the license to GPLv3.

(From OE-Core rev: 9e29a8bec3e6bcba38cf097181e50f1266b33221)

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-19 13:34:43 +01:00
Khem Raj 9f1f18559c cairo: Fix build with gcc 4.9
Fix upstream bug
https://bugs.freedesktop.org/show_bug.cgi?id=77060

gcc 4.9 now generates slim objects when LTO is used
These slim objects only contain intermediate language
representation for LTO. Use -ffat-lto-objects to create files which
contain additionally the object code. When linking some .so file, the option
'-flto' is missed, so the error happens.
We add '-ffat-lto-objects' flag to make gcc 4.9 behaves the same as gcc 4.8.

(From OE-Core rev: c4e65e14fbdf957aa34e074337c5649a0b0888b7)

(From OE-Core rev: 858f01ab9613c2b122718c350da763f8fe981d9f)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-06 17:59:15 +01:00
Otavio Salvador 4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01:00
Otavio Salvador af63a096cd cairo: Add 'egl' and 'glesv2' PACKAGECONFIG options
(From OE-Core rev: f405f6983b4f36db4ec1b89c30b1082aec2545f8)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-21 12:05:51 +00:00
Christopher Larson 4eab9d000f cairo: add/use packageconfig for valgrind support
It was currently autodetecting.

(From OE-Core rev: 68fc138d172d491e16d5e6f2fc21fc779c04b92f)

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>
2013-12-03 17:45:53 +00:00
Ross Burton 88a8e96f8f 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 rev: 8413bf1ce95802bff032b4592ca1aa4728d62cbf)

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-10-18 15:49:56 +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 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
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
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
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 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
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
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
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