Commit Graph

11 Commits

Author SHA1 Message Date
Andreas Oberritter 396a6f6b2d cogl-1.0: explicitly disable cairo
- Cairo was auto-detected, but not listed as a dependency.

(From OE-Core master rev: 33bcc9361fa732c36d92128c7f23a308f455297c)

(From OE-Core rev: 9ed692eb20fed4ff9d9c39435000535df5a67286)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
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
Andreas Oberritter 431c80b6d0 cogl-1.0: depend on virtual/mesa
- Wayland support depends on wayland-egl, which is provided by mesa.

(From OE-Core master rev: a1a379b3c9728a06b086b4c1f06f663f54d7d37d)

(From OE-Core rev: 8c75d888a5e4cf7fc2c92df730d80224f5ffa99a)

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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 17:00:04 +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