[gentoo-commits] proj/x11:master commit in: dev-libs/weston/

["Nikoli" <nikoli@lavabit.com>]

commit:     96eb5a62e36a8d82d376eee3cf113c0bc63f3ac8
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Thu Jul 18 12:26:47 2013 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Thu Jul 18 12:26:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=96eb5a62

dev-libs/weston: add USE gles2, cairo in portage now has it

Package-Manager: portage-2.1.12.2
RepoMan-Options: --force

---
 dev-libs/weston/metadata.xml        |  1 +
 dev-libs/weston/weston-1.2.0.ebuild | 12 +++++++-----
 dev-libs/weston/weston-9999.ebuild  | 12 +++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 93fc89a..f9cbba7 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -7,6 +7,7 @@
 	<flag name='drm'>Enable DRM backend, uses Linux KMS for output and evdev devices for input.</flag>
 	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='fbdev'>Enable fbdev backend.</flag>
+	<flag name='gles2'>Use GLESv2 cairo instead of full GL</flag>
 	<flag name='headless'>Enable headless backend and a noop renderer, mainly for testing purposes.</flag>
 	<flag name='pango'>Install examples which require <pkg>x11-libs/pango</pkg>.</flag>
 	<flag name='rdp'>Enable Remote Desktop Protocol compositor support.</flag>

diff --git a/dev-libs/weston/weston-1.2.0.ebuild b/dev-libs/weston/weston-1.2.0.ebuild
index 148cdcd..2dffadf 100644
--- a/dev-libs/weston/weston-1.2.0.ebuild
+++ b/dev-libs/weston/weston-1.2.0.ebuild
@@ -25,11 +25,13 @@ LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 [[ ${PV} == 9999* ]] || \
 KEYWORDS="~arm ~amd64 ~x86 ~arm-linux"
-IUSE="colord +drm +egl examples headless fbdev pango pdf rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor +X xwayland"
+IUSE="colord +drm +egl examples fbdev gles2 headless +opengl pango pdf rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor +X xwayland"
 
 REQUIRED_USE="
 	drm? ( egl )
+	egl? ( || ( gles2 opengl ) )
 	fbdev? ( drm )
+	gles2? ( !opengl )
 	pango? ( examples )
 	pdf? ( examples )
 	rpi? ( !drm !egl )
@@ -45,7 +47,7 @@ RDEPEND="
 	media-libs/libwebp
 	virtual/jpeg
 	sys-libs/pam
-	>=x11-libs/cairo-1.10.0
+	>=x11-libs/cairo-1.11.3[gles2?,opengl?]
 	>=x11-libs/libdrm-2.4.30
 	x11-libs/libxkbcommon
 	x11-libs/pixman
@@ -60,7 +62,6 @@ RDEPEND="
 		>=virtual/udev-136
 	)
 	egl? (
-		>=x11-libs/cairo-1.11.3[opengl]
 		media-libs/glu
 	)
 	examples? (
@@ -124,13 +125,14 @@ src_configure() {
 		$(use_enable egl)
 		$(use_enable unwind libunwind)
 		# misc
+		$(use_with gles2 cairo-glesv2)
 		$(use_enable resize-optimization)
 		$(use_enable suid setuid-install)
 		$(use_enable tablet tablet-shell)
 		$(use_enable xwayland)
 		$(use_enable xwayland xwayland-test)
 	)
-	if use examples || use test; then
+	if use examples || use gles2 || use test; then
 		myeconfargs+=(
 			--enable-simple-clients
 			$(use_enable egl simple-egl-clients)
@@ -159,7 +161,7 @@ src_install() {
 	dodoc "${FILESDIR}"/README.gentoo
 
 	cd "${BUILD_DIR}" || die
-	use egl && newbin clients/gears weston-gears
+	use opengl && newbin clients/gears weston-gears
 	if use examples; then
 		use egl && newbin clients/simple-egl weston-simple-egl
 		use pango && newbin clients/editor weston-editor

diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 148cdcd..2dffadf 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -25,11 +25,13 @@ LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 [[ ${PV} == 9999* ]] || \
 KEYWORDS="~arm ~amd64 ~x86 ~arm-linux"
-IUSE="colord +drm +egl examples headless fbdev pango pdf rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor +X xwayland"
+IUSE="colord +drm +egl examples fbdev gles2 headless +opengl pango pdf rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor +X xwayland"
 
 REQUIRED_USE="
 	drm? ( egl )
+	egl? ( || ( gles2 opengl ) )
 	fbdev? ( drm )
+	gles2? ( !opengl )
 	pango? ( examples )
 	pdf? ( examples )
 	rpi? ( !drm !egl )
@@ -45,7 +47,7 @@ RDEPEND="
 	media-libs/libwebp
 	virtual/jpeg
 	sys-libs/pam
-	>=x11-libs/cairo-1.10.0
+	>=x11-libs/cairo-1.11.3[gles2?,opengl?]
 	>=x11-libs/libdrm-2.4.30
 	x11-libs/libxkbcommon
 	x11-libs/pixman
@@ -60,7 +62,6 @@ RDEPEND="
 		>=virtual/udev-136
 	)
 	egl? (
-		>=x11-libs/cairo-1.11.3[opengl]
 		media-libs/glu
 	)
 	examples? (
@@ -124,13 +125,14 @@ src_configure() {
 		$(use_enable egl)
 		$(use_enable unwind libunwind)
 		# misc
+		$(use_with gles2 cairo-glesv2)
 		$(use_enable resize-optimization)
 		$(use_enable suid setuid-install)
 		$(use_enable tablet tablet-shell)
 		$(use_enable xwayland)
 		$(use_enable xwayland xwayland-test)
 	)
-	if use examples || use test; then
+	if use examples || use gles2 || use test; then
 		myeconfargs+=(
 			--enable-simple-clients
 			$(use_enable egl simple-egl-clients)
@@ -159,7 +161,7 @@ src_install() {
 	dodoc "${FILESDIR}"/README.gentoo
 
 	cd "${BUILD_DIR}" || die
-	use egl && newbin clients/gears weston-gears
+	use opengl && newbin clients/gears weston-gears
 	if use examples; then
 		use egl && newbin clients/simple-egl weston-simple-egl
 		use pango && newbin clients/editor weston-editor