From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 04F211381F3 for ; Thu, 18 Jul 2013 12:40:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 925B5E0984; Thu, 18 Jul 2013 12:40:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19E0DE0984 for ; Thu, 18 Jul 2013 12:40:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED0BD33E93A for ; Thu, 18 Jul 2013 12:40:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 86198E468F for ; Thu, 18 Jul 2013 12:40:14 +0000 (UTC) From: "Nikoli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nikoli" Message-ID: <1374150407.96eb5a62e36a8d82d376eee3cf113c0bc63f3ac8.nikoli@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: dev-libs/weston/ X-VCS-Repository: proj/x11 X-VCS-Files: dev-libs/weston/metadata.xml dev-libs/weston/weston-1.2.0.ebuild dev-libs/weston/weston-9999.ebuild X-VCS-Directories: dev-libs/weston/ X-VCS-Committer: nikoli X-VCS-Committer-Name: Nikoli X-VCS-Revision: 96eb5a62e36a8d82d376eee3cf113c0bc63f3ac8 X-VCS-Branch: master Date: Thu, 18 Jul 2013 12:40:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e9ac81e4-01f0-4a7d-9935-b88c9400d0e1 X-Archives-Hash: e284fba2b8ec422e23993af34f29618f commit: 96eb5a62e36a8d82d376eee3cf113c0bc63f3ac8 Author: Nikoli lavabit com> AuthorDate: Thu Jul 18 12:26:47 2013 +0000 Commit: Nikoli lavabit 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 @@ Enable DRM backend, uses Linux KMS for output and evdev devices for input. Enable EGL support. Enable fbdev backend. + Use GLESv2 cairo instead of full GL Enable headless backend and a noop renderer, mainly for testing purposes. Install examples which require x11-libs/pango. Enable Remote Desktop Protocol compositor support. 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