Commit Graph

32 Commits

Author SHA1 Message Date
Jussi Kukkonen 1f129c1598 cogl-1.0: Upgrade 1.22.0 -> 1.22.2
Bug fix release. Backport a build fixing patch.

(From OE-Core rev: 79494ac397384af46d383ef414de372343cd4299)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-20 15:22:16 +00:00
Robert Yang d34237c948 cogl-1.0: set COMPATIBLE_HOST_armv4 to null
It doesn't build with armv4:
cogl-texture-deprecated.c  -fPIC -DPIC -o deprecated/.libs/cogl-texture-deprecated.o
{standard input}: Assembler messages:
{standard input}:831: Error: selected processor does not support `clz r3,r0' in ARM mode
make[4]: *** [deprecated/cogl-fixed.lo] Error 1
[snip]

(From OE-Core rev: 858dc0b21e2b65b90c115411c678ae8ca80134e5)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-17 14:43:29 +01:00
Ross Burton 9877795064 cogl: fix G-I .typelib installation
By default gobject-introspection puts .typelib files into $PN, but the cogl-1.0
recipe doesn't use PN.  Installing cogl-1.0 is impossible as libcogl
conflicts/replaces with cogl-1.0 due to a previous upgrade.

Fix this by putting the .typelib files into the right subpackages, and
explicitly setting FILES_${PN} to "" so that nothing accidently ends up in PN.

(From OE-Core rev: c5c47bc30be52e3b70d74cf89d5c68adbbb1a402)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-05 14:33:57 +01:00
Alexander Kanavin c1d67e459d clutter: enable gobject introspection
(From OE-Core rev: e364deddafaec1f1f6b58ac41542dfc91d5145a4)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-12 22:11:45 +00:00
Robert Yang 11f5a42936 cogl-1.0: fix may be used uninitialized error
Fixed when DEBUG_BUILD = "1":
test-backface-culling.c:206:7: error: 'cull_front' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|        validate_part (framebuffer,
|        ^
| cc1: some warnings being treated as errors

(From OE-Core rev: 48b0bc85502e394f13898bbec61e21f9282b0edf)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-11 23:26:30 +00:00
Alexander Kanavin 642e92f2cd package_regex.inc: split entries with odd-even versioning into their own recipes
(From OE-Core rev: 5ddaba1fb833d0408cef5f58f786513b9293c30a)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:51 +00:00
Jussi Kukkonen 148c95331d cogl-1.0: Upgrade 1.20.0 -> 1.22.0
Remove patch that is no longer necessary.

(From OE-Core rev: 4781de242473bb53876380d784b00cbdb6700517)

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>
2015-12-08 10:20:48 +00:00
Wenzong Fan d3da00648c recipes: add distro_features_check for some packages
* The packages that depends on gtk+3 require any of distro features
  from ${GTK3DISTROFEATURES}

* The packages that depends on virtual/egl, virtual/libgl ... require
  distro feature 'opengl'

(From OE-Core rev: 3edf08b38b0af93cef0933b061349264dc86d54c)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-11-16 11:39:27 +00:00
Jussi Kukkonen 409490147b cogl-1.0: Upgrade 1.18.2 -> 1.20.0
* Backport patch that fixes build with GLES2

(From OE-Core rev: 9d38fb232deaa2e7e46d3c442d1598e13bba9c0a)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-12 22:55:39 +01:00
Robert Yang eb342b817f cogl: remove extra dev from PACKAGES
There should be only one dev and dbg package.

(From OE-Core rev: e6be75c98edf878f73e530bc6e63b3c50bf365cc)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-13 22:33:21 +01:00
Ross Burton c366bcb09e cogl: fix .pc file packaging
Some .pc files were not being correctly moved into the right sub-package, so fix
this.

(From OE-Core rev: a37366224cc7d7ef5e2a603655bf531e3704f21f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-07 23:35:13 +00:00
Robert Yang 144630e6e8 cogl: enable egl-x11 when build with x11
Fixed clutter-1.0 compile error when build with x11:
clutter-backend-eglnative.h:31:27: fatal error: cogl/cogl-egl.h: No such file or directory
 #include <cogl/cogl-egl.h>
compilation terminated.

We need enable egl-x11 when x11 as we enable egl-wayland when wayland.

(From OE-Core rev: d61e3a6e63664ab2893a90e5525fe634d4514318)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-07 23:35:07 +00:00
Otavio Salvador 65e8bc44df cogl-1.0: Add libcogl-path package
The new library needs to be put in a specific package, or rootfs
generation fails as:

,----[ Error in rootfs generation ]
| Updating cache...               ########################### [100%]
| Computing transaction...error: Can't install
|   libclutter-1.0-0-1.18.2-r0@cortexa9hf_vfp_neon_mx6: unable to
|   install provider for libcogl-path.so.20:
|      error: libcogl-path20-1.18.2-r0@cortexa9hf_vfp_neon_mx6 is
|        conflicted by libcogl20-1.18.2-r0@cortexa9hf_vfp_neon_mx6
`----

Upstream split this library out from libcogl20.so, sothe libcogl package
no longer gets renamed to libcogl20 as it contains multiple libraries.

(From OE-Core rev: 9d63188950ecd1877adf1e40de1ca1928729d866)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-25 16:54:42 +01:00
Tim Orling 4956ae7879 cogl-1.0: update to 1.18.2
Announcement:
http://lists.freedesktop.org/archives/cogl/2014-July/001689.html

(From OE-Core rev: 2c7882cf1d73f26204685729a495771b75cf4f87)

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-10 17:38:32 +01:00
Tim Orling b7a33b798b cogl: update to 1.18.0
Announcement:
http://lists.freedesktop.org/archives/cogl/2014-March/001636.html

* License changed from LGPL to MIT
* kms-include-stddef.h-before-drm.h.patch fixed upstream

(From OE-Core rev: 0e3b38baddf6341465288323dfdc0440c47579d7)

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-06 09:26:03 +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
Prabhu Sundararaj 93532dfb75 cogl-1.0 : Update to 1.16.2 release
(From OE-Core rev: 3eb2435a7c7c8108cb73945d5003a9fc7455befd)

Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-21 12:05:52 +00:00
Richard Purdie 600dcd9d38 cogl: Place the patch in the correct directory
Otherwise this causes parsing warnings and build failures.

(From OE-Core rev: 6de220c2ae8effb9ecb61b9f55d3bacc01abedf9)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-30 14:10:03 +00:00
Andreas Oberritter 5f4fdf87e9 cogl: kms: include necessary header for size_t
Fixes compilation in cases where stddef.h is not already
included by EGL headers.

(From OE-Core rev: 5df33fc62f2d3a5a15dc387ed26cb7da8d9fbbe1)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-29 17:38:49 +00:00
Paul Eggleton cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Andreas Oberritter 2b99084635 cogl-1.0: explicitly disable cairo
- Cairo was auto-detected, but not listed as a dependency.

(From OE-Core rev: 33bcc9361fa732c36d92128c7f23a308f455297c)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-05 14:25:30 +00:00
Ross Burton ae03f3161f cogl: upgrade to 1.16.0
Drop two patches that were backported from upstream.

(From OE-Core rev: 598918602cbd65c6d54a6257cd0952c958a93046)

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-11-08 17:31:34 +00:00
Andreas Oberritter 8ceb14a352 cogl-1.0: depend on virtual/mesa
- Wayland support depends on wayland-egl, which is provided by mesa.

(From OE-Core rev: a1a379b3c9728a06b086b4c1f06f663f54d7d37d)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-30 13:39:07 +00:00
Ross Burton 9146bb6970 cogl: GL/GLX feature cleanup
Separate GL and GLX flags don't make sense, as on Linux GL means GLX and GLX
means GL.

So, default to GLESv2 and GLX if X11 is enabled.  EGL on X11 doesn't have
feature parity yet so leave it disabled by default.

(From OE-Core rev: e5f8f6c6191505d731c4672353e811d6729d424a)

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-08-16 11:14:30 +01:00
Andreas Oberritter 7d013f32ab cogl-1.0: make building cogl-pango optional
Add a 'cogl-pango' PACKAGECONFIG option and enable it by default.

(From OE-Core rev: 767a2893f6cbc7d48619086970b8ed6262a883e7)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:34 +01:00
Andreas Oberritter 9b6011c2d1 cogl-1.0: put each library into its own package
This allows to install cogl-gles2 and cogl-pango only when needed and
enables Debian package renaming. This stops cogl-pango from dragging
in unwanted runtime dependencies, if cogl-pango isn't used.

(From OE-Core rev: bcccb87a3213f5315f52fb18610b7e9dab510a7e)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:33 +01:00
Ross Burton 40ce8cf89b cogl: add Wayland support
Add PACKAGECONFIG stanzas for Wayland client and server, and respect the x11 and
wayland DISTRO_FEATURES to enable the relevant backends as appropriate by
default.

(From OE-Core rev: 84ffd212f9ca083301d19b9c7a9720d05c733e5c)

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-06-25 17:44:54 +01:00
Roy.Li eba5d155f2 cogl: make cogl be able to build on ARM arch
1. Fix asm() register constraints in cogl when building for ARM.
2. Fix cogl to handle Thumb builds.

(From OE-Core rev: cdfea71ff1c4f80ff3a0ade1d7514cbf3c22abde)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-14 12:44:34 +01:00
Ross Burton e85876de1b cogl: add missing xrandr dependency
(From OE-Core rev: c665f2d02f1daf6c7ebbe357284b7e5bbf401c54)

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-06-04 11:43:35 +01:00
Ross Burton d66ecfae46 cogl: remove documentation hacks
These sed lines disable the documentation and appear to be historical, building
works fine without them.

(From OE-Core rev: cb36bc74b772c355f219df5a3ff39f1ca95272ba)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-30 21:10:22 +01:00
Tomas Frydrych 7c178fc360 cogl: further improvements
* Removed unnecessary gtk-doc related depends/configure options (handled in
   gtk-doc class)
 * Moved more configure options into PACKAGECONFIG
 * Fixed typo in RDEPENDS of PACKAGECONFIG[gl] setup
 * Removed no longer needed DOLT-related configure fragment

(From OE-Core rev: 356e00b198608080495641270f4a1634ddc6ff85)

Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-24 14:14:43 +01:00
Tomas Frydrych e847bd9f31 cogl: Replace with 1.14.0 version
The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping
up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0
pc file and headers and are backward compatible), and to simplify dependency
management (worth noting that since the 1.x development files are not parallel
installable, it is not possible to use two versions of cogl 1.x at the same
time anyway).

Package configuration is provided via PACKAGECONFIG options as follows:

GL flavour:   'gl' for big GL or 'gles2' for GLES2
              (GLES1 is availabe in cogl, but not supporeted here at present.)

EGL platform: 'egl-null' -- PVR-style null platform
              'egl-kms'  -- kms platform provide by Mesa
              'egl-x11'  -- egl over xlib platform
              (Additional EGL platforms, e.g., Wayland are supported by cogl,
              but not supported here at present.)

GLX:          'glx' for the GLX extension support (implies 'gl')

Default configuration is 'glx'; typical configuration providing 'native' egl
on embedded HW would be 'gles2 egl-null'.

(From OE-Core rev: b508fdd2b19ca30da8d09caf646897dc4cf195c8)

Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-21 09:30:15 +01:00