Commit Graph

90 Commits

Author SHA1 Message Date
Otavio Salvador ea5913fa84 cogl: Add a missing depends on libxdamage
During a from scratch build test, cogl build failed due a missing
dependency on libxdamage.

(From OE-Core rev: 959a2f6d88d8fa6874fff83b7a1f0e7d4e36b887)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-28 11:07:37 +01:00
Ross Burton 38adf05204 clutter: DOLT isn't used anymore
(From OE-Core rev: fbff096fd1168ec8147fb348fb36ecafcaefef19)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 18:04:19 +01:00
Ross Burton 9f77978223 clutter: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: d8b88ecd46b1397ff3d598ee82fcaedf6d59e8af)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:19 +01:00
Ross Burton d0a8a0d138 cogl: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 69bae4de251da32e26eae5a57d7dccc904db17da)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:17 +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
Richard Purdie fef7a66d9b clutter: clutter_git is really clutter-1.8_git, rename
Both these clutter recipes provide 1.8. With different PN namespace, a world
build cna build both causing the clutter libraries to "disappear" at certain
points of the build. In particular, this causes issues for mx.

This patch puts then into the same PN namespace so only one can be built.

[YOCTO #2158]

(From OE-Core rev: d5a7a9090b57793be1de63dca86fe40437628e9d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-28 16:53:09 +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
Joshua Lock 18c3197911 clutter: upgrade git recipe to reflect 1.8.4 tag
(From OE-Core rev: 37b47a8f038947c6725dec10845412df7f67e9e4)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-10 14:38:42 +00:00
Joshua Lock 51c719d779 clutter-1.8: update to clutter-1.8.4
Added a note about why we're setting S, so I don't have to figure it out again
next time I try and update clutter.

(From OE-Core rev: b752e2d6ae286db5588547fc49f1aa64e112fa32)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-10 14:38:42 +00:00
Joshua Lock 6882a60b18 clutter-gst: update to 1.4.6
(From OE-Core rev: a440654076008a107fff2245eff7791a4abf5abf)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-25 14:34:08 +00:00
Joshua Lock 0d7dfedca4 cogl: update upstream status for build_for_armv4t.patch
This has patch has been merged into upstreams git repository and will be
available in the next stable release.

(From OE-Core rev: 77f5e99a821ad30b859a402bdc55c495741b24cc)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-25 14:34:08 +00:00
Joshua Lock 00f0d4ad64 cogl: ensure we can build on armv4
Without this patch cogl will not build for armv4 as it uses an
unsupported instruction. This changeset adds a patch from Wolfgang
Denk to add an extra guard around armv5 or above code.

(From OE-Core rev: e19586765af518892ed55d9bfd45d0857566ae98)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 11:56:42 +00:00
Joshua Lock 58cfa4f224 cogl: clarify LICENSE as LGPLv2.1 and fix metadata
Fix the HOMEPAGE and DESCRIPTION which were using the same values as Clutter.

(From OE-Core rev: 67c91c83774d485b54357b81eb105ab291d4e383)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-21 17:16:28 +00:00
Joshua Lock 5b2452c612 clutter: clarify LICENSE as LGPLv2.1
(From OE-Core rev: f38f199f33a10fcc1bebd83b862c0936ca33535e)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-21 17:16:27 +00:00
Saul Wold 6036845d1c Patch Upstream Status Updates
(From OE-Core rev: 0eb139619301d0efee330932eba3617dcb39284e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:26 +00:00
Joshua Lock d29ea11597 clutter_git: update to 1.8.2 tag
Eventual plan is to start building bleeding git again, so we'd like to keep
the recipe around and relatively up to date.

(From OE-Core rev: 12b03b946ba5b08f93b780b6b3f7115fcf76fdcb)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:23 +00:00
Joshua Lock b1ce9372af cogl: update git recipe to 1.8.2
Eventual plan is to start building bleeding git again, so we'd like to keep
the recipe around and relatively up to date.

(From OE-Core rev: 849b90f7cf1472948dcc7f613d25f4b1b0be49ad)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:22 +00:00
Joshua Lock 827dfe8f4b clutter: upgrade to 1.8.2
(From OE-Core rev: b9d36990ebe00afcae5bba19252462bf1b4403f3)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:22 +00:00
Joshua Lock 1409daf084 cogl: upgrade to latest stable cogl 1.8.2
(From OE-Core rev: 596d3d1267813e01f87a85c23f1e4a0b7130418b)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:22 +00:00
Elizabeth Flanagan 5eeea9e170 OECore license fixes: meta/*
This is a quick audit of only the most obviously wrong licenses
found within OECore. These fixes fall into four areas:

- LICENSE field had incorrect format so that the parser choked
- LICENSE field has a license with no version
- LICENSE field was actually incorrect
- LICENSE field has an imaginary license that didn't exist

This fixes most of the LICENSE warnings thrown, along with my prior
commit adding additional licenses to common-licenses and additional
SPDXLICENSEMAP entries.

HOWEVER..... there is much to be done on the license front.
For a list of recipes with licenses that need obvious fixing see:

https://wiki.yoctoproject.org/wiki/License_Audit

That said, I would suggest another license audit as I've found
enough inconsistencies. A good suggestion is when in doubt, look at
how openSuse or Gentoo or Debian license the package.

(From OE-Core rev: 3083dd70b3a9fa01fcc3cf00373b05502505996e)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-08 15:24:32 +00:00
Joshua Lock 70b3434ca9 clutter-gst: upgrade to 1.4.4
(From OE-Core rev: 718b411900d58cd229a500015c63a8d31cf4f5af)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-06 14:24:39 +00:00
Joshua Lock da1c3e3f95 clutter-box2d: drop unbuildable clutter-box2d-1.6_0.10.0
It's very old at this point and doesn't build with recent clutter

(From OE-Core rev: 04d2bb8e83aaac856f03f3fc9772285bd82182e4)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:54 +00:00
Joshua Lock b231f14792 clutter-box2d: fix LICENSE field - LGPL-2.1
clutter-box2d has had the same COPYING file since 2008-04-03, therefore
update the license field in the inc file to reflect its contents.

(From OE-Core rev: 755726a7441794b8b5ac9de05744f85adf02f596)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:54 +00:00
Joshua Lock e15ee3de9b clutter-box2d: Update git recipe
Several changes and fixes exist unreleased in git with version 0.12.1,
update to build the latest available.

(From OE-Core rev: 07799e71135a059cdbf1b8720a8094e2e22ac1b6)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:54 +00:00
Joshua Lock 50e32043a1 clutter: move STDDEPENDS to inc
We only build clutter-1.8 now so move the additional STDDEPENDS from the
recipe to the inc file. This has the added benefit of fixing
clutter_git.

This patch also fixes the LIC_FILES_CHKSUM for clutter_git

(From OE-Core rev: f49f3cbdbf06f9c4b2fcbbbdc892d8de7997c527)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:54 +00:00
Joshua Lock 8e4e51825f cogl: add missing depends on libxcomposite
Cogl checks for libxcomposite at configure time.

(From OE-Core rev: 4607b8bdf1565d404c32c45a634d37e1ae2ee4aa)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:53 +00:00
Joshua Lock 1b4d7fcdb3 clutter-*-1.6: drop clutter 1.6 recipes
Clutter 1.8 is API and ABI compatible with Clutter 1.6 according to the
release notes so there's no need to keep these recipes around.

www.clutter-project.org/blogs/archive/2011-09/clutter-1.8.0-stable-release

(From OE-Core rev: cd2f5a74c6021652866edf3e4060b95c0dd81376)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:53 +00:00
Joshua Lock 812530c580 clutter: PROVIDES clutter-1.6
Since the two are API/ABI compatible and this may make things easier for
external layers using clutter.

(From OE-Core rev: ec89071836f3844c41a34061af4baf706036e371)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:50:52 +00:00
Joshua Lock dd860e9a7a clutter-1.8: package examples
(From OE-Core rev: 19cc725f32b3793a785fe06d27c64bc3e5f608b5)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:38:28 +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
Joshua Lock e1ca9aad81 clutter-gst: fix patch filename
Munged the patch filename somehow. Apologies for the noise.

(From OE-Core rev: 157db263b50fabf4afcbea3c2a5364c0752ae0e2)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 17:33:24 +00:00
Joshua Lock febb65c9af clutter-gtk-1.8: add clutter-gtk 0.11.4
(From OE-Core rev: e5568f9a569e6ff1cf45553edb18923a4f7843e9)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock 65ce67a64e clutter-gst-1.8: add 1.4.2 for use with clutter 1.8
(From OE-Core rev: acca04830aad1368f0a5cc2f48302cf272731174)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock 22fcc7c2b0 clutter-1.8: add 1.8.0
(From OE-Core rev: d59578fd9e2c45bdc2f030d68c84d05c5ad5be6b)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:53 +00:00
Joshua Lock 7ac57baf15 cogl: add cogl 1.8.0 recipe
Cogl has been split into a separate recipe as of the clutter-1.8 series

(From OE-Core rev: 3bddb7cd3400857ac724e91cb5b663bcf386ab37)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:53 +00:00
Saul Wold f7196be455 cogl: COPYING file Updated FSF Address
(From OE-Core rev: f3a7b6aaa9be4763d13214c3264b86a1c7bf5e9f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:37 +00:00
Joshua Lock 0d18f03b22 clutter-gtk: add LIC_FILES_CHKSUM to include file
(From OE-Core rev: ff13e06892f102d915855cde50896349b07b3717)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-31 22:03:19 +00:00
Richard Purdie 263852e5a2 cogl: Add git recipe (required by clutter)
(From OE-Core rev: 00545a358fb1fd29a9dd7a77ee54eaf303f41493)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:07 +01:00
Richard Purdie 8dc24dad31 clutter-1.6: update to 1.6.18
(From OE-Core rev: c23c4cd439bd43f4d2d57d11d530589c07bfcb11)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:07 +01:00
Richard Purdie 74422239ed clutter: Update git recipe to more recent version
(From OE-Core rev: c5b29de1ea31dc581f460dbac66d17f784d17396)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:07 +01:00
Saul Wold d3798b658a clutter-gst-1.6: Add SRC_URI Checksum
(From OE-Core rev: 61490712e37a1d3300eb0da9424ff94e270edb02)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:45 +01:00
Khem Raj a0dc330b4a recipes: Delete patch=1, its default and replace pnum with striplevel
Some place pnum=1 is used which is removed as well since
striplevel=1 is default

(From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:23:30 -07:00
Richard Purdie c9c14a198d Sync patches with DOS line endings that became corrupted
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-22 10:04:04 +01:00
Saul Wold 51ff9bae5b clutter-box2d: fix isfinite.patch
The original patch lost ^M and was not appliable.

(From OE-Core rev: 980f57f2d21818957165a73a0f1bc8cc19e10113)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-21 10:59:19 +01:00
Khem Raj 07fb4265c9 clutter-box2d: Replace use of finite macro with C99 compliant isfinite()
(From OE-Core rev: 46a335577506f36714f66135931b7b9669dc1416)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:39 +01:00
Saul Wold 4a6109fc36 Patches: Fix Upstream-Status info
(From OE-Core rev: f2a5b2d143fff8337d2f0d024bc593c55f56a3a3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-13 12:29:20 +01:00
Zhai Edwin 120b40952e clutter: Use new git repo
clutter move its git server from clutter-project.org to gnome.org

[YOCTO #1040] got fixed

(From OE-Core rev: 752ab344a6456619901fb8d33137b0329d5b039e)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-23 13:45:56 +01:00
Saul Wold e4293c5be7 clutter-box2d_git: Switch SRC_URI to git.gnome.org
(From OE-Core rev: e47bfe3b31e8a52a0e47d22eb65c092bc67097b1)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-14 15:28:23 +01:00
Saul Wold 484c4e7324 clutter-1.6: Add patch to update gettext macro version
(From OE-Core rev: 0a496df0209c93fd00ea929b5f27faa1a6e600c0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-01 18:34:37 +01:00
Saul Wold 0d294877fd clutter: Clean up old recipes
clutter-1.4 is moved to meta-extras
clutter-box2d is migrated to latest 1.6 version

(From OE-Core rev: 5b9786fe10a630bfbb344a6a644171fd4457b657)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:44 +01:00