diff options
| author |   Steve Arnold <stephen.arnold42@gmail.com> | 2015-05-30 10:00:58 -0700 |
|---|---|---|
| committer | Steve Arnold <stephen.arnold42@gmail.com> | 2015-05-30 10:00:58 -0700 |
| commit | a36e88194f2a9bc82be3b0e01e672ab7ac6f2f02 (patch) | |
| tree | 58a7363ac9897f2f8f12210c8455e6d9c582eec2 /x11-libs | |
| parent | updated cairo git ebuild and added missing patches (diff) | |
| download | arm-a36e88194f2a9bc82be3b0e01e672ab7ac6f2f02.tar.gz arm-a36e88194f2a9bc82be3b0e01e672ab7ac6f2f02.tar.bz2 arm-a36e88194f2a9bc82be3b0e01e672ab7ac6f2f02.zip | |
updated cairo with extra features for embedded/Xorg stuff
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/cairo/cairo-1.14.2-r1.ebuild (renamed from x11-libs/cairo/cairo-1.14.2.ebuild) | 7 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/x11-libs/cairo/cairo-1.14.2.ebuild b/x11-libs/cairo/cairo-1.14.2-r1.ebuild index 00963b5..98788d7 100644 --- a/x11-libs/cairo/cairo-1.14.2.ebuild +++ b/x11-libs/cairo/cairo-1.14.2-r1.ebuild @@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="http://cairographics.org/" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua cogl debug directfb gles2 +glib glx lto opengl qt4 static-libs +svg valgrind xcb -xlib-xcb" +IUSE="X aqua debug directfb gles2 +glib glx lto opengl static-libs +svg valgrind xcb -xlib-xcb" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -32,12 +32,10 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] - cogl? ( >=media-libs/cogl-1.18.2[${MULTILIB_USEDEP}] ) directfb? ( dev-libs/DirectFB ) gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) - qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -138,7 +136,6 @@ multilib_src_configure() { $(use_enable X xlib-xrender) \ $(use_enable aqua quartz) \ $(use_enable aqua quartz-image) \ - $(use_enable cogl) \ $(use_enable debug test-surfaces) \ $(use_enable directfb) \ $(use_enable gles2 glesv2) \ @@ -146,7 +143,6 @@ multilib_src_configure() { $(use_enable glx) \ $(use_enable lto) \ $(use_enable opengl gl) \ - $(use_enable qt4 qt) \ $(use_enable static-libs static) \ $(use_enable svg) \ $(use_enable valgrind) \ @@ -157,6 +153,7 @@ multilib_src_configure() { --enable-pdf \ --enable-png \ --enable-ps \ + --disable-cogl \ --disable-drm \ --disable-gallium \ --disable-qt \ diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 9a72e12..8f544a1 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -36,7 +36,7 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) - qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] ) + qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |